feat(hardfork): reject unknown vm versions and add an integration tes…

…t for this feature
nervosnetwork · Jun 29, 2021 · 09c7975 · 09c7975
1 parent 59dc192
commit 09c7975
Show file tree

Hide file tree

Showing 12 changed files with 459 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/script/src/error.rs b/script/src/error.rs
@@ -33,7 +33,7 @@ pub enum ScriptError {
     InvalidScriptHashType(String),
 
     /// InvalidVmVersion
-    #[error("Invalid vm version {0}")]
+    #[error("Invalid VM Version: {0}")]
     InvalidVmVersion(u8),
 
     /// Known bugs are detected in transaction script outputs

diff --git a/test/Cargo.toml b/test/Cargo.toml
@@ -39,6 +39,13 @@ lazy_static = "1.4.0"
 byteorder = "1.3.1"
 jsonrpc-core = "17.1"
 
+[features]
+default = [
+    "ckb-constant/test-only",
+    "ckb-types/test-only",
+    "ckb-jsonrpc-types/test-only"
+]
+
 # Prevent this from interfering with workspaces
 [workspace]
 members = ["."]

diff --git a/test/src/main.rs b/test/src/main.rs
@@ -493,6 +493,7 @@ fn all_specs() -> Vec<Box<dyn Spec>> {
         Box::new(CheckAbsoluteEpochSince),
         Box::new(CheckRelativeEpochSince),
         Box::new(CheckBlockExtension),
+        Box::new(CheckVmVersion),
         Box::new(DuplicateCellDepsForDataHashTypeLockScript),
         Box::new(DuplicateCellDepsForDataHashTypeTypeScript),
         Box::new(DuplicateCellDepsForTypeHashTypeLockScript),

diff --git a/test/src/specs/hardfork/v2021/mod.rs b/test/src/specs/hardfork/v2021/mod.rs
@@ -1,10 +1,12 @@
 mod cell_deps;
 mod extension;
 mod since;
+mod vm_version;
 
 pub use cell_deps::{
     DuplicateCellDepsForDataHashTypeLockScript, DuplicateCellDepsForDataHashTypeTypeScript,
     DuplicateCellDepsForTypeHashTypeLockScript, DuplicateCellDepsForTypeHashTypeTypeScript,
 };
 pub use extension::CheckBlockExtension;
 pub use since::{CheckAbsoluteEpochSince, CheckRelativeEpochSince};
+pub use vm_version::CheckVmVersion;