From c7b8622cf4a7ddccfc0dbb1abbc8f8ef34fc3d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Wed, 3 Jan 2024 15:37:54 +0000 Subject: [PATCH] removed todos from commented tests --- contracts/Cargo.lock | 1 - contracts/coconut-dkg/Cargo.toml | 1 - .../src/epoch_state/transactions.rs | 86 +++++++------------ .../coconut-dkg/src/support/tests/helpers.rs | 5 +- 4 files changed, 30 insertions(+), 63 deletions(-) diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 760f982b0e..44d001026e 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -1222,7 +1222,6 @@ dependencies = [ "cw-storage-plus", "cw4", "cw4-group", - "lazy_static", "nym-coconut-dkg-common", "nym-group-contract-common", "rusty-fork", diff --git a/contracts/coconut-dkg/Cargo.toml b/contracts/coconut-dkg/Cargo.toml index dbdd097553..8c62629309 100644 --- a/contracts/coconut-dkg/Cargo.toml +++ b/contracts/coconut-dkg/Cargo.toml @@ -28,7 +28,6 @@ thiserror = { workspace = true } cw-multi-test = { workspace = true } cw4-group = { path = "../multisig/cw4-group" } nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" } -lazy_static = "1.4" rusty-fork = "0.3" [features] diff --git a/contracts/coconut-dkg/src/epoch_state/transactions.rs b/contracts/coconut-dkg/src/epoch_state/transactions.rs index e4002879bd..70a98d355c 100644 --- a/contracts/coconut-dkg/src/epoch_state/transactions.rs +++ b/contracts/coconut-dkg/src/epoch_state/transactions.rs @@ -16,22 +16,12 @@ fn reset_epoch_state(storage: &mut dyn Storage) -> Result<(), ContractError> { .keys(storage, None, None, Order::Ascending) .collect::>()?; - todo!() - // for dealer_addr in dealers { - // let details = current_dealers().load(storage, &dealer_addr)?; - // for dealings in DEALINGS_BYTES { - // let dealing_keys: Vec<_> = dealings - // .keys(storage, None, None, Order::Ascending) - // .flatten() - // .collect(); - // for key in dealing_keys { - // dealings.remove(storage, &key); - // } - // } - // current_dealers().remove(storage, &dealer_addr)?; - // past_dealers().save(storage, &dealer_addr, &details)?; - // } - // Ok(()) + for dealer_addr in dealers { + let details = current_dealers().load(storage, &dealer_addr)?; + current_dealers().remove(storage, &dealer_addr)?; + past_dealers().save(storage, &dealer_addr, &details)?; + } + Ok(()) } fn dealers_still_active( @@ -198,9 +188,7 @@ pub(crate) mod tests { use cosmwasm_std::testing::mock_env; use cosmwasm_std::Addr; use cw4::Member; - use nym_coconut_dkg_common::types::{ - ContractSafeBytes, DealerDetails, EpochState, TimeConfiguration, - }; + use nym_coconut_dkg_common::types::{DealerDetails, EpochState, TimeConfiguration}; use rusty_fork::rusty_fork_test; // Because of the global variable handling group, we need individual process for each test @@ -783,44 +771,28 @@ pub(crate) mod tests { let mut deps = init_contract(); let all_details: [_; 100] = std::array::from_fn(|i| dealer_details_fixture(i as u64)); - todo!() - // THRESHOLD.save(deps.as_mut().storage, &42).unwrap(); - // for details in all_details.iter() { - // current_dealers() - // .save(deps.as_mut().storage, &details.address, details) - // .unwrap(); - // for dealings in DEALINGS_BYTES { - // dealings - // .save( - // deps.as_mut().storage, - // &details.address, - // &ContractSafeBytes(vec![1, 2, 3]), - // ) - // .unwrap(); - // } - // } - // - // reset_epoch_state(deps.as_mut().storage).unwrap(); - // - // assert!(THRESHOLD.may_load(&deps.storage).unwrap().is_none()); - // for details in all_details { - // for dealings in DEALINGS_BYTES { - // assert!(dealings - // .may_load(&deps.storage, &details.address) - // .unwrap() - // .is_none()); - // } - // assert!(current_dealers() - // .may_load(deps.as_mut().storage, &details.address) - // .unwrap() - // .is_none()); - // assert_eq!( - // past_dealers() - // .load(&deps.storage, &details.address) - // .unwrap(), - // details - // ); - // } + THRESHOLD.save(deps.as_mut().storage, &42).unwrap(); + for details in all_details.iter() { + current_dealers() + .save(deps.as_mut().storage, &details.address, details) + .unwrap(); + } + + reset_epoch_state(deps.as_mut().storage).unwrap(); + + assert!(THRESHOLD.may_load(&deps.storage).unwrap().is_none()); + for details in all_details { + assert!(current_dealers() + .may_load(deps.as_mut().storage, &details.address) + .unwrap() + .is_none()); + assert_eq!( + past_dealers() + .load(&deps.storage, &details.address) + .unwrap(), + details + ); + } } #[test] diff --git a/contracts/coconut-dkg/src/support/tests/helpers.rs b/contracts/coconut-dkg/src/support/tests/helpers.rs index 698b2f5691..c328f991b8 100644 --- a/contracts/coconut-dkg/src/support/tests/helpers.rs +++ b/contracts/coconut-dkg/src/support/tests/helpers.rs @@ -9,7 +9,6 @@ use cosmwasm_std::{ QuerierResult, SystemResult, WasmQuery, }; use cw4::{Cw4QueryMsg, Member, MemberListResponse, MemberResponse}; -use lazy_static::lazy_static; use nym_coconut_dkg_common::msg::InstantiateMsg; use nym_coconut_dkg_common::types::{DealerDetails, TOTAL_DEALINGS}; use std::sync::Mutex; @@ -20,9 +19,7 @@ pub const ADMIN_ADDRESS: &str = "admin address"; pub const GROUP_CONTRACT: &str = "group contract address"; pub const MULTISIG_CONTRACT: &str = "multisig contract address"; -lazy_static! { - pub static ref GROUP_MEMBERS: Mutex> = Mutex::new(vec![]); -} +pub(crate) static GROUP_MEMBERS: Mutex> = Mutex::new(Vec::new()); pub fn add_fixture_dealer(deps: DepsMut<'_>) { let owner = Addr::unchecked("owner");