Skip to content

Commit

Permalink
evil: #1273 - make fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Gianmarco Fraccaroli committed Apr 7, 2023
1 parent 24f8bf6 commit 56bf077
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion apps/src/lib/client/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ use masp_primitives::transaction::components::Amount;
use masp_primitives::zip32::ExtendedFullViewingKey;
#[cfg(not(feature = "mainnet"))]
use namada::core::ledger::testnet_pow;
use namada::core::types::transaction::governance::ProposalType;
use namada::core::types::key;
use namada::core::types::transaction::governance::ProposalType;
use namada::ledger::events::Event;
use namada::ledger::governance::parameters::GovParams;
use namada::ledger::governance::storage as gov_storage;
Expand Down
11 changes: 8 additions & 3 deletions apps/src/lib/client/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ use std::{env, fs};
use async_std::io::prelude::WriteExt;
use async_std::io::{self};
use borsh::{BorshDeserialize, BorshSerialize};
use data_encoding::HEXLOWER_PERMISSIVE;
use data_encoding::HEXLOWER;
use data_encoding::{HEXLOWER, HEXLOWER_PERMISSIVE};
use itertools::Either::*;
use itertools::Itertools;
use masp_primitives::asset_type::AssetType;
Expand Down Expand Up @@ -138,7 +137,13 @@ pub async fn submit_custom(ctx: Context, args: args::TxCustom) {
// let address = ctx.get(&args.address);
let pks_index_map = rpc::get_address_pks_map(&client, &address).await;

let tx = Tx::new_with_timestamp(tx_code, Some(tx_data), ctx.config.ledger.chain_id.clone(), timestamp, args.tx.expiration);
let tx = Tx::new_with_timestamp(
tx_code,
Some(tx_data),
ctx.config.ledger.chain_id.clone(),
timestamp,
args.tx.expiration,
);

let (_ctx, _initialized_accounts) = process_tx(
ctx,
Expand Down
6 changes: 3 additions & 3 deletions core/src/proto/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl SigningTx {
data: signed.try_to_vec().ok(),
timestamp: self.timestamp,
chain_id: self.chain_id,
expiration: self.expiration
expiration: self.expiration,
}
}

Expand All @@ -292,7 +292,7 @@ impl SigningTx {
data: signed.try_to_vec().ok(),
timestamp: self.timestamp,
chain_id: self.chain_id,
expiration: self.expiration
expiration: self.expiration,
}
}

Expand Down Expand Up @@ -548,7 +548,7 @@ impl Tx {
data,
timestamp,
chain_id,
expiration
expiration,
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/types/governance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use rust_decimal::Decimal;
use serde::{Deserialize, Serialize};
use thiserror::Error;

use super::key::RefTo;
use super::key::common::Signature;
use super::key::RefTo;
use crate::proto::SignatureIndex;
use crate::types::address::Address;
use crate::types::hash::Hash;
Expand Down
6 changes: 2 additions & 4 deletions tests/src/vm_host_env/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,8 @@ impl TestTxEnv {
vp_whitelist.unwrap_or_default(),
)
.unwrap();
parameters::update_max_signature_per_tx(
&mut self.wl_storage,
&40,
).unwrap();
parameters::update_max_signature_per_tx(&mut self.wl_storage, &40)
.unwrap();
}

/// Fake accounts' existence by initializing their VP storage.
Expand Down

0 comments on commit 56bf077

Please sign in to comment.