Merge #1684

1684: fix(test): First 11 cellbases have not outputs r=quake,u2 a=keroro520 #1605 did not correctly resolve conflict before merging. Hence it breaks CI for develop-branch. Here comes this PR to fix it. Co-authored-by: keroro520 <[email protected]>
nervosnetwork · Oct 9, 2019 · 1633a16 · 1633a16
2 parents a3647c6 + b28f401
commit 1633a16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/test/src/specs/sync/chain_forks.rs b/test/src/specs/sync/chain_forks.rs
@@ -624,6 +624,11 @@ impl Spec for ForkedTransaction {
         let node0 = &net.nodes[0];
         let node1 = &net.nodes[1];
         let finalization_delay_length = node0.consensus().finalization_delay_length();
+        (0..=finalization_delay_length).for_each(|_| {
+            let block = node0.new_block(None, None, None);
+            node0.submit_block(&block.data());
+            node1.submit_block(&block.data());
+        });
 
         net.exit_ibd_mode();
         let fixed_point = node0.get_tip_block_number();

diff --git a/test/src/utils.rs b/test/src/utils.rs
@@ -220,7 +220,7 @@ pub fn generate_utxo_set(node: &Node, n: usize) -> TXOSet {
         let mature_number = node.get_tip_block_number() - cellbase_maturity.index();
         let mature_block = node.get_block_by_number(mature_number);
         let mature_cellbase = mature_block.transaction(0).unwrap();
-        if mature_cellbase.outputs().len() == 0 {
+        if mature_cellbase.outputs().is_empty() {
             continue;
         }