merge develop

nervosnetwork · May 8, 2024 · 169fd2b · 169fd2b
2 parents 6f884e6 + 4dc2462
commit 169fd2b
Show file tree

Hide file tree

Showing 49 changed files with 712 additions and 175 deletions.
diff --git a/.github/workflows/ci_unit_tests_windows.yaml b/.github/workflows/ci_unit_tests_windows.yaml
@@ -62,8 +62,6 @@ jobs:
         scoop install git
         scoop bucket add extras
         scoop install llvm
-    - name: Install nextest dependency
-      run: scoop install jq
     - name: Install nextest-rs/nextest
       uses: taiki-e/install-action@nextest
     - run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benches/benches/benchmarks/always_success.rs b/benches/benches/benchmarks/always_success.rs
@@ -44,7 +44,7 @@ fn bench(c: &mut Criterion) {
                     |(chain, blocks)| {
                         blocks.into_iter().skip(1).for_each(|block| {
                             chain
-                                .process_block(Arc::new(block))
+                                .internal_process_block(Arc::new(block), Switch::DISABLE_EXTENSION)
                                 .expect("process block OK");
                         });
                     },
@@ -187,7 +187,7 @@ fn bench(c: &mut Criterion) {
                     |(chain, blocks)| {
                         blocks.into_iter().skip(8).for_each(|block| {
                             chain
-                                .process_block(Arc::new(block))
+                                .internal_process_block(Arc::new(block), Switch::DISABLE_EXTENSION)
                                 .expect("process block OK");
                         });
                     },

diff --git a/benches/benches/benchmarks/overall.rs b/benches/benches/benchmarks/overall.rs
@@ -20,6 +20,7 @@ use ckb_types::{
     U256,
 };
 use ckb_verification::HeaderVerifier;
+use ckb_verification_traits::Switch;
 use ckb_verification_traits::Verifier;
 use criterion::{criterion_group, BatchSize, BenchmarkId, Criterion};
 use rand::random;
@@ -217,7 +218,9 @@ fn bench(c: &mut Criterion) {
                                 .verify(&block.header())
                                 .expect("header verified");
 
-                            chain.process_block(Arc::new(block)).expect("process_block");
+                            chain
+                                .internal_process_block(Arc::new(block), Switch::DISABLE_EXTENSION)
+                                .expect("process_block");
                             i -= 1;
                         }
                     },

diff --git a/benches/benches/benchmarks/secp_2in2out.rs b/benches/benches/benchmarks/secp_2in2out.rs
@@ -44,7 +44,7 @@ fn bench(c: &mut Criterion) {
                     |(chain, blocks)| {
                         blocks.into_iter().skip(1).for_each(|block| {
                             chain
-                                .process_block(Arc::new(block))
+                                .internal_process_block(Arc::new(block), Switch::DISABLE_EXTENSION)
                                 .expect("process block OK");
                         });
                     },
@@ -187,7 +187,7 @@ fn bench(c: &mut Criterion) {
                     |(chain, blocks)| {
                         blocks.into_iter().skip(8).for_each(|block| {
                             chain
-                                .process_block(Arc::new(block))
+                                .internal_process_block(Arc::new(block), Switch::DISABLE_EXTENSION)
                                 .expect("process block OK");
                         });
                     },

diff --git a/chain/src/tests/basic.rs b/chain/src/tests/basic.rs
@@ -34,7 +34,7 @@ fn repeat_process_block() {
     let block = Arc::new(chain.blocks().last().unwrap().clone());
 
     assert!(chain_controller
-        .process_block(Arc::clone(&block))
+        .internal_process_block(Arc::clone(&block), Switch::DISABLE_EXTENSION)
         .expect("process block ok"));
     assert_eq!(
         shared
@@ -46,7 +46,7 @@ fn repeat_process_block() {
     );
 
     assert!(!chain_controller
-        .process_block(Arc::clone(&block))
+        .internal_process_block(Arc::clone(&block), Switch::DISABLE_EXTENSION)
         .expect("process block ok"));
     assert_eq!(
         shared
@@ -165,7 +165,10 @@ fn test_transaction_spend_in_same_block() {
 
     for block in chain.blocks() {
         chain_controller
-            .internal_process_block(Arc::new(block.clone()), Switch::DISABLE_EPOCH)
+            .internal_process_block(
+                Arc::new(block.clone()),
+                Switch::DISABLE_EPOCH | Switch::DISABLE_EXTENSION,
+            )
             .expect("process block ok");
     }
 
@@ -236,13 +239,16 @@ fn test_transaction_conflict_in_same_block() {
 
     for block in chain.blocks().iter().take(3) {
         chain_controller
-            .process_block(Arc::new(block.clone()))
+            .internal_process_block(Arc::new(block.clone()), Switch::DISABLE_EXTENSION)
             .expect("process block ok");
     }
     assert_error_eq!(
         OutPointError::Dead(OutPoint::new(tx1_hash, 0)),
         chain_controller
-            .process_block(Arc::new(chain.blocks()[3].clone()))
+            .internal_process_block(
+                Arc::new(chain.blocks()[3].clone()),
+                Switch::DISABLE_EXTENSION
+            )
             .unwrap_err(),
     );
 }
@@ -273,13 +279,16 @@ fn test_transaction_conflict_in_different_blocks() {
 
     for block in chain.blocks().iter().take(4) {
         chain_controller
-            .process_block(Arc::new(block.clone()))
+            .internal_process_block(Arc::new(block.clone()), Switch::DISABLE_EXTENSION)
             .expect("process block ok");
     }
     assert_error_eq!(
         OutPointError::Unknown(OutPoint::new(tx1_hash, 0)),
         chain_controller
-            .process_block(Arc::new(chain.blocks()[4].clone()))
+            .internal_process_block(
+                Arc::new(chain.blocks()[4].clone()),
+                Switch::DISABLE_EXTENSION
+            )
             .unwrap_err(),
     );
 }
@@ -307,13 +316,16 @@ fn test_invalid_out_point_index_in_same_block() {
 
     for block in chain.blocks().iter().take(3) {
         chain_controller
-            .process_block(Arc::new(block.clone()))
+            .internal_process_block(Arc::new(block.clone()), Switch::DISABLE_EXTENSION)
             .expect("process block ok");
     }
     assert_error_eq!(
         OutPointError::Unknown(OutPoint::new(tx1_hash, 1)),
         chain_controller
-            .process_block(Arc::new(chain.blocks()[3].clone()))
+            .internal_process_block(
+                Arc::new(chain.blocks()[3].clone()),
+                Switch::DISABLE_EXTENSION
+            )
             .unwrap_err(),
     );
 }
@@ -342,14 +354,17 @@ fn test_invalid_out_point_index_in_different_blocks() {
 
     for block in chain.blocks().iter().take(4) {
         chain_controller
-            .process_block(Arc::new(block.clone()))
+            .internal_process_block(Arc::new(block.clone()), Switch::DISABLE_EXTENSION)
             .expect("process block ok");
     }
 
     assert_error_eq!(
         OutPointError::Unknown(OutPoint::new(tx1_hash, 1)),
         chain_controller
-            .process_block(Arc::new(chain.blocks()[4].clone()))
+            .internal_process_block(
+                Arc::new(chain.blocks()[4].clone()),
+                Switch::DISABLE_EXTENSION
+            )
             .unwrap_err(),
     );
 }