1 files changed, 5 insertions, 82 deletions

diff --git a/Mainline.hs b/Mainline.hs
index 77c0d5f1..4ce4f4da 100644
--- a/Mainline.hs
+++ b/Mainline.hs
@@ -61,7 +61,7 @@ import Network.BitTorrent.DHT.ContactInfo     as Peers
 import Network.BitTorrent.DHT.Search          (Search (..))
 import Network.BitTorrent.DHT.Token           as Token
 import qualified Network.DHT.Routing          as R
-         ;import Network.DHT.Routing          (Info, Timestamp, getTimestamp)
+         ;import Network.DHT.Routing          (Timestamp, getTimestamp)
 import Network.QueryResponse
 import Network.Socket
 import System.IO
@@ -79,6 +79,7 @@ import qualified Data.Aeson as JSON
          ;import Data.Aeson (FromJSON, ToJSON, (.=))
 import Text.Read
 import Global6
+import TriadCommittee
 
 newtype NodeId = NodeId ByteString
  deriving (Eq,Ord,ByteArrayAccess, Bits, Hashable)
@@ -495,8 +496,6 @@ newSwarmsDatabase = do
                     <*> newTVar toks
                     <*> newTVar def
 
-type RoutingInfo = Info NodeInfo NodeId
-
 data Routing = Routing
     { tentativeId :: NodeInfo
     , sched4      :: !( TVar (Int.PSQ POSIXTime) )
@@ -596,7 +595,7 @@ newClient addr = do
                 let var = case flip prefer4or6 Nothing <$> maddr of
                             Just Want_IP6 -> routing6 routing
                             _             -> routing4 routing
-                R.selfNode <$> readTVar var
+                R.thisNode <$> readTVar var
             , clientResponseId    = return
             }
 
@@ -1027,84 +1026,6 @@ getPeers = mainlineSend (Method "get_peers") unwrapPeers $ flip GetPeers (Just W
 
 unwrapPeers (GotPeers ps (NodeFound ns4 ns6) tok) = (ns4++ns6, ps, tok)
 
-data TriadSlot = SlotA | SlotB | SlotC
- deriving (Eq,Ord,Enum,Show,Read)
-
-data TriadCommittee voter a = TriadCommittee
-    { triadDecider :: TVar TriadSlot
-    , triadA :: TVar (Maybe (voter,a))
-    , triadB :: TVar (Maybe (voter,a))
-    , triadC :: TVar (Maybe (voter,a))
-    , triadNewDecision :: a -> STM ()
-    }
-
-triadSlot :: TriadSlot -> TriadCommittee voter a -> TVar (Maybe (voter,a))
-triadSlot SlotA = triadA
-triadSlot SlotB = triadB
-triadSlot SlotC = triadC
-
-triadDecision :: a -> TriadCommittee voter a -> STM a
-triadDecision fallback triad = do
-    slot <- readTVar (triadDecider triad)
-    maybe fallback snd <$> readTVar (triadSlot slot triad)
-
-
-newTriadCommittee :: (a -> STM ()) -> STM (TriadCommittee voter a)
-newTriadCommittee onChange =
-    TriadCommittee <$> newTVar SlotA
-                   <*> newTVar Nothing
-                   <*> newTVar Nothing
-                   <*> newTVar Nothing
-                   <*> pure onChange
-
-triadCountVotes :: Eq a => Maybe a -> TriadCommittee voter a -> STM ()
-triadCountVotes prior triad = do
-    a <- fmap ((SlotA,) . snd) <$> readTVar (triadA triad)
-    b <- fmap ((SlotB,) . snd) <$> readTVar (triadB triad)
-    c <- fmap ((SlotC,) . snd) <$> readTVar (triadC triad)
-    let (slot,vote) = case catMaybes [a,b,c] of
-            [  (x,xvote)
-             , (y,yvote)
-             , (z,zvote) ]  -> if xvote == yvote then (x,Just xvote)
-                                                 else (z,Just zvote)
-            []              -> (SlotA,Nothing)
-            ((slot,vote):_) -> (slot, Just vote)
-    writeTVar (triadDecider triad) slot
-    case vote of
-        Just v | vote /= prior -> triadNewDecision triad v
-        _                      -> return ()
-
-
-addVote :: (Eq voter, Eq a) => TriadCommittee voter a -> voter -> a -> STM ()
-addVote triad voter vote = do
-    a <- (SlotA,) . fmap fst <$> readTVar (triadA triad)
-    b <- (SlotB,) . fmap fst <$> readTVar (triadB triad)
-    c <- (SlotC,) . fmap fst <$> readTVar (triadC triad)
-    let avail (_,Nothing) = True
-        avail (_,Just x ) = (x == voter)
-        slots = filter avail [a,b,c]
-    forM_ (take 1 slots) $ \(slot,_) -> do
-        prior <- do
-            slotp <- readTVar (triadDecider triad)
-            fmap snd <$> readTVar (triadSlot slotp triad)
-        writeTVar (triadSlot slot triad)
-                  (Just (voter,vote))
-        triadCountVotes prior triad
-
-delVote :: (Eq voter, Eq a) => TriadCommittee voter a -> voter -> STM ()
-delVote triad voter = do
-    a <- (SlotA,) . fmap fst <$> readTVar (triadA triad)
-    b <- (SlotB,) . fmap fst <$> readTVar (triadB triad)
-    c <- (SlotC,) . fmap fst <$> readTVar (triadC triad)
-    let match (_,Just x ) = (x == voter)
-        slots = filter match [a,b,c]
-    forM_ (take 1 slots) $ \(slot,_) -> do
-        prior <- do
-            slotp <- readTVar (triadDecider triad)
-            fmap snd <$> readTVar (triadSlot slotp triad)
-        writeTVar (triadSlot slot triad) Nothing
-        triadCountVotes prior triad
-
 mainlineSearch qry = Search
     { searchSpace       = mainlineSpace
     , searchNodeAddress = nodeIP &&& nodePort
@@ -1154,3 +1075,5 @@ resolve want hostAndPort = do
         --  pattern matching never fails.
         info : _ <- getAddrInfo (Just hints) (Just host) port
         return $ addrAddress info
+
+