Fixed clippy issues and formatting. Added an std feature to enable te…

…st vector generation.

apps/Cargo.toml

@@ -45,7 +45,7 @@ mainnet = [
   "namada/mainnet",
 ]
 dev = ["namada/dev"]
-std = ["ed25519-consensus/std", "rand/std", "rand_core/std"]
+std = ["ed25519-consensus/std", "rand/std", "rand_core/std", "namada/std"]
 # for integration tests and test utilies
 testing = ["dev"]
 

apps/src/lib/cli.rs

@@ -3239,14 +3239,9 @@ pub mod args {
                     .about("Simulate the transaction application."),
             )
             .arg(DUMP_TX.def().about("Dump transaction bytes to a file."))
-            .arg(
-                FORCE
-                    .def()
-                    .about(
-                        "Submit the transaction even if it doesn't pass \
-                         client checks.",
-                    )
-            )
+            .arg(FORCE.def().about(
+                "Submit the transaction even if it doesn't pass client checks.",
+            ))
             .arg(BROADCAST_ONLY.def().about(
                 "Do not wait for the transaction to be applied. This will \
                  return once the transaction is added to the mempool.",

apps/src/lib/client/rpc.rs

@@ -34,7 +34,6 @@ use namada::ledger::pos::{
 use namada::ledger::queries::RPC;
 use namada::ledger::rpc::{query_epoch, TxResponse};
 use namada::ledger::storage::ConversionState;
-use namada::proto::Tx;
 use namada::ledger::wallet::{AddressVpType, Wallet};
 use namada::proof_of_stake::types::WeightedValidator;
 use namada::types::address::{masp, Address};
@@ -44,13 +43,7 @@ use namada::types::governance::{
 use namada::types::hash::Hash;
 use namada::types::key::*;
 use namada::types::masp::{BalanceOwner, ExtendedViewingKey, PaymentAddress};
-use namada::types::storage::{
-    BlockHeight, BlockResults, Epoch, Key, KeySeg, PrefixValue, TxIndex,
-};
-use namada::types::token::{balance_key, Transfer};
-use namada::types::transaction::{
-    AffineCurve, EllipticCurve, PairingEngine, WrapperTx,
-};
+use namada::types::storage::{BlockHeight, BlockResults, Epoch, Key, KeySeg};
 use namada::types::{storage, token};
 
 use crate::cli::{self, args};
@@ -915,10 +908,7 @@ pub fn print_decoded_balance_with_epoch(
         let asset_value = token::Amount::from(*value as u64);
         println!(
             "{} | {} : {}",
-            tokens
-                .get(addr)
-                .cloned()
-                .unwrap_or_else(|| addr.clone()),
+            tokens.get(addr).cloned().unwrap_or_else(|| addr.clone()),
             epoch,
             asset_value
         );
@@ -1660,10 +1650,7 @@ pub async fn query_conversions<C: namada::ledger::queries::Client + Sync>(
         // Print the asset to which the conversion applies
         print!(
             "{}[{}]: ",
-            tokens
-                .get(addr)
-                .cloned()
-                .unwrap_or_else(|| addr.clone()),
+            tokens.get(addr).cloned().unwrap_or_else(|| addr.clone()),
             epoch,
         );
         // Now print out the components of the allowed conversion
@@ -1677,10 +1664,7 @@ pub async fn query_conversions<C: namada::ledger::queries::Client + Sync>(
                 "{}{} {}[{}]",
                 prefix,
                 val,
-                tokens
-                    .get(addr)
-                    .cloned()
-                    .unwrap_or_else(|| addr.clone()),
+                tokens.get(addr).cloned().unwrap_or_else(|| addr.clone()),
                 epoch
             );
             // Future iterations need to be prefixed with +

apps/src/lib/client/signing.rs

@@ -1,47 +1,17 @@
 //! Helpers for making digital signatures using cryptographic keys from the
 //! wallet.
 
-use std::collections::{BTreeMap, HashMap};
-use std::env;
-use std::fs::File;
-use std::io::{Error, ErrorKind, Write};
-
-use borsh::{BorshDeserialize, BorshSerialize};
-use data_encoding::HEXLOWER;
-use itertools::Itertools;
-use masp_primitives::asset_type::AssetType;
-use masp_primitives::transaction::components::sapling::fees::{
-    InputView, OutputView,
-};
-use namada::ledger::parameters::storage as parameter_storage;
-use namada::proof_of_stake::Epoch;
-use namada::proto::{Section, Signature, Tx};
-use namada::types::address::{masp, Address, ImplicitAddress};
-use namada::types::key::*;
-use namada::types::masp::{ExtendedViewingKey, PaymentAddress};
-use namada::types::token;
-use namada::types::token::{Amount, Transfer};
-use namada::types::transaction::decrypted::DecryptedTx;
-use namada::types::transaction::governance::{
-    InitProposalData, VoteProposalData,
-};
-use namada::types::transaction::{
-    hash_tx, pos, Fee, InitAccount, InitValidator, TxType, UpdateVp, WrapperTx,
-    MIN_FEE,
-};
-use serde::{Deserialize, Serialize};
-
-use super::rpc;
-use crate::cli::context::{WalletAddress, WalletKeypair};
-use crate::cli::{self, args, Context};
-use crate::facade::tendermint_config::net::Address as TendermintAddress;
-use crate::facade::tendermint_rpc::HttpClient;
 use namada::ledger::rpc::TxBroadcastData;
 use namada::ledger::signing::TxSigningKey;
 use namada::ledger::tx;
 use namada::ledger::wallet::{Wallet, WalletUtils};
+use namada::proof_of_stake::Epoch;
+use namada::proto::Tx;
+use namada::types::address::Address;
 use namada::types::key::*;
 
+use crate::cli::args;
+
 /// Find the public key for the given address and try to load the keypair
 /// for it from the wallet. Panics if the key cannot be found or loaded.
 pub async fn find_keypair<
@@ -101,16 +71,16 @@ pub async fn sign_tx<
         #[cfg(not(feature = "mainnet"))]
         requires_pow,
     )
-        .await
+    .await
 }
 
 /// Create a wrapper tx from a normal tx. Get the hash of the
 /// wrapper and its payload which is needed for monitoring its
 /// progress on chain.
 pub async fn sign_wrapper<
-        C: namada::ledger::queries::Client + Sync,
+    C: namada::ledger::queries::Client + Sync,
     U: WalletUtils,
-    >(
+>(
     client: &C,
     wallet: &mut Wallet<U>,
     args: &args::Tx,

apps/src/lib/client/tx.rs

@@ -10,80 +10,35 @@ use async_std::io::prelude::WriteExt;
 use async_trait::async_trait;
 use borsh::{BorshDeserialize, BorshSerialize};
 use data_encoding::HEXLOWER_PERMISSIVE;
-use itertools::Either::*;
-use masp_primitives::asset_type::AssetType;
-use masp_primitives::consensus::TestNetwork;
-use masp_primitives::convert::AllowedConversion;
-use masp_primitives::ff::PrimeField;
-use masp_primitives::memo::MemoBytes;
-use masp_primitives::merkle_tree::{
-    CommitmentTree, IncrementalWitness, MerklePath,
-};
-use masp_primitives::sapling::keys::FullViewingKey;
-use masp_primitives::sapling::note_encryption::*;
-use masp_primitives::sapling::{
-    Diversifier, Node, Note, Nullifier, ViewingKey,
-};
-use masp_primitives::transaction::builder::{self, *};
-use masp_primitives::transaction::components::sapling::builder::SaplingMetadata;
-use masp_primitives::transaction::components::sapling::fees::{
-    ConvertView, InputView as SaplingInputView, OutputView as SaplingOutputView,
-};
-use masp_primitives::transaction::components::transparent::fees::{
-    InputView as TransparentInputView, OutputView as TransparentOutputView,
-};
-use masp_primitives::transaction::components::{
-    Amount, OutputDescription, TxOut,
-};
-use masp_primitives::transaction::fees::fixed::FeeRule;
-use masp_primitives::transaction::{
-    Authorization, Authorized, Transaction, TransparentAddress,
-};
-use masp_primitives::zip32::{ExtendedFullViewingKey, ExtendedSpendingKey};
 use masp_proofs::prover::LocalTxProver;
 use namada::ledger::governance::storage as gov_storage;
-use namada::ledger::masp;
-use namada::ledger::pos::{CommissionPair, PosParams};
-use namada::proto::{Code, Data, MaspBuilder, Section, Signature, Tx};
-use namada::types::address::{masp, masp_tx_key, Address};
 use namada::ledger::rpc::{TxBroadcastData, TxResponse};
 use namada::ledger::signing::TxSigningKey;
 use namada::ledger::wallet::{Wallet, WalletUtils};
-use namada::ledger::tx;
+use namada::ledger::{masp, tx};
+use namada::proto::{Code, Data, Section, Tx};
+use namada::types::address::Address;
 use namada::types::governance::{
     OfflineProposal, OfflineVote, Proposal, ProposalVote, VoteType,
 };
 use namada::types::hash::Hash;
 use namada::types::key::*;
-use namada::types::masp::{PaymentAddress, TransferTarget};
-use namada::types::storage::{
-    BlockHeight, Epoch, Key, KeySeg, TxIndex, RESERVED_ADDRESS_PREFIX,
-};
-use namada::types::time::DateTimeUtc;
-use namada::types::token::{
-    Transfer, HEAD_TX_KEY, PIN_KEY_PREFIX, TX_KEY_PREFIX,
-};
-use namada::types::transaction::decrypted::DecryptedTx;
+use namada::types::storage::{Epoch, Key};
+use namada::types::token;
 use namada::types::transaction::governance::{
     InitProposalData, ProposalType, VoteProposalData,
 };
-use namada::types::transaction::{
-    pos, InitAccount, InitValidator, TxType, UpdateVp,
-};
-use namada::types::{storage, token};
-use rand_core::{CryptoRng, OsRng, RngCore};
-use ripemd::Digest as RipemdDigest;
+use namada::types::transaction::{InitValidator, TxType};
 use rust_decimal::Decimal;
 use sha2::{Digest as Sha2Digest, Sha256};
-use tokio::time::{Duration, Instant};
 use tendermint_rpc::HttpClient;
 
 use super::rpc;
-use crate::client::tx::tx::ProcessTxResponse;
 use crate::cli::context::WalletAddress;
 use crate::cli::{args, safe_exit, Context};
 use crate::client::rpc::query_wasm_code_hash;
 use crate::client::signing::find_keypair;
+use crate::client::tx::tx::ProcessTxResponse;
 use crate::facade::tendermint_rpc::endpoint::broadcast::tx_sync::Response;
 use crate::node::ledger::tendermint_node;
 use crate::wallet::{
@@ -394,7 +349,7 @@ impl Default for CLIShieldedUtils {
     fn default() -> Self {
         Self {
             context_dir: PathBuf::from(FILE_NAME),
-                    }
+        }
     }
 }
 
@@ -412,7 +367,7 @@ impl masp::ShieldedUtils for CLIShieldedUtils {
         } else {
             LocalTxProver::with_default_location()
                 .expect("unable to load MASP Parameters")
-                        }
+        }
     }
 
     /// Try to load the last saved shielded context from the given context
@@ -501,12 +456,12 @@ pub async fn submit_init_proposal<C: namada::ledger::queries::Client + Sync>(
 
     let signer = WalletAddress::new(proposal.clone().author.to_string());
     let current_epoch = rpc::query_and_print_epoch(client).await;
-    
+
     let governance_parameters = rpc::get_governance_parameters(client).await;
     if proposal.voting_start_epoch <= current_epoch
         || proposal.voting_start_epoch.0
-        % governance_parameters.min_proposal_period
-        != 0
+            % governance_parameters.min_proposal_period
+            != 0
     {
         println!("{}", proposal.voting_start_epoch <= current_epoch);
         println!(
@@ -516,8 +471,8 @@ pub async fn submit_init_proposal<C: namada::ledger::queries::Client + Sync>(
                 == 0
         );
         eprintln!(
-            "Invalid proposal start epoch: {} must be greater than \
-             current epoch {} and a multiple of {}",
+            "Invalid proposal start epoch: {} must be greater than current \
+             epoch {} and a multiple of {}",
             proposal.voting_start_epoch,
             current_epoch,
             governance_parameters.min_proposal_period
@@ -527,15 +482,15 @@ pub async fn submit_init_proposal<C: namada::ledger::queries::Client + Sync>(
         }
     } else if proposal.voting_end_epoch <= proposal.voting_start_epoch
         || proposal.voting_end_epoch.0 - proposal.voting_start_epoch.0
-        < governance_parameters.min_proposal_period
+            < governance_parameters.min_proposal_period
         || proposal.voting_end_epoch.0 - proposal.voting_start_epoch.0
-        > governance_parameters.max_proposal_period
+            > governance_parameters.max_proposal_period
         || proposal.voting_end_epoch.0 % 3 != 0
     {
         eprintln!(
-            "Invalid proposal end epoch: difference between proposal \
-             start and end epoch must be at least {} and at max {} and \
-             end epoch must be a multiple of {}",
+            "Invalid proposal end epoch: difference between proposal start \
+             and end epoch must be at least {} and at max {} and end epoch \
+             must be a multiple of {}",
             governance_parameters.min_proposal_period,
             governance_parameters.max_proposal_period,
             governance_parameters.min_proposal_period
@@ -545,11 +500,11 @@ pub async fn submit_init_proposal<C: namada::ledger::queries::Client + Sync>(
         }
     } else if proposal.grace_epoch <= proposal.voting_end_epoch
         || proposal.grace_epoch.0 - proposal.voting_end_epoch.0
-        < governance_parameters.min_proposal_grace_epochs
+            < governance_parameters.min_proposal_grace_epochs
     {
         eprintln!(
-            "Invalid proposal grace epoch: difference between proposal \
-             grace and end epoch must be at least {}",
+            "Invalid proposal grace epoch: difference between proposal grace \
+             and end epoch must be at least {}",
             governance_parameters.min_proposal_grace_epochs
         );
         if !args.tx.force {
@@ -593,13 +548,10 @@ pub async fn submit_init_proposal<C: namada::ledger::queries::Client + Sync>(
             safe_exit(1)
         };
 
-        let balance = rpc::get_token_balance(
-            client,
-            &ctx.native_token,
-            &proposal.author,
-        )
-            .await
-            .unwrap_or_default();
+        let balance =
+            rpc::get_token_balance(client, &ctx.native_token, &proposal.author)
+                .await
+                .unwrap_or_default();
         if balance
             < token::Amount::from(governance_parameters.min_proposal_fund)
         {
@@ -871,7 +823,7 @@ pub async fn submit_vote_proposal<C: namada::ledger::queries::Client + Sync>(
                 let data = tx_data
                     .try_to_vec()
                     .expect("Encoding proposal data shouldn't fail");
-                
+
                 let tx_code = args.tx_code_path;
                 let mut tx = Tx::new(TxType::Raw);
                 tx.header.chain_id = chain_id;
@@ -1057,7 +1009,7 @@ pub async fn submit_validator_commission_change<
         &mut ctx.wallet,
         args,
     )
-        .await
+    .await
 }
 
 /// Submit transaction and wait for result. Returns a list of addresses
@@ -1071,7 +1023,10 @@ async fn process_tx<C: namada::ledger::queries::Client + Sync>(
     #[cfg(not(feature = "mainnet"))] requires_pow: bool,
 ) -> Result<(Context, Vec<Address>), tx::Error> {
     let args = args::Tx {
-        chain_id: args.clone().chain_id.or_else(|| Some(tx.header.chain_id.clone())),
+        chain_id: args
+            .clone()
+            .chain_id
+            .or_else(|| Some(tx.header.chain_id.clone())),
         ..args.clone()
     };
     let res: Vec<Address> = tx::process_tx::<C, _>(
@@ -1083,7 +1038,7 @@ async fn process_tx<C: namada::ledger::queries::Client + Sync>(
         #[cfg(not(feature = "mainnet"))]
         requires_pow,
     )
-        .await?
+    .await?
     .initialized_accounts();
     Ok((ctx, res))
 }