pub re-exporting some crates

anoma · Sep 5, 2024 · aa2cf20 · aa2cf20
1 parent 641a85b
commit aa2cf20
Show file tree

Hide file tree

Showing 25 changed files with 99 additions and 93 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/apps_lib/Cargo.toml b/crates/apps_lib/Cargo.toml
@@ -31,7 +31,6 @@ namada-eth-bridge = [
 
 [dependencies]
 namada_core = {path = "../core"}
-namada_io = { path = "../io" }
 namada_macros = {path = "../macros"}
 namada_migrations = {path = "../migrations", optional = true}
 namada_sdk = {path = "../sdk", features = ["download-params", "multicore"]}

diff --git a/crates/apps_lib/src/cli.rs b/crates/apps_lib/src/cli.rs
@@ -15,7 +15,7 @@ pub mod wallet;
 
 use clap::{ArgGroup, ArgMatches, ColorChoice};
 use color_eyre::eyre::Result;
-use namada_io::StdIo;
+use namada_sdk::io::StdIo;
 use utils::*;
 pub use utils::{safe_exit, Cmd};
 
@@ -3220,6 +3220,7 @@ pub mod args {
     use std::str::FromStr;
 
     use data_encoding::HEXUPPER;
+    use namada_core::masp::{MaspEpoch, PaymentAddress};
     use namada_sdk::address::{Address, EstablishedAddress};
     pub use namada_sdk::args::*;
     use namada_sdk::chain::{ChainId, ChainIdPrefix};
@@ -3230,6 +3231,7 @@ pub mod args {
     use namada_sdk::ibc::core::host::types::identifiers::{ChannelId, PortId};
     use namada_sdk::keccak::KeccakHash;
     use namada_sdk::key::*;
+    use namada_sdk::masp::utils::RetryStrategy;
     use namada_sdk::storage::{self, BlockHeight, Epoch};
     use namada_sdk::time::DateTimeUtc;
     use namada_sdk::token::NATIVE_MAX_DECIMAL_PLACES;
@@ -3246,8 +3248,6 @@ pub mod args {
         VP_USER_WASM,
     };
     use namada_sdk::{token, DEFAULT_GAS_LIMIT};
-    use namada_token::masp::utils::RetryStrategy;
-    use namada_token::masp::{MaspEpoch, PaymentAddress};
 
     use super::context::*;
     use super::utils::*;

diff --git a/crates/apps_lib/src/cli/api.rs b/crates/apps_lib/src/cli/api.rs
@@ -1,5 +1,5 @@
-use namada_io::{Client, Io};
 use namada_sdk::error::Error;
+use namada_sdk::io::{Client, Io};
 use namada_sdk::rpc::wait_until_node_is_synched;
 
 use crate::tendermint_rpc::client::CompatMode;

diff --git a/crates/apps_lib/src/cli/client.rs b/crates/apps_lib/src/cli/client.rs
@@ -1,7 +1,7 @@
 use std::io::Read;
 
 use color_eyre::eyre::Result;
-use namada_io::{display_line, Io, NamadaIo};
+use namada_sdk::io::{display_line, Io, NamadaIo};
 use namada_sdk::masp::ShieldedContext;
 use namada_sdk::{Namada, NamadaImpl};
 

diff --git a/crates/apps_lib/src/cli/context.rs b/crates/apps_lib/src/cli/context.rs
@@ -6,16 +6,20 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
 use color_eyre::eyre::Result;
-use namada_io::Io;
+use namada_core::masp::{
+    BalanceOwner, ExtendedSpendingKey, ExtendedViewingKey, PaymentAddress,
+    TransferSource, TransferTarget,
+};
 use namada_sdk::address::{Address, InternalAddress};
 use namada_sdk::chain::ChainId;
 use namada_sdk::ethereum_events::EthAddress;
 use namada_sdk::ibc::trace::{ibc_token, is_ibc_denom, is_nft_trace};
+use namada_sdk::io::Io;
 use namada_sdk::key::*;
+use namada_sdk::masp::fs::FsShieldedUtils;
+use namada_sdk::masp::ShieldedWallet;
 use namada_sdk::wallet::{DatedSpendingKey, DatedViewingKey, Wallet};
 use namada_sdk::{Namada, NamadaImpl};
-use namada_token::masp::fs::FsShieldedUtils;
-use namada_token::masp::{ShieldedWallet, *};
 
 use super::args;
 use crate::cli::utils;
@@ -231,7 +235,7 @@ impl Context {
     /// Make an implementation of Namada from this object and parameters.
     pub fn to_sdk<C, IO>(self, client: C, io: IO) -> impl Namada
     where
-        C: namada_io::Client + Sync,
+        C: namada_sdk::io::Client + Sync,
         IO: Io,
     {
         let chain_ctx = self.take_chain_or_exit();

diff --git a/crates/apps_lib/src/cli/relayer.rs b/crates/apps_lib/src/cli/relayer.rs
@@ -1,5 +1,5 @@
 use color_eyre::eyre::Result;
-use namada_io::Io;
+use namada_sdk::io::Io;
 
 use crate::cli;
 use crate::cli::api::{CliApi, CliClient};
@@ -14,7 +14,7 @@ impl CliApi {
     where
         C: CliClient,
     {
-        use namada_io::display_line;
+        use namada_sdk::io::display_line;
 
         display_line!(&io, "The Namada Ethereum bridge is disabled");
         Ok(())

diff --git a/crates/apps_lib/src/cli/wallet.rs b/crates/apps_lib/src/cli/wallet.rs
@@ -10,15 +10,14 @@ use color_eyre::eyre::Result;
 use itertools::sorted;
 use ledger_namada_rs::{BIP44Path, NamadaApp};
 use namada_core::chain::BlockHeight;
-use namada_io::{display_line, edisplay_line, Io};
+use namada_core::masp::{ExtendedSpendingKey, MaspValue, PaymentAddress};
 use namada_sdk::address::{Address, DecodeError};
+use namada_sdk::io::{display_line, edisplay_line, Io};
 use namada_sdk::key::*;
+use namada_sdk::masp::find_valid_diversifier;
 use namada_sdk::wallet::{
     DecryptionError, DerivationPath, DerivationPathError, FindKeyError, Wallet,
 };
-use namada_token::masp::{
-    find_valid_diversifier, ExtendedSpendingKey, MaspValue, PaymentAddress,
-};
 use rand_core::OsRng;
 
 use crate::cli;

diff --git a/crates/apps_lib/src/client/masp.rs b/crates/apps_lib/src/client/masp.rs
@@ -1,14 +1,16 @@
 use std::time::Duration;
 
 use color_eyre::owo_colors::OwoColorize;
-#[cfg(any(test, feature = "testing"))]
-use namada_io::DevNullProgressBar;
-use namada_io::{display, display_line, Client, Io, MaybeSend, MaybeSync};
 use namada_sdk::args::ShieldedSync;
 use namada_sdk::control_flow::install_shutdown_signal;
 use namada_sdk::error::Error;
-use namada_sdk::masp::{IndexerMaspClient, LedgerMaspClient, ShieldedContext};
-use namada_token::masp::{MaspLocalTaskEnv, ShieldedSyncConfig, ShieldedUtils};
+#[cfg(any(test, feature = "testing"))]
+use namada_sdk::io::DevNullProgressBar;
+use namada_sdk::io::{display, display_line, Client, Io, MaybeSend, MaybeSync};
+use namada_sdk::masp::{
+    IndexerMaspClient, LedgerMaspClient, MaspLocalTaskEnv, ShieldedContext,
+    ShieldedSyncConfig, ShieldedUtils,
+};
 
 #[allow(clippy::too_many_arguments)]
 pub async fn syncing<

diff --git a/crates/apps_lib/src/client/rpc.rs b/crates/apps_lib/src/client/rpc.rs
@@ -10,7 +10,7 @@ use masp_primitives::merkle_tree::MerklePath;
 use masp_primitives::sapling::Node;
 use masp_primitives::transaction::components::I128Sum;
 use masp_primitives::zip32::ExtendedFullViewingKey;
-use namada_io::{display, display_line, edisplay_line, Client, Io};
+use namada_core::masp::{BalanceOwner, MaspEpoch};
 use namada_sdk::address::{Address, InternalAddress, MASP};
 use namada_sdk::chain::{BlockHeight, Epoch};
 use namada_sdk::collections::{HashMap, HashSet};
@@ -26,7 +26,10 @@ use namada_sdk::governance::storage::proposal::{
 use namada_sdk::governance::utils::{ProposalVotes, VotePower};
 use namada_sdk::governance::ProposalVote;
 use namada_sdk::hash::Hash;
+use namada_sdk::io::{display, display_line, edisplay_line, Client, Io};
 use namada_sdk::key::*;
+use namada_sdk::masp::shielded_wallet::ShieldedApi;
+use namada_sdk::masp::MaspTokenRewardData;
 use namada_sdk::parameters::{storage as param_storage, EpochDuration};
 use namada_sdk::proof_of_stake::types::{
     CommissionPair, Slash, ValidatorMetaData, ValidatorState,
@@ -44,8 +47,6 @@ use namada_sdk::token::MaspDigitPos;
 use namada_sdk::tx::display_batch_resp;
 use namada_sdk::wallet::AddressVpType;
 use namada_sdk::{error, state as storage, token, Namada};
-use namada_token::masp::shielded_wallet::ShieldedApi;
-use namada_token::masp::{BalanceOwner, MaspEpoch, MaspTokenRewardData};
 
 use crate::cli::{self, args};
 use crate::tendermint::merkle::proof::ProofOps;