chore: remove some unused test case and fix clippy

nervosnetwork · Mar 22, 2019 · cd85337 · cd85337
1 parent 2913cca
commit cd85337
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 85 deletions.
diff --git a/chain/src/tests/basic.rs b/chain/src/tests/basic.rs
@@ -188,9 +188,9 @@ fn test_transaction_conflict_in_same_block() {
         );
         chain.push(new_block);
     }
-    for i in 0..3 {
+    for block in chain.iter().take(3) {
         chain_controller
-            .process_block(Arc::new(chain[i].clone()))
+            .process_block(Arc::new(block.clone()))
             .expect("process block ok");
     }
     assert_eq!(
@@ -275,9 +275,9 @@ fn test_transaction_conflict_in_different_blocks() {
         );
         chain.push(new_block);
     }
-    for i in 0..4 {
+    for block in chain.iter().take(4) {
         chain_controller
-            .process_block(Arc::new(chain[i].clone()))
+            .process_block(Arc::new(block.clone()))
             .expect("process block ok");
     }
     assert_eq!(

diff --git a/verification/src/tests/block_verifier.rs b/verification/src/tests/block_verifier.rs
@@ -153,87 +153,6 @@ pub fn test_cellbase_with_more_reward_than_available() {
     );
 }
 
-#[test]
-pub fn test_cellbase_with_invalid_transaction() {
-    let mut transaction_fees = HashMap::<H256, Result<Capacity, SharedError>>::new();
-    let transaction = create_normal_transaction();
-    transaction_fees.insert(transaction.hash().clone(), Err(SharedError::InvalidOutput));
-
-    let block = BlockBuilder::default()
-        .commit_transaction(create_cellbase_transaction_with_capacity(100))
-        .commit_transaction(transaction)
-        .build();
-
-    let provider = DummyChainProvider {
-        block_reward: 100,
-        transaction_fees,
-    };
-
-    let verifier = CellbaseVerifier::new(provider);
-    assert_eq!(
-        verifier.verify(&block),
-        Err(VerifyError::Chain(format!(
-            "{}",
-            SharedError::InvalidOutput
-        )))
-    );
-}
-
-#[test]
-pub fn test_cellbase_with_two_outputs() {
-    let mut transaction_fees = HashMap::<H256, Result<Capacity, SharedError>>::new();
-    let transaction = create_normal_transaction();
-    transaction_fees.insert(transaction.hash().clone(), Ok(0));
-
-    let cellbase_transaction = TransactionBuilder::default()
-        .input(CellInput::new_cellbase_input(0))
-        .output(CellOutput::new(100, Vec::new(), H256::default(), None))
-        .output(CellOutput::new(50, Vec::new(), H256::default(), None))
-        .build();
-
-    let block = BlockBuilder::default()
-        .commit_transaction(cellbase_transaction)
-        .commit_transaction(transaction)
-        .build();
-
-    let provider = DummyChainProvider {
-        block_reward: 150,
-        transaction_fees,
-    };
-
-    let verifier = CellbaseVerifier::new(provider);
-    assert!(verifier.verify(&block).is_ok());
-}
-
-#[test]
-pub fn test_cellbase_with_two_outputs_and_more_rewards_than_maximum() {
-    let mut transaction_fees = HashMap::<H256, Result<Capacity, SharedError>>::new();
-    let transaction = create_normal_transaction();
-    transaction_fees.insert(transaction.hash().clone(), Ok(0));
-
-    let cellbase_transaction = TransactionBuilder::default()
-        .input(CellInput::new_cellbase_input(0))
-        .output(CellOutput::new(100, Vec::new(), H256::default(), None))
-        .output(CellOutput::new(50, Vec::new(), H256::default(), None))
-        .build();
-
-    let block = BlockBuilder::default()
-        .commit_transaction(cellbase_transaction)
-        .commit_transaction(transaction)
-        .build();
-
-    let provider = DummyChainProvider {
-        block_reward: 100,
-        transaction_fees,
-    };
-
-    let verifier = CellbaseVerifier::new(provider);
-    assert_eq!(
-        verifier.verify(&block),
-        Err(VerifyError::Cellbase(CellbaseError::InvalidReward))
-    );
-}
-
 #[test]
 pub fn test_empty_transactions() {
     let block = BlockBuilder::default().build();