From f4facc08ea270a9bf7284d285367051ae2a654ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Thu, 4 Jan 2024 15:58:15 +0000 Subject: [PATCH] fixed tests --- nym-api/src/coconut/dkg/dealing.rs | 13 +++++++++++++ nym-api/src/coconut/dkg/verification_key.rs | 10 ++++++++++ nym-api/src/coconut/tests/mod.rs | 3 +++ 3 files changed, 26 insertions(+) diff --git a/nym-api/src/coconut/dkg/dealing.rs b/nym-api/src/coconut/dkg/dealing.rs index 211872094c..0c2cac55b5 100644 --- a/nym-api/src/coconut/dkg/dealing.rs +++ b/nym-api/src/coconut/dkg/dealing.rs @@ -139,10 +139,12 @@ pub(crate) mod tests { use nym_coconut::{ttp_keygen, Parameters}; use nym_coconut_dkg_common::dealer::DealerDetails; use nym_coconut_dkg_common::types::InitialReplacementData; + use nym_crypto::asymmetric::identity; use nym_dkg::bte::keys::KeyPair as DkgKeyPair; use nym_dkg::bte::{Params, PublicKeyWithProof}; use nym_validator_client::nyxd::AccountId; use rand::rngs::OsRng; + use rand_07::thread_rng; use std::collections::HashMap; use std::path::PathBuf; use std::str::FromStr; @@ -163,6 +165,8 @@ pub(crate) mod tests { let mut keypairs = vec![]; for (idx, addr) in TEST_VALIDATORS_ADDRESS.iter().enumerate() { let keypair = DkgKeyPair::new(params, OsRng); + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); + let bte_public_key_with_proof = bs58::encode(&keypair.public_key().to_bytes()).into_string(); keypairs.push(keypair); @@ -172,6 +176,7 @@ pub(crate) mod tests { DealerDetails { address: Addr::unchecked(*addr), bte_public_key_with_proof, + ed25519_identity: identity_keypair.public_key().to_base58_string(), announce_address: format!("localhost:80{}", idx), assigned_index: (idx + 1) as u64, }, @@ -196,11 +201,13 @@ pub(crate) mod tests { .with_threshold(&threshold_db), ); let params = dkg::params(); + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); let mut state = State::new( PathBuf::default(), PersistentState::default(), Url::parse("localhost:8000").unwrap(), DkgKeyPair::new(params, OsRng), + *identity_keypair.public_key(), KeyPair::new(), ); state.set_node_index(Some(self_index)); @@ -259,11 +266,13 @@ pub(crate) mod tests { .with_threshold(&threshold_db), ); let params = dkg::params(); + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); let mut state = State::new( PathBuf::default(), PersistentState::default(), Url::parse("localhost:8000").unwrap(), DkgKeyPair::new(params, OsRng), + *identity_keypair.public_key(), KeyPair::new(), ); state.set_node_index(Some(self_index)); @@ -332,12 +341,14 @@ pub(crate) mod tests { let mut keys = ttp_keygen(&Parameters::new(4).unwrap(), 3, 4).unwrap(); let coconut_keypair = KeyPair::new(); coconut_keypair.set(Some(keys.pop().unwrap())).await; + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); let mut state = State::new( PathBuf::default(), PersistentState::default(), Url::parse("localhost:8000").unwrap(), DkgKeyPair::new(params, OsRng), + *identity_keypair.public_key(), coconut_keypair.clone(), ); state.set_node_index(Some(self_index)); @@ -361,11 +372,13 @@ pub(crate) mod tests { // no dealings submitted for the first (zeroth) epoch assert!(dealings_db.read().unwrap().get(&0).is_none()); + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); let mut state = State::new( PathBuf::default(), PersistentState::default(), Url::parse("localhost:8000").unwrap(), DkgKeyPair::new(params, OsRng), + *identity_keypair.public_key(), coconut_keypair, ); state.set_node_index(Some(self_index)); diff --git a/nym-api/src/coconut/dkg/verification_key.rs b/nym-api/src/coconut/dkg/verification_key.rs index a0b92a3140..9d0bf01256 100644 --- a/nym-api/src/coconut/dkg/verification_key.rs +++ b/nym-api/src/coconut/dkg/verification_key.rs @@ -361,10 +361,12 @@ pub(crate) mod tests { use nym_coconut_dkg_common::dealer::DealerDetails; use nym_coconut_dkg_common::types::{EpochId, InitialReplacementData, PartialContractDealing}; use nym_coconut_dkg_common::verification_key::ContractVKShare; + use nym_crypto::asymmetric::identity; use nym_dkg::bte::keys::KeyPair as DkgKeyPair; use nym_validator_client::nyxd::AccountId; use rand::rngs::OsRng; use rand::Rng; + use rand_07::thread_rng; use std::collections::HashMap; use std::env::temp_dir; use std::path::PathBuf; @@ -406,6 +408,7 @@ pub(crate) mod tests { async fn prepare_clients_and_states(db: &MockContractDb) -> Vec<(DkgClient, State)> { let params = dkg::params(); let mut clients_and_states = vec![]; + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); for addr in TEST_VALIDATORS_ADDRESS { let dkg_client = DkgClient::new( @@ -423,6 +426,7 @@ pub(crate) mod tests { PersistentState::default(), Url::parse("localhost:8000").unwrap(), keypair, + *identity_keypair.public_key(), KeyPair::new(), ); clients_and_states.push((dkg_client, state)); @@ -940,11 +944,13 @@ pub(crate) mod tests { .with_initial_dealers_db(&db.initial_dealers_db), ); let keypair = DkgKeyPair::new(dkg::params(), OsRng); + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); let state = State::new( PathBuf::default(), PersistentState::default(), Url::parse("localhost:8000").unwrap(), keypair, + *identity_keypair.public_key(), KeyPair::new(), ); @@ -1044,11 +1050,13 @@ pub(crate) mod tests { .with_initial_dealers_db(&db.initial_dealers_db), ); let keypair = DkgKeyPair::new(dkg::params(), OsRng); + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); let state = State::new( PathBuf::default(), PersistentState::default(), Url::parse("localhost:8000").unwrap(), keypair, + *identity_keypair.public_key(), KeyPair::new(), ); let new_dkg_client2 = DkgClient::new( @@ -1063,11 +1071,13 @@ pub(crate) mod tests { .with_initial_dealers_db(&db.initial_dealers_db), ); let keypair = DkgKeyPair::new(dkg::params(), OsRng); + let identity_keypair = identity::KeyPair::new(&mut thread_rng()); let state2 = State::new( PathBuf::default(), PersistentState::default(), Url::parse("localhost:8000").unwrap(), keypair, + *identity_keypair.public_key(), KeyPair::new(), ); diff --git a/nym-api/src/coconut/tests/mod.rs b/nym-api/src/coconut/tests/mod.rs index de7d427400..089a11a275 100644 --- a/nym-api/src/coconut/tests/mod.rs +++ b/nym-api/src/coconut/tests/mod.rs @@ -33,6 +33,7 @@ use nym_coconut_dkg_common::types::{ use nym_coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare}; use nym_coconut_interface::{hash_to_scalar, Credential, VerificationKey}; use nym_config::defaults::VOUCHER_INFO; +use nym_contracts_common::IdentityKey; use nym_credentials::coconut::bandwidth::BandwidthVoucher; use nym_crypto::asymmetric::{encryption, identity}; use nym_dkg::Threshold; @@ -356,6 +357,7 @@ impl super::client::Client for DummyClient { async fn register_dealer( &self, bte_public_key_with_proof: EncodedBTEPublicKeyWithProof, + identity_key: IdentityKey, announce_address: String, _resharing: bool, ) -> Result { @@ -379,6 +381,7 @@ impl super::client::Client for DummyClient { DealerDetails { address: Addr::unchecked(self.validator_address.to_string()), bte_public_key_with_proof, + ed25519_identity: identity_key, announce_address, assigned_index, },