diff --git a/Cargo.lock b/Cargo.lock index 9132efb9441..642ab61c75d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2755,13 +2755,15 @@ dependencies = [ [[package]] name = "insta" -version = "1.26.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", "linked-hash-map", + "pest", + "pest_derive", "serde", "similar", "yaml-rust", @@ -5130,6 +5132,50 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +[[package]] +name = "pest" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b75706b9642ebcb34dab3bc7750f811609a0eb1dd8b88c2d15bf628c1c65b2" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f9272122f5979a6511a749af9db9bfc810393f63119970d7085fed1c4ea0db" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 1.0.103", +] + +[[package]] +name = "pest_meta" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8717927f9b79515e565a64fe46c38b8cd0427e64c40680b14a7365ab09ac8d" +dependencies = [ + "once_cell", + "pest", + "sha1", +] + [[package]] name = "petgraph" version = "0.6.2" @@ -7338,6 +7384,12 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + [[package]] name = "uint" version = "0.9.3" diff --git a/Cargo.toml b/Cargo.toml index 8c239e29da7..5d61d9ad3dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,7 +110,9 @@ bitflags = "1.2" blake2 = "0.9.1" bn = { package = "zeropool-bn", version = "0.5.11" } # TODO: revert to upstream bolero once https://github.com/camshaft/bolero/pull/186 lands and gets released -bolero = { version = "0.9.0", git = "https://github.com/camshaft/bolero", rev = "7d955a67fbd06f61ffaf28178e976280c33c045a", features = ["arbitrary"] } +bolero = { version = "0.9.0", git = "https://github.com/camshaft/bolero", rev = "7d955a67fbd06f61ffaf28178e976280c33c045a", features = [ + "arbitrary", +] } borsh = { version = "1.0.0", features = ["derive", "rc"] } bs58 = "0.4" bytes = "1" @@ -159,7 +161,7 @@ hyper-tls = "0.5.0" im = "15" indexmap = "1.6" indicatif = { version = "0.15.0", features = ["with_rayon"] } -insta = { version = "1.26.0", features = ["json", "yaml"] } +insta = { version = "1.34.0", features = ["json", "yaml", "redactions"] } integration-tests = { path = "integration-tests" } itertools = "0.10.0" itoa = "1.0" diff --git a/core/primitives/src/runtime/config_store.rs b/core/primitives/src/runtime/config_store.rs index 014a0eb410c..b8c6e45d053 100644 --- a/core/primitives/src/runtime/config_store.rs +++ b/core/primitives/src/runtime/config_store.rs @@ -326,7 +326,7 @@ mod tests { let snapshot_name = format!("{version}.json"); let config_view = RuntimeConfigView::from(store.get_config(*version).as_ref().clone()); any_failure |= std::panic::catch_unwind(|| { - insta::assert_json_snapshot!(snapshot_name, config_view); + insta::assert_json_snapshot!(snapshot_name, config_view, { ".wasm_config.vm_kind" => ""}); }) .is_err(); } @@ -360,7 +360,7 @@ mod tests { let snapshot_name = format!("testnet_{version}.json"); let config_view = RuntimeConfigView::from(store.get_config(*version).as_ref().clone()); any_failure |= std::panic::catch_unwind(|| { - insta::assert_json_snapshot!(snapshot_name, config_view); + insta::assert_json_snapshot!(snapshot_name, config_view, { ".wasm_config.vm_kind" => ""}); }) .is_err(); } diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap index a827b19e2fc..5f5a4b09f38 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__129.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__129.json.snap index 3c4b293ccbb..bf99fcd66ff 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__129.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__129.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": true, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__35.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__35.json.snap index bf6e34f246e..6132c476a6e 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__35.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__35.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__42.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__42.json.snap index 72c2e2b238b..2dc93e90514 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__42.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__42.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__46.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__46.json.snap index fd52f654295..9687f0b7577 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__46.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__46.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__48.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__48.json.snap index fe2c8f2f406..27599960fe4 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__48.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__48.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 2207874, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__49.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__49.json.snap index 7ca4e67451a..e3aa6a4aa48 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__49.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__49.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__50.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__50.json.snap index 3091b0200ff..7c7f08fb7bf 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__50.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__50.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__52.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__52.json.snap index 1bfbd2f7a86..4a5d601a029 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__52.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__52.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__53.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__53.json.snap index f03c6a2fd5a..b3241b79e9f 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__53.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__53.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__55.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__55.json.snap index 79632ffc0c3..e0a47a72d32 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__55.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__55.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__57.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__57.json.snap index 92180bc42f0..6eef7b33564 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__57.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__57.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__59.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__59.json.snap index 46b1c86bf2a..be0582f2170 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__59.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__59.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__61.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__61.json.snap index 6cb9c44073d..201276d778b 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__61.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__61.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__62.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__62.json.snap index 91b6994d0f7..035ebbb2f76 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__62.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__62.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": true, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__63.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__63.json.snap index 9fed1d72338..420d0b9b2b2 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__63.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__63.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__64.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__64.json.snap index a2c3d14f81e..49a7c8a045f 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__64.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__64.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_0.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_0.json.snap index a827b19e2fc..5f5a4b09f38 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_0.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_0.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_129.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_129.json.snap index 3c4b293ccbb..bf99fcd66ff 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_129.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_129.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": true, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_35.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_35.json.snap index bf6e34f246e..6132c476a6e 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_35.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_35.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_42.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_42.json.snap index 72c2e2b238b..2dc93e90514 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_42.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_42.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_46.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_46.json.snap index fd52f654295..9687f0b7577 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_46.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_46.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 3856371, - "vm_kind": "Wasmer0", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_48.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_48.json.snap index fe2c8f2f406..27599960fe4 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_48.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_48.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 2207874, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_49.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_49.json.snap index 7ca4e67451a..e3aa6a4aa48 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_49.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_49.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_50.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_50.json.snap index 3091b0200ff..7c7f08fb7bf 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_50.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_50.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_52.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_52.json.snap index 1bfbd2f7a86..4a5d601a029 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_52.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_52.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_53.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_53.json.snap index f03c6a2fd5a..b3241b79e9f 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_53.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_53.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_55.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_55.json.snap index 79632ffc0c3..e0a47a72d32 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_55.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_55.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_57.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_57.json.snap index 92180bc42f0..6eef7b33564 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_57.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_57.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_59.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_59.json.snap index 46b1c86bf2a..be0582f2170 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_59.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_59.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "Trie", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_61.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_61.json.snap index 6cb9c44073d..201276d778b 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_61.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_61.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "Wasmer2", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_62.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_62.json.snap index 91b6994d0f7..035ebbb2f76 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_62.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_62.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": true, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_63.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_63.json.snap index 9fed1d72338..420d0b9b2b2 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_63.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_63.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_64.json.snap b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_64.json.snap index a2c3d14f81e..49a7c8a045f 100644 --- a/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_64.json.snap +++ b/core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__testnet_64.json.snap @@ -172,7 +172,7 @@ expression: config_view }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap b/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap index 66f97f4880b..ce9564793ac 100644 --- a/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap +++ b/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap @@ -172,7 +172,7 @@ expression: "&view" }, "grow_mem_cost": 1, "regular_op_cost": 822756, - "vm_kind": "NearVm", + "vm_kind": "", "disable_9393_fix": false, "storage_get_mode": "FlatStorage", "fix_contract_loading_cost": false, diff --git a/core/primitives/src/views.rs b/core/primitives/src/views.rs index 54d8f8a65fb..6c6becdd162 100644 --- a/core/primitives/src/views.rs +++ b/core/primitives/src/views.rs @@ -2935,7 +2935,7 @@ mod tests { let config_store = RuntimeConfigStore::new(None); let config = config_store.get_config(PROTOCOL_VERSION); let view = RuntimeConfigView::from(RuntimeConfig::clone(config)); - insta::assert_json_snapshot!(&view); + insta::assert_json_snapshot!(&view, { ".wasm_config.vm_kind" => ""}); } /// `ExecutionMetadataView` with profile V1 displayed on the RPC should not change.