GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed todos from commented tests

Browse Source
This commit is contained in:
Jędrzej Stuczyński
2024-01-03 15:37:54 +00:00
parent fbd58122f4
commit c7b8622cf4
4 changed files with 30 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contracts/Cargo.lock
Generated
-1
View File
@@ -1222,7 +1222,6 @@ dependencies = [
"cw-storage-plus",
"cw4",
"cw4-group",
"lazy_static",
"nym-coconut-dkg-common",
"nym-group-contract-common",
"rusty-fork",
contracts/coconut-dkg/Cargo.toml
-1
View File
@@ -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]
contracts/coconut-dkg/src/epoch_state/transactions.rs
+29 -57
View File
@@ -16,22 +16,12 @@ fn reset_epoch_state(storage: &mut dyn Storage) -> Result<(), ContractError> {
.keys(storage, None, None, Order::Ascending)
.collect::<Result<_, _>>()?;
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]
contracts/coconut-dkg/src/support/tests/helpers.rs
+1 -4
View File
@@ -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<Vec<(Member, u64)>> = Mutex::new(vec![]);
}
pub(crate) static GROUP_MEMBERS: Mutex<Vec<(Member, u64)>> = Mutex::new(Vec::new());
pub fn add_fixture_dealer(deps: DepsMut<'_>) {
let owner = Addr::unchecked("owner");