fixes

common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs

@@ -6,7 +6,7 @@ use log::{debug, info};
 use std::str::FromStr;
 
 use nym_coconut_dkg_common::msg::InstantiateMsg;
-use nym_coconut_dkg_common::types::TimeConfiguration;
+use nym_coconut_dkg_common::types::{TimeConfiguration, DEFAULT_DEALINGS};
 use nym_validator_client::nyxd::AccountId;
 
 #[derive(Debug, Parser)]
@@ -93,6 +93,7 @@ pub async fn generate(args: Args) {
         multisig_addr: multisig_addr.to_string(),
         time_configuration: Some(time_configuration),
         mix_denom,
+        key_size: DEFAULT_DEALINGS as u32,
     };
 
     debug!("instantiate_msg: {:?}", instantiate_msg);

common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs

@@ -18,8 +18,7 @@ pub type DealingIndex = u32;
 pub type ContractDealing = ContractSafeBytes;
 
 // 2 public attributes, 2 private attributes, 1 fixed for coconut credential
-#[deprecated]
-pub const TOTAL_DEALINGS: usize = 2 + 2 + 1;
+pub const DEFAULT_DEALINGS: usize = 2 + 2 + 1;
 
 #[cw_serde]
 pub struct PartialContractDealing {

contracts/coconut-dkg/src/contract.rs

@@ -155,7 +155,7 @@ mod tests {
     use cw4::Member;
     use cw_multi_test::{App, AppBuilder, AppResponse, ContractWrapper, Executor};
     use nym_coconut_dkg_common::msg::ExecuteMsg::RegisterDealer;
-    use nym_coconut_dkg_common::types::{NodeIndex, TOTAL_DEALINGS};
+    use nym_coconut_dkg_common::types::{NodeIndex, DEFAULT_DEALINGS};
     use nym_group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg;
 
     fn instantiate_with_group(app: &mut App, members: &[Addr]) -> Addr {
@@ -192,7 +192,7 @@ mod tests {
             multisig_addr: MULTISIG_CONTRACT.to_string(),
             time_configuration: None,
             mix_denom: TEST_MIX_DENOM.to_string(),
-            key_size: TOTAL_DEALINGS as u32,
+            key_size: DEFAULT_DEALINGS as u32,
         };
         app.instantiate_contract(
             coconut_dkg_code_id,

contracts/coconut-dkg/src/dealings/queries.rs

@@ -111,7 +111,7 @@ pub(crate) mod tests {
     #[cfg(test)]
     mod query_dealings {
         use super::*;
-        use nym_coconut_dkg_common::types::TOTAL_DEALINGS;
+        use nym_coconut_dkg_common::types::DEFAULT_DEALINGS;
 
         #[test]
         fn dealings_empty_on_init() {
@@ -124,7 +124,7 @@ pub(crate) mod tests {
         fn dealings_paged_retrieval_obeys_limits() {
             let mut deps = init_contract();
             let limit = 2;
-            fill_dealings(deps.as_mut(), 0, 10, TOTAL_DEALINGS as u32);
+            fill_dealings(deps.as_mut(), 0, 10, DEFAULT_DEALINGS as u32);
 
             for dealer in 0..10 {
                 let dealer = format!("dealer{dealer}");
@@ -138,7 +138,7 @@ pub(crate) mod tests {
         #[test]
         fn dealings_paged_retrieval_has_default_limit() {
             let mut deps = init_contract();
-            fill_dealings(deps.as_mut(), 0, 10, TOTAL_DEALINGS as u32);
+            fill_dealings(deps.as_mut(), 0, 10, DEFAULT_DEALINGS as u32);
 
             for dealer in 0..10 {
                 let dealer = format!("dealer{dealer}");
@@ -152,7 +152,7 @@ pub(crate) mod tests {
         #[test]
         fn dealings_paged_retrieval_has_max_limit() {
             let mut deps = init_contract();
-            fill_dealings(deps.as_mut(), 0, 10, TOTAL_DEALINGS as u32);
+            fill_dealings(deps.as_mut(), 0, 10, DEFAULT_DEALINGS as u32);
 
             // query with a crazily high limit in an attempt to use too many resources
             let crazy_limit = 1000 * DEALINGS_PAGE_MAX_LIMIT;

contracts/coconut-dkg/src/dealings/transactions.rs

@@ -73,7 +73,7 @@ pub(crate) mod tests {
     use cosmwasm_std::Addr;
     use nym_coconut_dkg_common::dealer::DealerDetails;
     use nym_coconut_dkg_common::types::{
-        ContractSafeBytes, InitialReplacementData, TimeConfiguration, TOTAL_DEALINGS,
+        ContractSafeBytes, InitialReplacementData, TimeConfiguration, DEFAULT_DEALINGS,
     };
 
     #[test]
@@ -167,7 +167,7 @@ pub(crate) mod tests {
                 epoch_id: 0,
                 dealer: info.sender.clone(),
                 index: 42,
-                key_size: TOTAL_DEALINGS as u32,
+                key_size: DEFAULT_DEALINGS as u32,
             }
         );
 

contracts/coconut-dkg/src/support/tests/helpers.rs

@@ -10,7 +10,7 @@ use cosmwasm_std::{
 };
 use cw4::{Cw4QueryMsg, Member, MemberListResponse, MemberResponse};
 use nym_coconut_dkg_common::msg::InstantiateMsg;
-use nym_coconut_dkg_common::types::{DealerDetails, TOTAL_DEALINGS};
+use nym_coconut_dkg_common::types::{DealerDetails, DEFAULT_DEALINGS};
 use std::sync::Mutex;
 
 use super::fixtures::TEST_MIX_DENOM;
@@ -84,7 +84,7 @@ pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>>
         multisig_addr: String::from(MULTISIG_CONTRACT),
         time_configuration: None,
         mix_denom: TEST_MIX_DENOM.to_string(),
-        key_size: TOTAL_DEALINGS as u32,
+        key_size: DEFAULT_DEALINGS as u32,
     };
     let env = mock_env();
     let info = mock_info(ADMIN_ADDRESS, &[]);

nym-api/src/support/nyxd/mod.rs

@@ -413,7 +413,10 @@ impl crate::coconut::client::Client for Client {
         epoch_id: EpochId,
         dealer: &str,
     ) -> crate::coconut::error::Result<Vec<PartialContractDealing>> {
-        Ok(nyxd_query!(self, get_all_dealer_dealings(epoch_id, dealer).await?))
+        Ok(nyxd_query!(
+            self,
+            get_all_dealer_dealings(epoch_id, dealer).await?
+        ))
     }
 
     async fn get_verification_key_shares(