diff --git a/contracts/coconut-test/src/helpers.rs b/contracts/coconut-test/src/helpers.rs index df67e9c311..229cd55128 100644 --- a/contracts/coconut-test/src/helpers.rs +++ b/contracts/coconut-test/src/helpers.rs @@ -1,10 +1,8 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use cosmwasm_std::{entry_point, Addr, Coin, DepsMut, Empty, Env, Response}; +use cosmwasm_std::{Addr, Coin, Empty}; use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper}; -use nym_multisig_contract_common::error::ContractError; -use nym_multisig_contract_common::state::CONFIG; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/contracts/coconut-test/src/reset_upon_threshold.rs b/contracts/coconut-test/src/reset_upon_threshold.rs deleted file mode 100644 index a36597f666..0000000000 --- a/contracts/coconut-test/src/reset_upon_threshold.rs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2024 - Nym Technologies SA -// SPDX-License-Identifier: Apache-2.0 - -use crate::test_wrapper::TestSetup; -use nym_coconut_dkg_common::types::EpochState; - -#[test] -fn removing_enough_members_causes_dkg_reset() { - let mut test = TestSetup::new(); - - let member1 = test.add_mock_group_member(None); - let member2 = test.add_mock_group_member(None); - let member3 = test.add_mock_group_member(None); - let member4 = test.add_mock_group_member(None); - let member5 = test.add_mock_group_member(None); - - test.begin_dkg(); - test.full_dummy_dkg( - vec![ - member1, - member2, - member3.clone(), - member4.clone(), - member5.clone(), - ], - false, - ); - - test.remove_group_member(&member3); - test.remove_group_member(&member4); - test.remove_group_member(&member5); - - test.skip_to_dkg_state_end(); - test.unchecked_advance_dkg_epoch(); - - let epoch = test.epoch(); - assert_eq!( - epoch.state, - EpochState::PublicKeySubmission { resharing: false } - ); -} - -#[test] -fn adding_enough_members_causes_dkg_reset() { - let mut test = TestSetup::new(); - - let member1 = test.add_mock_group_member(None); - let member2 = test.add_mock_group_member(None); - - test.begin_dkg(); - test.full_dummy_dkg(vec![member1, member2], false); - - let _member3 = test.add_mock_group_member(None); - let _member4 = test.add_mock_group_member(None); - let _member5 = test.add_mock_group_member(None); - - test.skip_to_dkg_state_end(); - test.unchecked_advance_dkg_epoch(); - - let epoch = test.epoch(); - assert_eq!( - epoch.state, - EpochState::PublicKeySubmission { resharing: false } - ); -} diff --git a/contracts/coconut-test/src/spend_credential_creates_proposal.rs b/contracts/coconut-test/src/spend_credential_creates_proposal.rs index abcf761da5..05eb30ba9e 100644 --- a/contracts/coconut-test/src/spend_credential_creates_proposal.rs +++ b/contracts/coconut-test/src/spend_credential_creates_proposal.rs @@ -81,7 +81,7 @@ fn spend_credential_creates_proposal() { let msg = MigrateMsg { coconut_bandwidth_address: coconut_bandwidth_contract_addr.to_string(), - coconut_dkg_address: "".to_string(), + coconut_dkg_address: "dkg-address".to_string(), }; app.migrate_contract( Addr::unchecked(OWNER), diff --git a/contracts/coconut-test/src/test_wrapper.rs b/contracts/coconut-test/src/test_wrapper.rs index 975fdb531c..e9336ad19c 100644 --- a/contracts/coconut-test/src/test_wrapper.rs +++ b/contracts/coconut-test/src/test_wrapper.rs @@ -2,8 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::helpers::{contract_bandwidth, contract_dkg, contract_group, contract_multisig}; -use cosmwasm_std::testing::mock_dependencies; -use cosmwasm_std::{coins, Addr, Api, CanonicalAddr}; +use cosmwasm_std::{coins, Addr}; use cw3::{Cw3Contract, ProposalListResponse, Status, Vote}; use cw4::{Cw4Contract, Member}; use cw_multi_test::{App, AppBuilder, Executor}; @@ -40,6 +39,7 @@ pub fn random_address(rng: &mut ChaCha20Rng) -> Addr { Addr::unchecked(bech32::encode(PREFIX, bytes)) } +#[allow(dead_code)] pub struct TestSetup { pub app: App, pub rng: ChaCha20Rng, @@ -51,6 +51,7 @@ pub struct TestSetup { pub bandwidth_contract: Addr, } +#[allow(dead_code)] impl TestSetup { pub fn new() -> Self { let mut rng = test_rng(); @@ -339,7 +340,7 @@ impl TestSetup { .execute_contract( member.clone(), self.dkg_contract.clone(), - &DkgExecuteMsg::CommitDealingsChunk { chunk, resharing }, + &DkgExecuteMsg::CommitDealingsChunk { chunk }, &[], ) .unwrap(); diff --git a/contracts/coconut-test/src/tests.rs b/contracts/coconut-test/src/tests.rs index 4c1310dbb8..04c6d327d2 100644 --- a/contracts/coconut-test/src/tests.rs +++ b/contracts/coconut-test/src/tests.rs @@ -3,7 +3,6 @@ mod deposit_and_release; mod helpers; -mod reset_upon_threshold; mod spend_credential_creates_proposal; mod submit_vk_creates_proposal; mod test_wrapper;