From eee06358f6059f8cdc874fbdbba13a62f95e3c58 Mon Sep 17 00:00:00 2001 From: brentstone Date: Mon, 24 Oct 2022 00:26:15 -0400 Subject: [PATCH] fmt and Cargo.lock files --- Cargo.lock | 2 ++ apps/src/lib/cli.rs | 3 +- apps/src/lib/client/rpc.rs | 3 +- apps/src/lib/node/ledger/shims/abcipp_shim.rs | 20 +++++++------ proof_of_stake/src/lib.rs | 5 ++-- tests/src/e2e/ledger_tests.rs | 1 + wasm/Cargo.lock | 29 +++++++++++++++---- wasm/wasm_source/src/tx_bond.rs | 3 +- 8 files changed, 46 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84c863427ca..95f44c0056c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3114,6 +3114,8 @@ dependencies = [ "proptest", "prost", "rand 0.8.5", + "rust_decimal", + "rust_decimal_macros", "serde_json", "sha2 0.9.9", "tempfile", diff --git a/apps/src/lib/cli.rs b/apps/src/lib/cli.rs index 5bd1cfedc8c..0510eddd2f9 100644 --- a/apps/src/lib/cli.rs +++ b/apps/src/lib/cli.rs @@ -1336,7 +1336,8 @@ pub mod args { const LEDGER_ADDRESS: Arg = arg("ledger-address"); const LOCALHOST: ArgFlag = flag("localhost"); - const MAX_COMMISSION_RATE_CHANGE: Arg = arg("max-commission-rate-change"); + const MAX_COMMISSION_RATE_CHANGE: Arg = + arg("max-commission-rate-change"); const MODE: ArgOpt = arg_opt("mode"); const NET_ADDRESS: Arg = arg("net-address"); const NFT_ADDRESS: Arg
= arg("nft-address"); diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index f1e2f0f0a87..57051232858 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -1953,8 +1953,7 @@ async fn get_validator_stake( .expect("Total deltas should be defined"); let validator_stake = validator_deltas.get(epoch); - VotePower::try_from(validator_stake.unwrap_or_default()) - .unwrap_or_default() + VotePower::try_from(validator_stake.unwrap_or_default()).unwrap_or_default() } pub async fn get_delegators_delegation( diff --git a/apps/src/lib/node/ledger/shims/abcipp_shim.rs b/apps/src/lib/node/ledger/shims/abcipp_shim.rs index 4cda898c11f..17188eaddda 100644 --- a/apps/src/lib/node/ledger/shims/abcipp_shim.rs +++ b/apps/src/lib/node/ledger/shims/abcipp_shim.rs @@ -188,15 +188,17 @@ impl AbcippShim { _ => Err(Error::ConvertResp(res)), }) } - _ => match Request::try_from(req.clone()) { - Ok(request) => self - .service - .call(request) - .map(Resp::try_from) - .map_err(Error::Shell) - .and_then(|inner| inner), - Err(err) => Err(err), - }, + _ => { + match Request::try_from(req.clone()) { + Ok(request) => self + .service + .call(request) + .map(Resp::try_from) + .map_err(Error::Shell) + .and_then(|inner| inner), + Err(err) => Err(err), + } + } }; let resp = resp.map_err(|e| e.into()); if resp_sender.send(resp).is_err() { diff --git a/proof_of_stake/src/lib.rs b/proof_of_stake/src/lib.rs index 39e08b842a0..f57315ba5c2 100644 --- a/proof_of_stake/src/lib.rs +++ b/proof_of_stake/src/lib.rs @@ -1043,8 +1043,9 @@ pub trait PosBase { ); signer_set.insert(native_address.clone()); - // vote.validator_vp is updating at a constant delay relative to the validator deltas - // use validator deltas in namada protocol to get voting power instead + // vote.validator_vp is updating at a constant delay relative to the + // validator deltas. + // Use validator deltas in namada protocol to get voting power instead let deltas = self.read_validator_deltas(&native_address).unwrap(); let stake: Self::TokenChange = deltas.get(epoch).unwrap(); let stake: u64 = Into::::into(stake).try_into().unwrap(); diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs index 1cd70174e64..5be0d7a338b 100644 --- a/tests/src/e2e/ledger_tests.rs +++ b/tests/src/e2e/ledger_tests.rs @@ -20,6 +20,7 @@ use namada::types::token; use namada_apps::config::genesis::genesis_config::{ GenesisConfig, ParametersConfig, PosParamsConfig, }; +use rust_decimal_macros::dec; use serde_json::json; use setup::constants::*; diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index a17af3a51dd..d0fe406abaf 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -1076,7 +1076,7 @@ dependencies = [ "subtle-encoding", "tendermint", "tendermint-light-client-verifier", - "tendermint-proto", + "tendermint-proto 0.23.6", "tendermint-testgen", "time", "tracing", @@ -1092,7 +1092,7 @@ dependencies = [ "prost", "prost-types", "serde", - "tendermint-proto", + "tendermint-proto 0.23.6", ] [[package]] @@ -1387,7 +1387,7 @@ dependencies = [ "sparse-merkle-tree", "tempfile", "tendermint", - "tendermint-proto", + "tendermint-proto 0.23.6", "thiserror", "tonic-build", "tracing", @@ -1419,7 +1419,7 @@ dependencies = [ "proptest", "rust_decimal", "rust_decimal_macros", - "tendermint-proto", + "tendermint-proto 0.23.5", "thiserror", ] @@ -1434,6 +1434,8 @@ dependencies = [ "namada_tx_prelude", "namada_vp_prelude", "prost", + "rust_decimal", + "rust_decimal_macros", "serde_json", "sha2 0.9.9", "tempfile", @@ -2357,7 +2359,7 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.23.6", "time", "zeroize", ] @@ -2374,6 +2376,23 @@ dependencies = [ "time", ] +[[package]] +name = "tendermint-proto" +version = "0.23.5" +source = "git+https://github.com/heliaxdev/tendermint-rs?rev=95c52476bc37927218374f94ac8e2a19bd35bec9#95c52476bc37927218374f94ac8e2a19bd35bec9" +dependencies = [ + "bytes", + "flex-error", + "num-derive", + "num-traits", + "prost", + "prost-types", + "serde", + "serde_bytes", + "subtle-encoding", + "time", +] + [[package]] name = "tendermint-proto" version = "0.23.6" diff --git a/wasm/wasm_source/src/tx_bond.rs b/wasm/wasm_source/src/tx_bond.rs index b5beed5d985..b590aba2d7c 100644 --- a/wasm/wasm_source/src/tx_bond.rs +++ b/wasm/wasm_source/src/tx_bond.rs @@ -228,7 +228,8 @@ mod tests { } } else { // This is a self-bond - // Check that a bond already exists from genesis with initial stake for the validator + // Check that a bond already exists from genesis with initial stake + // for the validator let genesis_epoch = namada_tx_prelude::proof_of_stake::types::Epoch::from(0); for epoch in 0..pos_params.pipeline_len {