Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cherry-pick #18204] Cherry pick refactoring of sui-test-validator crate into sui to release v1.28 branch #18436

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ 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 }}
Expand All @@ -159,6 +160,10 @@ 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='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
Expand Down
13 changes: 11 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion binary-build-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
1 change: 0 additions & 1 deletion crates/sui-cluster-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ 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
Expand Down
16 changes: 16 additions & 0 deletions crates/sui-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,22 @@ 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))
}
Expand Down
1 change: 0 additions & 1 deletion crates/sui-faucet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ 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
Expand Down
13 changes: 12 additions & 1 deletion crates/sui-faucet/src/faucet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
use std::{net::Ipv4Addr, path::PathBuf, sync::Arc};

#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct FaucetReceipt {
Expand Down Expand Up @@ -44,6 +44,17 @@ 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
Expand Down
Loading
Loading