Merge pull request #3670 from anoma/tomas/crate-refactors

crates refactors

.changelog/unreleased/improvements/3670-crate-refactors.md

@@ -0,0 +1,3 @@
+- Reorganized some types and modules and refactored crates re-
+  exports, error handling features and removed unused depdendencies.
+  ([\#3670](https://github.com/anoma/namada/pull/3670))

crates/core/src/account.rs → crates/account/src/auth.rs

@@ -1,17 +1,16 @@
-//! Account types
+//! Public keys associated with an account for n-signature authorization.
 
 use std::collections::BTreeMap;
 
 use borsh::{BorshDeserialize, BorshSerialize};
+use namada_core::collections::HashMap;
+use namada_core::hints;
+use namada_core::key::common;
 use namada_macros::BorshDeserializer;
 #[cfg(feature = "migrations")]
 use namada_migrations::*;
 use serde::{Deserialize, Serialize};
 
-use super::key::{common, RefTo};
-use crate::collections::HashMap;
-use crate::hints;
-
 #[derive(
     Debug,
     Clone,
@@ -86,7 +85,7 @@ impl AccountPublicKeysMap {
         secret_keys
             .into_iter()
             .filter_map(|secret_key: common::SecretKey| {
-                self.get_index_from_public_key(&secret_key.ref_to())
+                self.get_index_from_public_key(&secret_key.to_public())
                     .map(|index| (index, secret_key))
             })
             .collect()

crates/account/src/lib.rs

@@ -19,14 +19,17 @@
     clippy::print_stderr
 )]
 
+mod auth;
 mod storage;
 mod storage_key;
 mod types;
 
+pub use auth::AccountPublicKeysMap;
 use borsh::{BorshDeserialize, BorshSerialize};
-pub use namada_core::account::AccountPublicKeysMap;
-use namada_core::address::Address;
-use namada_core::key::common;
+pub use namada_core::address::Address;
+pub use namada_core::hash::Hash;
+pub use namada_core::key::common;
+pub use namada_core::storage::Key;
 use namada_macros::BorshDeserializer;
 #[cfg(feature = "migrations")]
 use namada_migrations::*;

crates/apps/Cargo.toml

@@ -67,13 +67,6 @@ tracing.workspace = true
 winapi.workspace = true
 
 [dev-dependencies]
-namada_test_utils = {path = "../test_utils"}
-
-assert_matches.workspace = true
-bit-set.workspace = true
-proptest.workspace = true
-test-log.workspace = true
-tokio-test.workspace = true
 
 [build-dependencies]
 git2.workspace = true

crates/apps_lib/Cargo.toml

@@ -18,8 +18,8 @@ mainnet = [
   "namada_sdk/mainnet",
 ]
 # for integration tests and test utilities
-testing = ["namada_test_utils", "lazy_static", "namada_sdk/testing"]
-benches = ["namada_test_utils", "lazy_static", "namada_sdk/benches"]
+testing = ["lazy_static", "namada_sdk/testing"]
+benches = ["lazy_static", "namada_sdk/benches"]
 integration = []
 migrations = [
   "namada_migrations",
@@ -35,7 +35,6 @@ namada_core = {path = "../core"}
 namada_macros = {path = "../macros"}
 namada_migrations = {path = "../migrations", optional = true}
 namada_sdk = {path = "../sdk", features = ["download-params", "multicore"]}
-namada_test_utils = {path = "../test_utils", optional = true}
 namada_vm = {path = "../vm"}
 
 async-trait.workspace = true
@@ -86,13 +85,9 @@ zeroize.workspace = true
 
 [dev-dependencies]
 namada_sdk = {path = "../sdk", features = ["testing"]}
-namada_test_utils = {path = "../test_utils"}
 
-assert_matches.workspace = true
 bit-set.workspace = true
 proptest.workspace = true
-test-log.workspace = true
-tokio-test.workspace = true
 lazy_static.workspace= true
 pretty_assertions.workspace = true
 

crates/apps_lib/src/cli/wallet.rs

@@ -9,7 +9,7 @@ use borsh_ext::BorshSerializeExt;
 use color_eyre::eyre::Result;
 use itertools::sorted;
 use ledger_namada_rs::{BIP44Path, NamadaApp};
-use namada_core::storage::BlockHeight;
+use namada_core::chain::BlockHeight;
 use namada_sdk::address::{Address, DecodeError};
 use namada_sdk::io::Io;
 use namada_sdk::key::*;

crates/apps_lib/src/client/rpc.rs

@@ -11,6 +11,7 @@ use masp_primitives::sapling::Node;
 use masp_primitives::transaction::components::I128Sum;
 use masp_primitives::zip32::ExtendedFullViewingKey;
 use namada_sdk::address::{Address, InternalAddress, MASP};
+use namada_sdk::chain::{BlockHeight, Epoch};
 use namada_sdk::collections::{HashMap, HashSet};
 use namada_sdk::control_flow::time::{Duration, Instant};
 use namada_sdk::events::Event;
@@ -37,7 +38,7 @@ use namada_sdk::queries::{Client, RPC};
 use namada_sdk::rpc::{
     self, enriched_bonds_and_unbonds, query_epoch, TxResponse,
 };
-use namada_sdk::storage::{BlockHeight, BlockResults, Epoch};
+use namada_sdk::storage::BlockResults;
 use namada_sdk::tendermint_rpc::endpoint::status;
 use namada_sdk::token::MaspDigitPos;
 use namada_sdk::tx::display_batch_resp;

crates/apps_lib/src/config/genesis.rs

@@ -16,13 +16,12 @@ use namada_macros::BorshDeserializer;
 #[cfg(feature = "migrations")]
 use namada_migrations::*;
 use namada_sdk::address::{Address, EstablishedAddress};
-use namada_sdk::chain::ProposalBytes;
 use namada_sdk::collections::HashMap;
 use namada_sdk::eth_bridge::EthereumBridgeParams;
 use namada_sdk::governance::parameters::GovernanceParameters;
 use namada_sdk::governance::pgf::parameters::PgfParameters;
 use namada_sdk::key::*;
-use namada_sdk::parameters::EpochDuration;
+use namada_sdk::parameters::{EpochDuration, ProposalBytes};
 use namada_sdk::proof_of_stake::{Dec, GenesisValidator, OwnedPosParams};
 use namada_sdk::string_encoding::StringEncoded;
 use namada_sdk::time::DateTimeUtc;

crates/apps_lib/src/config/genesis/templates.rs

@@ -9,11 +9,11 @@ use namada_macros::BorshDeserializer;
 #[cfg(feature = "migrations")]
 use namada_migrations::*;
 use namada_sdk::address::Address;
-use namada_sdk::chain::ProposalBytes;
 use namada_sdk::dec::Dec;
 use namada_sdk::eth_bridge::storage::parameters::{
     Contracts, Erc20WhitelistEntry, MinimumConfirmations,
 };
+use namada_sdk::parameters::ProposalBytes;
 use namada_sdk::token::{
     Amount, DenominatedAmount, Denomination, NATIVE_MAX_DECIMAL_PLACES,
 };

crates/apps_lib/src/config/mod.rs

@@ -11,9 +11,8 @@ use std::num::NonZeroU64;
 use std::path::{Path, PathBuf};
 
 use directories::ProjectDirs;
-use namada_sdk::chain::ChainId;
+use namada_sdk::chain::{BlockHeight, ChainId};
 use namada_sdk::collections::HashMap;
-use namada_sdk::storage::BlockHeight;
 use namada_sdk::time::Rfc3339String;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;