From f6d6cd859628c9320f894d57e1295a03c5e0dc3e Mon Sep 17 00:00:00 2001 From: Thibault Martinez Date: Wed, 13 Nov 2024 09:39:32 +0100 Subject: [PATCH] chore(*): minor cleanup (#4022) * chore(*): minor cleanup * Update crates/iota/src/iota_commands.rs Co-authored-by: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> * harmonize newlines * fix wrong error log --------- Co-authored-by: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> --- crates/iota-archival/Cargo.toml | 2 +- crates/iota-open-rpc/Cargo.toml | 2 +- crates/iota-sdk/Cargo.toml | 2 +- .../transaction_builder/function_move_call.rs | 14 ++++---------- crates/iota-storage/Cargo.toml | 2 +- crates/iota-util-mem/Cargo.toml | 2 +- crates/iota/src/iota_commands.rs | 12 ++++++------ 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/crates/iota-archival/Cargo.toml b/crates/iota-archival/Cargo.toml index 4b0e33368ef..20ff23faa22 100644 --- a/crates/iota-archival/Cargo.toml +++ b/crates/iota-archival/Cargo.toml @@ -31,7 +31,7 @@ iota-types = { workspace = true, features = ["test-utils"] } [dev-dependencies] # external dependencies ed25519-consensus.workspace = true -fastcrypto = { workspace = true } +fastcrypto.workspace = true more-asserts.workspace = true tempfile.workspace = true tokio = { workspace = true, features = ["test-util"] } diff --git a/crates/iota-open-rpc/Cargo.toml b/crates/iota-open-rpc/Cargo.toml index 4c09e4be5f6..daeb6c88236 100644 --- a/crates/iota-open-rpc/Cargo.toml +++ b/crates/iota-open-rpc/Cargo.toml @@ -20,7 +20,7 @@ versions = "4.1.0" anyhow.workspace = true bcs.workspace = true clap.workspace = true -fastcrypto = { workspace = true } +fastcrypto.workspace = true pretty_assertions.workspace = true rand.workspace = true tokio = { workspace = true, features = ["full"] } diff --git a/crates/iota-sdk/Cargo.toml b/crates/iota-sdk/Cargo.toml index ed15f8733a8..f65de0938da 100644 --- a/crates/iota-sdk/Cargo.toml +++ b/crates/iota-sdk/Cargo.toml @@ -75,8 +75,8 @@ path = "examples/json_rpc_errors.rs" name = "utils" path = "examples/utils.rs" crate-type = ["staticlib"] -# Read API folder +# Read API folder [[example]] name = "checkpoints" path = "examples/read_api/checkpoints.rs" diff --git a/crates/iota-sdk/examples/transaction_builder/function_move_call.rs b/crates/iota-sdk/examples/transaction_builder/function_move_call.rs index 46ac42092ee..f26d326828e 100644 --- a/crates/iota-sdk/examples/transaction_builder/function_move_call.rs +++ b/crates/iota-sdk/examples/transaction_builder/function_move_call.rs @@ -15,9 +15,7 @@ use iota_sdk::{ base_types::ObjectID, programmable_transaction_builder::ProgrammableTransactionBuilder, quorum_driver_types::ExecuteTransactionRequestType, - transaction::{ - Argument, CallArg, Command, ProgrammableMoveCall, Transaction, TransactionData, - }, + transaction::{Argument, CallArg, Command, Transaction, TransactionData}, }, }; use shared_crypto::intent::Intent; @@ -66,13 +64,9 @@ async fn main() -> Result<(), anyhow::Error> { let package = ObjectID::from_hex_literal(pkg_id).map_err(|e| anyhow!(e))?; let module = Identifier::new("hello_world").map_err(|e| anyhow!(e))?; let function = Identifier::new("hello_world").map_err(|e| anyhow!(e))?; - ptb.command(Command::MoveCall(Box::new(ProgrammableMoveCall { - package, - module, - function, - type_arguments: vec![], - arguments: vec![Argument::Input(0)], - }))); + ptb.command(Command::move_call(package, module, function, vec![], vec![ + Argument::Input(0), + ])); // build the transaction block by calling finish on the ptb let builder = ptb.finish(); diff --git a/crates/iota-storage/Cargo.toml b/crates/iota-storage/Cargo.toml index d0d7a9cb32b..bc6d3a66e96 100644 --- a/crates/iota-storage/Cargo.toml +++ b/crates/iota-storage/Cargo.toml @@ -63,7 +63,7 @@ once_cell.workspace = true tempfile.workspace = true # internal dependencies -iota-macros = { workspace = true } +iota-macros.workspace = true iota-test-transaction-builder.workspace = true iota-types = { workspace = true, features = ["test-utils"] } diff --git a/crates/iota-util-mem/Cargo.toml b/crates/iota-util-mem/Cargo.toml index 3aa8608f96d..65acba595c3 100644 --- a/crates/iota-util-mem/Cargo.toml +++ b/crates/iota-util-mem/Cargo.toml @@ -12,7 +12,7 @@ description = "Collection of memory related utilities" # external dependencies cfg-if.workspace = true ed25519-consensus.workspace = true -fastcrypto = { workspace = true } +fastcrypto.workspace = true fastcrypto-tbls.workspace = true hashbrown = { version = "0.12", optional = true } impl-trait-for-tuples = "0.2.0" diff --git a/crates/iota/src/iota_commands.rs b/crates/iota/src/iota_commands.rs index ea99709667a..0e37b2f016b 100644 --- a/crates/iota/src/iota_commands.rs +++ b/crates/iota/src/iota_commands.rs @@ -164,11 +164,11 @@ pub enum IotaCommand { #[clap(name = "start")] Start { /// Config directory that will be used to store network config, node db, - /// keystore iota genesis -f --with-faucet generates a genesis - /// config that can be used to start this process. Use with - /// caution as the `-f` flag will overwrite the existing config - /// directory. We can use any config dir that is generated by - /// the `iota genesis`. + /// keystore. + /// `iota genesis -f --with-faucet` generates a genesis config that can + /// be used to start this process. Use with caution as the `-f` flag + /// will overwrite the existing config directory. We can use any config + /// dir that is generated by the `iota genesis`. #[clap(long = "network.config")] config_dir: Option, @@ -527,7 +527,7 @@ impl IotaCommand { PersistedConfig::read(&bridge_committee_config_path).map_err(|err| { err.context(format!( "Cannot open Bridge Committee config file at {:?}", - network_config_path + bridge_committee_config_path )) })?;