chore: reorg testnet ids.

movementlabsxyz · Jan 24, 2024 · a294604 · a294604
1 parent d0c6260
commit a294604
Show file tree

Hide file tree

Showing 50 changed files with 267 additions and 247 deletions.
diff --git a/movement-sdk/Cargo.lock b/movement-sdk/Cargo.lock
diff --git a/movement-sdk/Cargo.toml b/movement-sdk/Cargo.toml
@@ -22,7 +22,10 @@ members = [
     "clis/movement",
 
     # artifacts
-    "artifact/artifacts",
+    "artifacts",
+
+    # services
+    "services",
 
     # util
     "util/util",
@@ -42,7 +45,8 @@ rust-version = "1.70"
 [workspace.dependencies]
 util = { path = "util/util", features = ["logging"] }
 test-helpers = { path = "util/test-helpers" }
-artifacts = { path = "artifact/artifacts" }
+artifacts = { path = "artifacts" }
+services = { path = "services" }
 
 async-trait = { version = "0.1" } 
 anyhow = { version = "1" }     # For flexible error handling

diff --git a/movement-sdk/artifact/artifacts/Cargo.toml → movement-sdk/artifacts/Cargo.toml b/movement-sdk/artifact/artifacts/Cargo.toml → movement-sdk/artifacts/Cargo.toml
diff --git a/.../artifacts/src/known_artifacts/install.rs → .../artifacts/src/known_artifacts/install.rs b/.../artifacts/src/known_artifacts/install.rs → .../artifacts/src/known_artifacts/install.rs
diff --git a/...ifacts/src/known_artifacts/m1/localnet.rs → ...ifacts/src/known_artifacts/m1/localnet.rs b/...ifacts/src/known_artifacts/m1/localnet.rs → ...ifacts/src/known_artifacts/m1/localnet.rs
diff --git a/.../known_artifacts/m1/m1_with_submodules.rs → .../known_artifacts/m1/m1_with_submodules.rs b/.../known_artifacts/m1/m1_with_submodules.rs → .../known_artifacts/m1/m1_with_submodules.rs
diff --git a/...t/artifacts/src/known_artifacts/m1/mod.rs → ...k/artifacts/src/known_artifacts/m1/mod.rs b/...t/artifacts/src/known_artifacts/m1/mod.rs → ...k/artifacts/src/known_artifacts/m1/mod.rs
diff --git a/...rtifacts/src/known_artifacts/m1/subnet.rs → ...rtifacts/src/known_artifacts/m1/subnet.rs b/...rtifacts/src/known_artifacts/m1/subnet.rs → ...rtifacts/src/known_artifacts/m1/subnet.rs
@@ -35,12 +35,13 @@ impl Constructor {
         Artifact::self_contained_script(
             "subnet".to_string(),
             r#"
+            mkdir -p $MOVEMENT_DIR/bin
             source "$HOME/.cargo/env"
             echo $MOVEMENT_DIR
             cd $MOVEMENT_DIR/src/m1-with-submodules/m1
             cargo build -p subnet
             # for now use the debug build
-            cp target/debug/subnet $MOVEMENT_DIR/bin
+            cp target/debug/subnet $MOVEMENT_DIR/bin/subnet
             "#.to_string(),
         ).with_dependencies(vec![
             cargo::Constructor::default().into(),

diff --git a/...tifacts/src/known_artifacts/m1/testnet.rs → ...tifacts/src/known_artifacts/m1/testnet.rs b/...tifacts/src/known_artifacts/m1/testnet.rs → ...tifacts/src/known_artifacts/m1/testnet.rs
@@ -38,7 +38,7 @@ impl ConstructorOperations for Constructor {
         let testnet_id = testnet_id::Constructor::default_with_version(version);
 
         Artifact::self_contained_script(
-            "subnet".to_string(),
+            "testnet".to_string(),
             r#"
             echo $MOVEMENT_DIR
             cp $MOVEMENT_DIR/bin/subnet $MOVEMENT_DIR/bin/$(cat $MOVEMENT_DIR/rsc/testnet-id)

diff --git a/...acts/src/known_artifacts/m1/testnet_id.rs → ...acts/src/known_artifacts/m1/testnet_id.rs b/...acts/src/known_artifacts/m1/testnet_id.rs → ...acts/src/known_artifacts/m1/testnet_id.rs
diff --git a/...t/artifacts/src/known_artifacts/m2/mod.rs → ...k/artifacts/src/known_artifacts/m2/mod.rs b/...t/artifacts/src/known_artifacts/m2/mod.rs → ...k/artifacts/src/known_artifacts/m2/mod.rs
diff --git a/...fact/artifacts/src/known_artifacts/mod.rs → ...-sdk/artifacts/src/known_artifacts/mod.rs b/...fact/artifacts/src/known_artifacts/mod.rs → ...-sdk/artifacts/src/known_artifacts/mod.rs
diff --git a/...facts/src/known_artifacts/movement/mod.rs → ...facts/src/known_artifacts/movement/mod.rs b/...facts/src/known_artifacts/movement/mod.rs → ...facts/src/known_artifacts/movement/mod.rs
diff --git a/.../src/known_artifacts/movement/movement.rs → .../src/known_artifacts/movement/movement.rs b/.../src/known_artifacts/movement/movement.rs → .../src/known_artifacts/movement/movement.rs
@@ -40,7 +40,7 @@ impl Constructor {
             cd $MOVEMENT_DIR/src/m1-with-submodules/movement-sdk
             cargo build -p movement
             # for now use the debug build
-            cp target/debug/movement $MOVEMENT_DIR/bin
+            cp target/debug/movement $MOVEMENT_DIR/bin/movement
             "#.to_string(),
         ).with_dependencies(vec![
             cargo::Constructor::default().into(),

diff --git a/...artifacts/src/known_artifacts/registry.rs → ...artifacts/src/known_artifacts/registry.rs b/...artifacts/src/known_artifacts/registry.rs → ...artifacts/src/known_artifacts/registry.rs
diff --git a/...ifacts/third_party/avalanche/avalanche.rs → ...ifacts/third_party/avalanche/avalanche.rs b/...ifacts/third_party/avalanche/avalanche.rs → ...ifacts/third_party/avalanche/avalanche.rs
@@ -29,6 +29,10 @@ impl ConstructorOperations for Constructor {
             (echo; echo 'export PATH="$HOME/bin:$PATH"') >> "$HOME/.bash_profile"
             export PATH="$HOME/bin:$PATH"
 
+            # copy avalanche to movement bin
+            mkdir -p $MOVEMENT_DIR/bin
+            cp $(which avalanche) $MOVEMENT_DIR/bin/avalanche
+
             avalanche --version
             "#.to_string(),
         ).with_dependencies(

diff --git a/...acts/third_party/avalanche/avalanchego.rs → ...acts/third_party/avalanche/avalanchego.rs b/...acts/third_party/avalanche/avalanchego.rs → ...acts/third_party/avalanche/avalanchego.rs
@@ -19,12 +19,15 @@ impl ConstructorOperations for Constructor {
         Artifact::self_contained_script(
             "cargo".to_string(),
             r#"
+
+            mkdir -p $MOVEMENT_DIR/bin
             git clone [email protected]:ava-labs/avalanchego.git
             cd avalanchego
             ./scripts/build.sh
 
             mkdir -p $HOME/bin
             mv ./build/avalanchego $HOME/bin/avalanchego
+            cp $HOME/bin/avalanchego $MOVEMENT_DIR/bin/avalanchego
             cd ..
             rm -rf avalanchego
 

diff --git a/...wn_artifacts/third_party/avalanche/mod.rs → ...wn_artifacts/third_party/avalanche/mod.rs b/...wn_artifacts/third_party/avalanche/mod.rs → ...wn_artifacts/third_party/avalanche/mod.rs
diff --git a/...nown_artifacts/third_party/cargo/cargo.rs → ...nown_artifacts/third_party/cargo/cargo.rs b/...nown_artifacts/third_party/cargo/cargo.rs → ...nown_artifacts/third_party/cargo/cargo.rs
diff --git a/.../known_artifacts/third_party/cargo/mod.rs → .../known_artifacts/third_party/cargo/mod.rs b/.../known_artifacts/third_party/cargo/mod.rs → .../known_artifacts/third_party/cargo/mod.rs
diff --git a/...ts/src/known_artifacts/third_party/mod.rs → ...ts/src/known_artifacts/third_party/mod.rs b/...ts/src/known_artifacts/third_party/mod.rs → ...ts/src/known_artifacts/third_party/mod.rs
diff --git a/...c/known_artifacts/third_party/sys/brew.rs → ...c/known_artifacts/third_party/sys/brew.rs b/...c/known_artifacts/third_party/sys/brew.rs → ...c/known_artifacts/third_party/sys/brew.rs
diff --git a/...c/known_artifacts/third_party/sys/curl.rs → ...c/known_artifacts/third_party/sys/curl.rs b/...c/known_artifacts/third_party/sys/curl.rs → ...c/known_artifacts/third_party/sys/curl.rs
diff --git a/...rc/known_artifacts/third_party/sys/git.rs → ...rc/known_artifacts/third_party/sys/git.rs b/...rc/known_artifacts/third_party/sys/git.rs → ...rc/known_artifacts/third_party/sys/git.rs
@@ -19,7 +19,7 @@ impl ConstructorOperations for Constructor {
         #[cfg(target_os = "macos")]
         let git = Artifact::noop("git".to_string()); // Should already be installed on macOS
 
-        #[cfg(not(target_os = "ubuntu"))]
+        #[cfg(target_os = "ubuntu")]
         let git = Artifact::self_contained_script(
             "git".to_string(),
             r#"

diff --git a/...rc/known_artifacts/third_party/sys/mod.rs → ...rc/known_artifacts/third_party/sys/mod.rs b/...rc/known_artifacts/third_party/sys/mod.rs → ...rc/known_artifacts/third_party/sys/mod.rs
diff --git a/movement-sdk/artifact/artifacts/src/lib.rs → movement-sdk/artifacts/src/lib.rs b/movement-sdk/artifact/artifacts/src/lib.rs → movement-sdk/artifacts/src/lib.rs
diff --git a/movement-sdk/clis/movement/src/ctl/mod.rs b/movement-sdk/clis/movement/src/ctl/mod.rs
@@ -1,6 +1,5 @@
 pub mod ctl;
 pub use ctl::Ctl;
-pub mod services;
 pub mod start;
 pub mod stop;
 pub mod status;

diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/m1.rs b/movement-sdk/clis/movement/src/ctl/services/m1/m1.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/mod.rs b/movement-sdk/clis/movement/src/ctl/services/m1/mod.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/proxy/mod.rs b/movement-sdk/clis/movement/src/ctl/services/m1/proxy/mod.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/proxy/proxy.rs b/movement-sdk/clis/movement/src/ctl/services/m1/proxy/proxy.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/subnet/fuji.rs b/movement-sdk/clis/movement/src/ctl/services/m1/subnet/fuji.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/subnet/local.rs b/movement-sdk/clis/movement/src/ctl/services/m1/subnet/local.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/subnet/mod.rs b/movement-sdk/clis/movement/src/ctl/services/m1/subnet/mod.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m1/subnet/subnet.rs b/movement-sdk/clis/movement/src/ctl/services/m1/subnet/subnet.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/m2/mod.rs b/movement-sdk/clis/movement/src/ctl/services/m2/mod.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/mevm/mod.rs b/movement-sdk/clis/movement/src/ctl/services/mevm/mod.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/mod.rs b/movement-sdk/clis/movement/src/ctl/services/mod.rs
diff --git a/movement-sdk/clis/movement/src/ctl/services/service.rs b/movement-sdk/clis/movement/src/ctl/services/service.rs