feat: aptos cli 2.4

movementlabsxyz · Feb 4, 2024 · b5437ab · b5437ab
1 parent 29ce961
commit b5437ab
Show file tree

Hide file tree

Showing 7 changed files with 2,472 additions and 786 deletions.
diff --git a/m1/Cargo.toml b/m1/Cargo.toml
@@ -248,8 +248,3 @@ aptos-vm-types = { path = "../vendors/aptos-core-v2/aptos-move/aptos-vm-types" }
 aptos-vm-validator = { path = "../vendors/aptos-core-v2/vm-validator" }
 aptos-warp-webserver = { path = "../vendors/aptos-core-v2/crates/aptos-warp-webserver" }
 aptos-writeset-generator = { path = "../vendors/aptos-core-v2/aptos-move/writeset-transaction-generator" }
-
-[patch.crates-io]
-serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "839aed62a20ddccf043c08961cfe74875741ccba" }
-merlin = { git = "https://github.com/aptos-labs/merlin" }
-x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
diff --git a/m1/scripts/tests.debug.sh b/m1/scripts/tests.debug.sh
@@ -5,6 +5,7 @@ if ! [[ "$0" =~ scripts/tests.debug.sh ]]; then
   exit 255
 fi
 
+export SUBNET_TIMEOUT=300
 ./scripts/build.debug.sh \
 && VM_PLUGIN_PATH=$(pwd)/target/debug/subnet \
 ./scripts/tests.e2e.sh