chore: fix deconstruction.

Author: l-monninger

Cargo.lock

@@ -16,7 +16,6 @@ mtma-node-test-global-storage-includes-criterion = { workspace = true }
 movement-syncing = { workspace = true }
 maptos-execution-util = { workspace = true }
 tokio = { workspace = true }
-futures = { workspace = true }
 sysinfo = { workspace = true }
 tracing = { workspace = true }
 

checks/node/checks/movement-mainnet/Cargo.toml

@@ -22,7 +22,6 @@ mtma-node-test-global-storage-includes-criterion = { workspace = true }
 mtma-node-test-types = { workspace = true }
 movement-syncing = { workspace = true }
 maptos-execution-util = { workspace = true }
-futures = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 

migration/cli/migrate-node-dev/Cargo.toml

@@ -145,7 +145,8 @@ Usage: --environment-box.* [OPTIONS] --rest-api-url <REST_API_URL> --db-dir <DB_
 Options:
       --rest-api-url <REST_API_URL>  The rest api url of the box environment
       --db-dir <DB_DIR>              The db dir of the box environment
-      --snapshot-dir <SNAPSHOT_DIR>  Whether to isolate the box environment by snapshotting the movement runner and where to store the snapshot
+      --snapshot-dir <SNAPSHOT_DIR>  Whether to isolate the box environment by snapshotting the movement runner and where to
+                                     store the snapshot
   -h, --help                         Print help (see more with '--help')
 
 **Selection (3/4):** `environment-provisioner`

migration/cli/migrate-node/docs/cli/README.md

@@ -15,7 +15,6 @@ thiserror = { workspace = true }
 either = { workspace = true }
 tracing = { workspace = true }
 movement-aptos-core = { workspace = true }
-futures-channel = { workspace = true }
 
 uuid = { workspace = true }
 walkdir = { workspace = true }

migration/util/node-types/Cargo.toml

@@ -610,22 +610,28 @@ impl Movement {
 
 impl Drop for Movement {
 	fn drop(&mut self) {
+		std::env::set_var("CONTAINER_REV", movement_core_util::CONTAINER_REV);
 		// run docker compose down on workspace path
 		info!("Dropping movement");
 		let workspace_path = self.workspace_path();
 		info!("Workspace path: {:?}", workspace_path);
-		let result = std::process::Command::new("docker")
-			.arg("compose")
-			.arg("-f")
-			.arg(workspace_path.join("docker/compose/movement-full-node/docker-compose.yml"))
-			.arg("-f")
-			.arg(workspace_path.join("docker/compose/movement-full-node/docker-compose.local.yml"))
+		let overlays = self.overlays.as_vec();
+		let mut command = std::process::Command::new("docker");
+		command.arg("compose");
+		command.arg("-f").arg("docker/compose/movement-full-node/docker-compose.yml");
+		for overlay in overlays {
+			let overlay_arg = overlay.overlay_arg();
+			let compose_file = workspace_path.join(format!(
+				"docker/compose/movement-full-node/docker-compose.{}.yml",
+				overlay_arg
+			));
+			command.arg("-f").arg(compose_file);
+		}
+		command
 			.arg("down")
 			.env("DOT_MOVEMENT_PATH", workspace_path.join(".movement"))
-			.current_dir(workspace_path)
-			.output()
-			.map_err(|e| MovementError::Internal(e.into()))
-			.unwrap();
+			.current_dir(workspace_path);
+		let result = command.output().map_err(|e| MovementError::Internal(e.into())).unwrap();
 
 		info!("Docker compose down result: {:?}", result);