diff --git a/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs b/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs index 0907f23e..350bb7df 100644 --- a/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs +++ b/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs @@ -382,7 +382,7 @@ refChanUpdateProto self pc adapter msg = do guard =<< lift (refChanSubscribed adapter (getRefChanId msg)) let h0 = hashObject @HbSync (serialise msg) - guard =<< liftIO (hasBlock sto h0 <&> isNothing) + -- guard =<< liftIO (hasBlock sto h0 <&> isNothing) case msg of Propose chan box -> do @@ -467,7 +467,6 @@ refChanUpdateProto self pc adapter msg = do lift $ gossip accept -- -- рассылаем ли себе? что бы был хоть один accept - liftIO $ putBlock sto (serialise accept) lift $ refChanUpdateProto True pc adapter accept Accept chan box -> deferred proto do @@ -525,7 +524,7 @@ refChanUpdateProto self pc adapter msg = do ha <- MaybeT $ liftIO $ putBlock sto (serialise msg) atomically $ modifyTVar (view refChanRoundTrans rcRound) (HashSet.insert (HashRef ha)) - atomically $ modifyTVar (view refChanRoundTrans rcRound) (HashSet.insert hashRef) -- propose just in case we missed it? + -- atomically $ modifyTVar (view refChanRoundTrans rcRound) (HashSet.insert hashRef) -- propose just in case we missed it? accepts <- atomically $ readTVar (view refChanRoundAccepts rcRound) <&> HashMap.size diff --git a/hbs2-peer/app/RefChan.hs b/hbs2-peer/app/RefChan.hs index ff7fe1db..2f91de22 100644 --- a/hbs2-peer/app/RefChan.hs +++ b/hbs2-peer/app/RefChan.hs @@ -512,7 +512,7 @@ logMergeProcess _ q = do forM_ new $ \tnew -> do debug $ "TRANS TO MERGE" <+> pretty tnew - let merged = (current <> HashSet.fromList new) & HashSet.toList + let merged = HashSet.fromList new & HashSet.toList let pt = toPTree (MaxSize 256) (MaxNum 256) merged