fix previous commit

pull/454/head
Jeff Becker 5 years ago
parent c931ac069f
commit e08986e457
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -98,25 +98,23 @@ namespace llarp
// explicit next peer provided // explicit next peer provided
peer = *next; peer = *next;
} }
else if(!GetNextPeer(peer, peersAsked)) else if(GetNextPeer(peer, peersAsked))
{ {
// no more peers const Key_t targetKey{target};
llarp::LogInfo("no more peers for request asking for ", target); if((prevPeer ^ targetKey) < (peer ^ targetKey))
return false; {
} // next peer is not closer
llarp::LogInfo("next peer ", peer, " is not closer to ", target,
const Key_t targetKey{target}; " than ", prevPeer);
if((prevPeer ^ targetKey) < (peer ^ targetKey)) return false;
{ }
// next peer is not closer
llarp::LogInfo("next peer ", peer, " is not closer to ", target,
" than ", prevPeer);
return false;
} }
else else
{ {
peersAsked.insert(peer); llarp::LogInfo("no more peers for request asking for ", target);
return false;
} }
peersAsked.insert(peer);
DoNextRequest(peer); DoNextRequest(peer);
return true; return true;
} }

@ -118,7 +118,6 @@ TEST_F(TestDhtTx, ask_next_peer)
const auto key0 = makeBuf< dht::Key_t >(0x00); const auto key0 = makeBuf< dht::Key_t >(0x00);
const auto key1 = makeBuf< dht::Key_t >(0x01); const auto key1 = makeBuf< dht::Key_t >(0x01);
const auto key2 = makeBuf< dht::Key_t >(0x02); const auto key2 = makeBuf< dht::Key_t >(0x02);
{ {
// GetNextPeer fails // GetNextPeer fails
EXPECT_CALL(tx, GetNextPeer(_, _)).WillOnce(Return(false)); EXPECT_CALL(tx, GetNextPeer(_, _)).WillOnce(Return(false));

Loading…
Cancel
Save