chore: fix movement-core-util for the nth time.

Author: l-monninger

Cargo.lock

@@ -104,6 +104,7 @@ movement-client = { git = "https://github.com/movementlabsxyz/movement.git", rev
 syncador =  { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
 movement-types = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
 maptos-execution-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
+movement-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
 
 # aptos-core
 aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "cb3b7b02f68c7d6982257e4c59955d0e63b513db" }
@@ -182,7 +183,7 @@ mtma-migrator-test-types = { path = "checks/migrator/util/types" }
 ## util
 movement-syncing = { path = "util/movement/movement-syncing" }
 movement-core = { path = "util/movement/movement-core" }
-movement-util = { path = "util/movement/movement-util" }
+movement-core-util = { path = "util/movement/movement-util" }
 movement-aptos = { path = "util/movement-aptos/movement-aptos" }
 movement-aptos-core = { path = "util/movement-aptos/movement-aptos-core" }
 

Cargo.toml

@@ -23,8 +23,7 @@ tracing = { workspace = true }
 movement-aptos-core = { workspace = true }
 futures-channel = { workspace = true }
 tokio = { workspace = true }
-# todo: get rid of namespace conflict
-movement-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
+movement-util = { workspace = true }
 
 [lints]
 workspace = true

migration/util/node-types/Cargo.toml

@@ -26,13 +26,13 @@ kestrel = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true }
-movement-util = { workspace = true }
+movement-core-util = { workspace = true }
 
 [build-dependencies]
 include-vendor = { workspace = true }
 cargo_metadata = { workspace = true }
 ready-docker = { workspace = true }
-movement-util = { workspace = true }
+movement-core-util = { workspace = true }
 tokio = { workspace = true }
 
 [lints]

util/movement/movement-core/Cargo.toml

@@ -1,5 +1,5 @@
 use include_vendor::{Buildtime, BuildtimeError, Noop};
-use movement_util::CONTAINERS;
+use movement_core_util::CONTAINERS;
 
 #[tokio::main]
 async fn main() -> Result<(), BuildtimeError> {

util/movement/movement-core/build.rs

@@ -214,7 +214,7 @@ impl Movement {
 	/// Runs the movement with the given overlays.
 	pub async fn run(&self) -> Result<(), MovementError> {
 		// set the CONTAINER_REV environment variable
-		std::env::set_var("CONTAINER_REV", movement_util::CONTAINER_REV);
+		std::env::set_var("CONTAINER_REV", movement_core_util::CONTAINER_REV);
 
 		let overlays = self.overlays.to_overlay_args();
 

util/movement/movement-core/src/movement.rs

@@ -1,5 +1,5 @@
 [package]
-name = "movement-util"
+name = "movement-core-util"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
@@ -9,7 +9,7 @@ publish = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-
+movement-util = { workspace = true }
 
 [lints]
 workspace = true

util/movement/movement-util/Cargo.toml

@@ -1,3 +1,5 @@
+pub use movement_util::*;
+
 pub const CONTAINER_REPO: &str = "ghcr.io/movementlabsxyz";
 pub const CONTAINER_REV: &str = "c2372ff";