Merge pull request #1605 from keroro520/test-fees

test: Add cases about proposed/committed rewards
nervosnetwork · Oct 8, 2019 · a3647c6 · a3647c6
2 parents 2fc8ec5 + ac694e7
commit a3647c6
Show file tree

Hide file tree

Showing 15 changed files with 735 additions and 40 deletions.
diff --git a/test/src/lib.rs b/test/src/lib.rs
@@ -2,13 +2,15 @@ mod net;
 mod node;
 mod rpc;
 pub mod specs;
+mod txo;
 mod utils;
 
 use ckb_types::core::BlockNumber;
 
 pub use net::Net;
 pub use node::Node;
 pub use specs::{Setup, Spec, TestProtocol};
+pub use txo::{TXOSet, TXO};
 
 // ckb doesn't support tx proposal window configuration, use a hardcoded value for integration test.
 pub const DEFAULT_TX_PROPOSAL_WINDOW: (BlockNumber, BlockNumber) = (2, 10);

diff --git a/test/src/main.rs b/test/src/main.rs
@@ -15,6 +15,7 @@ use std::time::Instant;
 
 #[allow(clippy::cognitive_complexity)]
 fn main() {
+    env::set_var("RUST_BACKTRACE", "full");
     let _ = {
         let filter = ::std::env::var("CKB_LOG").unwrap_or_else(|_| "info".to_string());
         env_logger::builder().parse_filters(&filter).try_init()
@@ -279,6 +280,12 @@ fn all_specs() -> SpecMap {
         Box::new(UncleInheritFromForkBlock),
         Box::new(UncleInheritFromForkUncle),
         Box::new(PackUnclesIntoEpochStarting),
+        Box::new(FeeOfTransaction),
+        Box::new(FeeOfMaxBlockProposalsLimit),
+        Box::new(FeeOfMultipleMaxBlockProposalsLimit),
+        Box::new(ProposeButNotCommit),
+        Box::new(ProposeDuplicated),
+        Box::new(ForkedTransaction),
     ];
     specs.into_iter().map(|spec| (spec.name(), spec)).collect()
 }

diff --git a/test/src/node.rs b/test/src/node.rs
@@ -355,18 +355,11 @@ impl Node {
         since: u64,
         capacity: Capacity,
     ) -> TransactionView {
-        let always_success_out_point = OutPoint::new(
-            self.genesis_cellbase_hash.clone(),
-            SYSTEM_CELL_ALWAYS_SUCCESS_INDEX,
-        );
+        let always_success_cell_dep = self.always_success_cell_dep();
         let always_success_script = self.always_success_script();
 
         core::TransactionBuilder::default()
-            .cell_dep(
-                CellDep::new_builder()
-                    .out_point(always_success_out_point)
-                    .build(),
-            )
+            .cell_dep(always_success_cell_dep)
             .output(
                 CellOutputBuilder::default()
                     .capacity(capacity.pack())
@@ -385,6 +378,15 @@ impl Node {
             .build()
     }
 
+    pub fn always_success_cell_dep(&self) -> CellDep {
+        CellDep::new_builder()
+            .out_point(OutPoint::new(
+                self.genesis_cellbase_hash.clone(),
+                SYSTEM_CELL_ALWAYS_SUCCESS_INDEX,
+            ))
+            .build()
+    }
+
     fn prepare_chain_spec(
         &mut self,
         modify_chain_spec: Box<dyn Fn(&mut ChainSpec) -> ()>,

diff --git a/test/src/rpc.rs b/test/src/rpc.rs
@@ -1,5 +1,5 @@
 use ckb_jsonrpc_types::{
-    Alert, BannedAddr, Block, BlockNumber, BlockTemplate, BlockView, Capacity,
+    Alert, BannedAddr, Block, BlockNumber, BlockReward, BlockTemplate, BlockView, Capacity,
     CellOutputWithOutPoint, CellTransaction, CellWithStatus, ChainInfo, DryRunResult, EpochNumber,
     EpochView, HeaderView, LiveCell, LockHashIndexState, Node, OutPoint, PeerState, Timestamp,
     Transaction, TransactionWithStatus, TxPoolInfo, Uint64, Version,
@@ -346,6 +346,15 @@ impl RpcClient {
             .expect("rpc call calculate_dao_maximum_withdraw")
             .into()
     }
+
+    pub fn get_cellbase_output_capacity_details(&self, hash: Byte32) -> BlockReward {
+        self.inner()
+            .lock()
+            .get_cellbase_output_capacity_details(hash.unpack())
+            .call()
+            .expect("rpc call get_cellbase_output_capacity_details")
+            .expect("get_cellbase_output_capacity_details return none")
+    }
 }
 
 jsonrpc_client!(pub struct Inner {
@@ -405,4 +414,5 @@ jsonrpc_client!(pub struct Inner {
     pub fn deindex_lock_hash(&mut self, lock_hash: H256) -> RpcRequest<()>;
     pub fn get_lock_hash_index_states(&mut self) -> RpcRequest<Vec<LockHashIndexState>>;
     pub fn calculate_dao_maximum_withdraw(&mut self, _out_point: OutPoint, _hash: H256) -> RpcRequest<Capacity>;
+    pub fn get_cellbase_output_capacity_details(&mut self, _hash: H256) -> RpcRequest<Option<BlockReward>>;
 });
diff --git a/test/src/specs/alert/mod.rs b/test/src/specs/alert/mod.rs
@@ -1,6 +1,6 @@
 mod alert_propagation;
 
-pub use alert_propagation::AlertPropagation;
+pub use alert_propagation::*;
 
 use ckb_crypto::secp::Privkey;
 use ckb_jsonrpc_types::JsonBytes;

diff --git a/test/src/specs/indexer/mod.rs b/test/src/specs/indexer/mod.rs
@@ -1,5 +1,5 @@
 mod basic;
 mod genesis_issued_cells;
 
-pub use basic::IndexerBasic;
-pub use genesis_issued_cells::GenesisIssuedCells;
+pub use basic::*;
+pub use genesis_issued_cells::*;