From 6bfbb4d3090688c81764d4bf19a29d2510ab6b82 Mon Sep 17 00:00:00 2001 From: brentstone Date: Wed, 28 Feb 2024 00:26:04 -0500 Subject: [PATCH] fix 0.31.7 rebase --- Cargo.lock | 2 +- crates/controller/src/lib.rs | 4 ++-- crates/proof_of_stake/src/rewards.rs | 30 ++++++++++++------------- crates/shielded_token/src/conversion.rs | 3 --- crates/trans_token/src/lib.rs | 1 - wasm/Cargo.lock | 2 +- wasm_for_tests/wasm_source/Cargo.lock | 2 +- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f9afb9f63..bb400e187f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4325,7 +4325,7 @@ dependencies = [ [[package]] name = "namada_controller" -version = "0.31.6" +version = "0.31.7" dependencies = [ "namada_core", ] diff --git a/crates/controller/src/lib.rs b/crates/controller/src/lib.rs index da2de1503a..4f752ac16e 100644 --- a/crates/controller/src/lib.rs +++ b/crates/controller/src/lib.rs @@ -1,5 +1,5 @@ -use namada_core::types::dec::Dec; -use namada_core::types::uint::Uint; +use namada_core::dec::Dec; +use namada_core::uint::Uint; #[derive(Clone, Debug)] pub struct PDController { diff --git a/crates/proof_of_stake/src/rewards.rs b/crates/proof_of_stake/src/rewards.rs index 251439a15d..acf8a0ede2 100644 --- a/crates/proof_of_stake/src/rewards.rs +++ b/crates/proof_of_stake/src/rewards.rs @@ -22,7 +22,7 @@ use crate::storage::{ write_last_staked_ratio, }; use crate::token::storage_key::minted_balance_key; -use crate::token::{credit_tokens, inflation}; +use crate::token::credit_tokens; use crate::types::{into_tm_voting_power, BondId, ValidatorState, VoteInfo}; use crate::{ bond_amounts_for_rewards, get_total_consensus_stake, staking_token_address, @@ -389,8 +389,8 @@ where // Write new rewards parameters that will be used for the inflation of // the current new epoch - let locked_amount = Dec::try_from(locked_amount).into_storage_result()?; - let total_amount = Dec::try_from(total_amount).into_storage_result()?; + let locked_amount = Dec::from(locked_amount); + let total_amount = Dec::from(total_amount); let locked_ratio = locked_amount / total_amount; write_last_staked_ratio(storage, locked_ratio)?; @@ -645,8 +645,8 @@ mod tests { Dec::from_str("0.5").unwrap(), ) .unwrap(); - let locked_ratio_0 = Dec::try_from(locked_amount).unwrap() - / Dec::try_from(total_native_amount).unwrap(); + let locked_ratio_0 = Dec::from(locked_amount) + / Dec::from(total_native_amount); println!( "Round 0: Locked ratio: {locked_ratio_0}, inflation: {inflation_0}" @@ -673,8 +673,8 @@ mod tests { // BUG: DIDN'T ADD TO TOTAL AMOUNT - let locked_ratio_1 = Dec::try_from(locked_amount).unwrap() - / Dec::try_from(total_native_amount).unwrap(); + let locked_ratio_1 = Dec::from(locked_amount) + / Dec::from(total_native_amount); println!( "Round 1: Locked ratio: {locked_ratio_1}, inflation: {inflation_1}" @@ -701,8 +701,8 @@ mod tests { ) .unwrap(); - let locked_ratio_2 = Dec::try_from(locked_amount).unwrap() - / Dec::try_from(total_native_amount).unwrap(); + let locked_ratio_2 = Dec::from(locked_amount) + / Dec::from(total_native_amount); println!( "Round 2: Locked ratio: {locked_ratio_2}, inflation: {inflation_2}", ); @@ -735,8 +735,8 @@ mod tests { Dec::from_str("0.9").unwrap(), ) .unwrap(); - let locked_ratio_0 = Dec::try_from(locked_amount).unwrap() - / Dec::try_from(total_native_amount).unwrap(); + let locked_ratio_0 = Dec::from(locked_amount) + / Dec::from(total_native_amount); println!( "Round 0: Locked ratio: {locked_ratio_0}, inflation: {inflation_0}" @@ -763,8 +763,8 @@ mod tests { // BUG: DIDN'T ADD TO TOTAL AMOUNT - let locked_ratio_1 = Dec::try_from(locked_amount).unwrap() - / Dec::try_from(total_native_amount).unwrap(); + let locked_ratio_1 = Dec::from(locked_amount) + / Dec::from(total_native_amount); println!( "Round 1: Locked ratio: {locked_ratio_1}, inflation: {inflation_1}" @@ -791,8 +791,8 @@ mod tests { ) .unwrap(); - let locked_ratio_2 = Dec::try_from(locked_amount).unwrap() - / Dec::try_from(total_native_amount).unwrap(); + let locked_ratio_2 = Dec::from(locked_amount) + / Dec::from(total_native_amount); println!( "Round 2: Locked ratio: {locked_ratio_2}, inflation: {inflation_2}", ); diff --git a/crates/shielded_token/src/conversion.rs b/crates/shielded_token/src/conversion.rs index 56e4b59947..76d4de4b1b 100644 --- a/crates/shielded_token/src/conversion.rs +++ b/crates/shielded_token/src/conversion.rs @@ -6,9 +6,6 @@ use namada_core::dec::Dec; use namada_core::uint::Uint; use namada_parameters as parameters; use namada_storage::{StorageRead, StorageWrite}; -use namada_trans_token::inflation::{ - ShieldedRewardsController, ShieldedValsToUpdate, -}; use namada_trans_token::storage_key::{balance_key, minted_balance_key}; use namada_trans_token::{read_denom, Amount, DenominatedAmount, Denomination}; diff --git a/crates/trans_token/src/lib.rs b/crates/trans_token/src/lib.rs index ea8b646005..6644f73d7a 100644 --- a/crates/trans_token/src/lib.rs +++ b/crates/trans_token/src/lib.rs @@ -1,6 +1,5 @@ //! Transparent token types, storage functions, and validation. -pub mod inflation; mod storage; pub mod storage_key; diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 7eef7bc1cd..1742336a13 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -3402,7 +3402,7 @@ dependencies = [ [[package]] name = "namada_controller" -version = "0.31.6" +version = "0.31.7" dependencies = [ "namada_core", ] diff --git a/wasm_for_tests/wasm_source/Cargo.lock b/wasm_for_tests/wasm_source/Cargo.lock index c3a3415f5f..dfffe04d4b 100644 --- a/wasm_for_tests/wasm_source/Cargo.lock +++ b/wasm_for_tests/wasm_source/Cargo.lock @@ -3402,7 +3402,7 @@ dependencies = [ [[package]] name = "namada_controller" -version = "0.31.6" +version = "0.31.7" dependencies = [ "namada_core", ]