Don't announce blocks in sync_to_tip_when_we_sync_together_with_multiple_peers (#12783)

* Fix syncing test

* cargo fmt

* Fix test
This commit is contained in:
Aaro Altonen
2022-11-30 15:37:28 +02:00
committed by GitHub
parent 995e530939
commit ec064e5edf
2 changed files with 9 additions and 4 deletions
+2 -1
View File
@@ -428,8 +428,9 @@ where
at: BlockId<Block>,
count: usize,
with_tx: bool,
announce_block: bool,
) -> H256 {
self.generate_tx_blocks_at(at, count, with_tx, false, false, true)
self.generate_tx_blocks_at(at, count, with_tx, false, false, announce_block)
}
/// Push blocks to the peer (simplified: with or without a TX) starting from
+7 -3
View File
@@ -775,7 +775,9 @@ fn sync_to_tip_requires_that_sync_protocol_is_informed_about_best_block() {
let mut net = TestNet::new(1);
// Produce some blocks
let block_hash = net.peer(0).push_blocks_at_without_informing_sync(BlockId::Number(0), 3, true);
let block_hash =
net.peer(0)
.push_blocks_at_without_informing_sync(BlockId::Number(0), 3, true, true);
// Add a node and wait until they are connected
net.add_full_peer_with_config(Default::default());
@@ -818,10 +820,10 @@ fn sync_to_tip_when_we_sync_together_with_multiple_peers() {
let block_hash =
net.peer(0)
.push_blocks_at_without_informing_sync(BlockId::Number(0), 10_000, false);
.push_blocks_at_without_informing_sync(BlockId::Number(0), 10_000, false, false);
net.peer(1)
.push_blocks_at_without_informing_sync(BlockId::Number(0), 5_000, false);
.push_blocks_at_without_informing_sync(BlockId::Number(0), 5_000, false, false);
net.block_until_connected();
net.block_until_idle();
@@ -829,6 +831,8 @@ fn sync_to_tip_when_we_sync_together_with_multiple_peers() {
assert!(!net.peer(2).has_block(block_hash));
net.peer(0).network_service().new_best_block_imported(block_hash, 10_000);
net.peer(0).network_service().announce_block(block_hash, None);
while !net.peer(2).has_block(block_hash) && !net.peer(1).has_block(block_hash) {
net.block_until_idle();
}