Revert "[CLI] Integrate sui-test-validator into sui start (#18204)"

This reverts commit dca6bfe.
MystenLabs · Jul 11, 2024 · caf04b1 · caf04b1
1 parent 1aa7beb
commit caf04b1
Show file tree

Hide file tree

Showing 20 changed files with 523 additions and 897 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -145,7 +145,6 @@ jobs:
         if: ${{ env.s3_archive_exist == '' }}
         shell: bash
         run: |
-          [ -f ~/.cargo/env ] && source ~/.cargo/env ; cargo build --bin sui --release --features indexer && mv target/release/sui target/release/sui-pg
           [ -f ~/.cargo/env ] && source ~/.cargo/env ; cargo build --release && cargo build --profile=dev --bin sui
 
       - name: Rename binaries for ${{ matrix.os }}
@@ -160,10 +159,6 @@ jobs:
             mv ./target/release/${binary}${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/${binary}${{ env.extention }}
           done
 
-          # sui-pg is a special binary that is built with the indexer feature for sui start cmd
-          export binary=$(echo "sui-pg" | tr -d $'\r')
-          mv ./target/release/${binary}${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/${binary}${{ env.extention }}
-
           mv ./target/debug/sui${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/sui-debug${{ env.extention }}
           tar -cvzf ./tmp/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz -C ${{ env.TMP_BUILD_DIR }} .
           [[ ${{ env.sui_tag }} == *"testnet"* ]] && aws s3 cp ./tmp/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz s3://sui-releases/releases/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz || true

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/binary-build-list.json b/binary-build-list.json
@@ -4,11 +4,11 @@
         "sui-node",
         "sui-tool",
         "sui-faucet",
+        "sui-test-validator",
         "sui-data-ingestion",
         "sui-bridge",
         "sui-bridge-cli",
         "sui-graphql-rpc",
-        "sui-test-validator",
         "move-analyzer"
     ],
     "internal_binaries": [

diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml
@@ -29,6 +29,7 @@ sui-indexer.workspace = true
 sui-faucet.workspace = true
 sui-graphql-rpc.workspace = true
 sui-swarm.workspace = true
+sui.workspace = true
 sui-swarm-config.workspace = true
 sui-json-rpc-types.workspace = true
 sui-sdk.workspace = true

diff --git a/crates/sui-config/src/lib.rs b/crates/sui-config/src/lib.rs
@@ -52,22 +52,6 @@ pub fn sui_config_dir() -> Result<PathBuf, anyhow::Error> {
     })
 }
 
-/// Check if the genesis blob exists in the given directory or the default directory.
-pub fn genesis_blob_exists(config_dir: Option<PathBuf>) -> bool {
-    if let Some(dir) = config_dir {
-        dir.join(SUI_GENESIS_FILENAME).exists()
-    } else if let Some(config_env) = std::env::var_os("SUI_CONFIG_DIR") {
-        Path::new(&config_env).join(SUI_GENESIS_FILENAME).exists()
-    } else if let Some(home) = dirs::home_dir() {
-        let mut config = PathBuf::new();
-        config.push(&home);
-        config.extend([SUI_DIR, SUI_CONFIG_DIR, SUI_GENESIS_FILENAME]);
-        config.exists()
-    } else {
-        false
-    }
-}
-
 pub fn validator_config_file(address: Multiaddr, i: usize) -> String {
     multiaddr_to_filename(address).unwrap_or(format!("validator-config-{}.yaml", i))
 }

diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml
@@ -29,6 +29,7 @@ rocksdb.workspace = true
 tempfile.workspace = true
 parking_lot.workspace = true
 
+sui.workspace = true
 sui-json-rpc-types.workspace = true
 sui-types.workspace = true
 sui-config.workspace = true

diff --git a/crates/sui-faucet/src/faucet/mod.rs b/crates/sui-faucet/src/faucet/mod.rs
@@ -10,7 +10,7 @@ mod simple_faucet;
 mod write_ahead_log;
 pub use self::simple_faucet::SimpleFaucet;
 use clap::Parser;
-use std::{net::Ipv4Addr, path::PathBuf, sync::Arc};
+use std::{net::Ipv4Addr, path::PathBuf};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct FaucetReceipt {
@@ -44,17 +44,6 @@ pub enum BatchSendStatusType {
     DISCARDED,
 }
 
-pub struct AppState<F = Arc<SimpleFaucet>> {
-    pub faucet: F,
-    pub config: FaucetConfig,
-}
-
-impl<F> AppState<F> {
-    pub fn new(faucet: F, config: FaucetConfig) -> Self {
-        Self { faucet, config }
-    }
-}
-
 #[async_trait]
 pub trait Faucet {
     /// Send `Coin<SUI>` of the specified amount to the recipient