replica-tests

dfinity · Oct 20, 2024 · 8c84f24 · 8c84f24
1 parent 8c66651
commit 8c84f24
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 708 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rs/pocket_ic_tests/BUILD.bazel b/rs/pocket_ic_tests/BUILD.bazel
@@ -11,6 +11,7 @@ DEPENDENCIES = [
     "//rs/state_machine_tests",
     "//rs/types/error_types",
     "//rs/types/types",
+    "@crate_index//:wat",
 ]
 
 rust_library(

diff --git a/rs/pocket_ic_tests/Cargo.toml b/rs/pocket_ic_tests/Cargo.toml
@@ -16,3 +16,4 @@ ic-registry-subnet-type = { path = "../registry/subnet_type" }
 ic-state-machine-tests = { path = "../state_machine_tests" }
 ic-types = { path = "../types/types" }
 pocket-ic = { path = "../../packages/pocket-ic" }
+wat = { workspace = true }
diff --git a/rs/pocket_ic_tests/src/lib.rs b/rs/pocket_ic_tests/src/lib.rs
@@ -216,6 +216,16 @@ impl StateMachine {
         self.sm.install_canister(module, payload, settings)
     }
 
+    pub fn install_canister_wat(
+        &self,
+        wat: &str,
+        payload: Vec<u8>,
+        settings: Option<CanisterSettingsArgs>,
+    ) -> CanisterId {
+        self.install_canister(wat::parse_str(wat).expect("invalid WAT"), payload, settings)
+            .unwrap()
+    }
+
     pub fn install_existing_canister(
         &self,
         canister_id: CanisterId,
@@ -256,6 +266,16 @@ impl StateMachine {
         self.install_wasm_in_mode(canister_id, CanisterInstallMode::Upgrade, wasm, payload)
     }
 
+    pub fn upgrade_canister_wat(&self, canister_id: CanisterId, wat: &str, payload: Vec<u8>) {
+        self.install_wasm_in_mode(
+            canister_id,
+            CanisterInstallMode::Upgrade,
+            wat::parse_str(wat).expect("invalid WAT"),
+            payload,
+        )
+        .unwrap();
+    }
+
     pub fn update_settings(
         &self,
         canister_id: &CanisterId,

diff --git a/rs/replica_tests/BUILD.bazel b/rs/replica_tests/BUILD.bazel
@@ -16,6 +16,7 @@ DEPENDENCIES = [
     "//rs/interfaces/state_manager",
     "//rs/monitoring/metrics",
     "//rs/monitoring/tracing",
+    "//rs/pocket_ic_tests",
     "//rs/prep",
     "//rs/protobuf",
     "//rs/registry/fake",
@@ -25,7 +26,6 @@ DEPENDENCIES = [
     "//rs/registry/subnet_type",
     "//rs/replica:replica_lib",
     "//rs/replicated_state",
-    "//rs/state_machine_tests",
     "//rs/test_utilities",
     "//rs/test_utilities/logger",
     "//rs/test_utilities/types",

diff --git a/rs/replica_tests/Cargo.toml b/rs/replica_tests/Cargo.toml
@@ -22,6 +22,7 @@ ic-interfaces-registry = { path = "../interfaces/registry" }
 ic-interfaces-state-manager = { path = "../interfaces/state_manager" }
 ic-management-canister-types = { path = "../types/management_canister_types" }
 ic-metrics = { path = "../monitoring/metrics" }
+ic-pocket-ic-tests = { path = "../pocket_ic_tests" }
 ic-prep = { path = "../prep" }
 ic-protobuf = { path = "../protobuf" }
 ic-registry-client-fake = { path = "../registry/fake" }
@@ -31,7 +32,6 @@ ic-registry-provisional-whitelist = { path = "../registry/provisional_whitelist"
 ic-registry-subnet-type = { path = "../registry/subnet_type" }
 ic-replica = { path = "../replica" }
 ic-replicated-state = { path = "../replicated_state" }
-ic-state-machine-tests = { path = "../state_machine_tests" }
 ic-test-utilities = { path = "../test_utilities" }
 ic-test-utilities-logger = { path = "../test_utilities/logger" }
 ic-test-utilities-types = { path = "../test_utilities/types" }

diff --git a/rs/replica_tests/src/lib.rs b/rs/replica_tests/src/lib.rs
@@ -14,6 +14,7 @@ use ic_management_canister_types::{
     ProvisionalCreateCanisterWithCyclesArgs, IC_00,
 };
 use ic_metrics::MetricsRegistry;
+use ic_pocket_ic_tests::StateMachine;
 use ic_prep_lib::{
     internet_computer::{IcConfig, TopologyConfig},
     node::{NodeConfiguration, NodeIndex, NodeSecretKeyStore},
@@ -26,7 +27,6 @@ use ic_registry_provisional_whitelist::ProvisionalWhitelist;
 use ic_registry_subnet_type::SubnetType;
 use ic_replica::setup::setup_crypto_provider;
 use ic_replicated_state::{CanisterState, ReplicatedState};
-use ic_state_machine_tests::StateMachine;
 use ic_test_utilities::universal_canister::UNIVERSAL_CANISTER_WASM;
 use ic_test_utilities_logger::with_test_replica_logger;
 use ic_test_utilities_types::{