From 35c54da7562622bdc2d4cc33b95aec91dffcba35 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Thu, 15 Aug 2024 14:21:39 -0400 Subject: [PATCH] Don't use `[0; 32]` for the embedded keys in the coordinator rotation test The key_gen function expects the random values already decided. --- tests/coordinator/src/lib.rs | 18 +++++++++--------- tests/coordinator/src/tests/rotation.rs | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/coordinator/src/lib.rs b/tests/coordinator/src/lib.rs index b686e8b9a..fe2a0a4fb 100644 --- a/tests/coordinator/src/lib.rs +++ b/tests/coordinator/src/lib.rs @@ -174,6 +174,9 @@ impl Processor { use serai_client::primitives::insecure_arbitrary_key_from_name; let substrate_key = Arc::new(AsyncMutex::new(None)); + let embedwards25519_evrf_key = (Embedwards25519::generator() * + insecure_arbitrary_key_from_name::(name)) + .to_bytes(); let mut res = Processor { network, @@ -189,8 +192,7 @@ impl Processor { abort_handle: None, evrf_public_keys: ( - (Embedwards25519::generator() * insecure_arbitrary_key_from_name::(name)) - .to_bytes(), + embedwards25519_evrf_key, match network { NetworkId::Serai => panic!("mock processor for the serai network"), NetworkId::Bitcoin | NetworkId::Ethereum => { @@ -200,13 +202,7 @@ impl Processor { let key: &[u8] = key.as_ref(); key.to_vec() } - NetworkId::Monero => { - let key = (Embedwards25519::generator() * - insecure_arbitrary_key_from_name::(name)) - .to_bytes(); - let key: &[u8] = key.as_ref(); - key.to_vec() - } + NetworkId::Monero => embedwards25519_evrf_key.to_vec(), }, ), @@ -355,6 +351,10 @@ impl Processor { res } + pub fn network(&self) -> NetworkId { + self.network + } + pub fn evrf_public_keys(&self) -> ([u8; 32], Vec) { self.evrf_public_keys.clone() } diff --git a/tests/coordinator/src/tests/rotation.rs b/tests/coordinator/src/tests/rotation.rs index 7fd7f18ed..507b05363 100644 --- a/tests/coordinator/src/tests/rotation.rs +++ b/tests/coordinator/src/tests/rotation.rs @@ -153,7 +153,7 @@ async fn set_rotation_test() { // excluded participant let pair5 = insecure_pair_from_name("Eve"); - let network = NetworkId::Bitcoin; + let network = excluded.network(); let amount = Amount(1_000_000 * 10_u64.pow(8)); let serai = processors[0].serai().await; @@ -162,15 +162,15 @@ async fn set_rotation_test() { set_embedded_elliptic_curve_key( &serai, EmbeddedEllipticCurve::Embedwards25519, - vec![0; 32], + excluded.evrf_public_keys().0.to_vec(), &pair5, 0, ) .await; set_embedded_elliptic_curve_key( &serai, - EmbeddedEllipticCurve::Secq256k1, - vec![0; 33], + *excluded.network().embedded_elliptic_curves().last().unwrap(), + excluded.evrf_public_keys().1.clone(), &pair5, 1, )