post-rebase fixes

Author: Lazark0x

ethexe/consensus/src/test_utils.rs

@@ -39,9 +39,7 @@ fn create_test_signer(seed: u8) -> (Signer, Address) {
     let signer = Signer::memory();
     let private_key =
         PrivateKey::from_seed([seed; 32]).expect("seed should produce valid private key");
-    let pub_key = signer
-        .import_key(private_key)
-        .expect("imported private key");
+    let pub_key = signer.import(private_key).expect("imported private key");
     let address = pub_key.to_address();
     (signer, address)
 }
@@ -67,9 +65,7 @@ impl ValidatorNetwork {
             let db = Database::memory();
             let (signer, address) = create_test_signer(i as u8 + 1);
             let private_key = PrivateKey::from_seed([i as u8 + 1; 32]).expect("valid private key");
-            let pub_key = signer
-                .import_key(private_key)
-                .expect("imported private key");
+            let pub_key = signer.import(private_key).expect("imported private key");
 
             let node = ValidatorNode {
                 dkg_engine: DkgEngine::new(db.clone(), address),

ethexe/consensus/src/utils.rs

@@ -95,7 +95,7 @@ mod test_support {
         ) -> Result<Self> {
             let batch_digest = batch.to_digest();
             let signature =
-                signer.sign_for_contract_digest(router_address, pub_key, &batch_digest)?;
+                signer.sign_for_contract_digest(router_address, pub_key, batch_digest, None)?;
             let signatures: BTreeMap<_, _> =
                 [(pub_key.to_address(), signature)].into_iter().collect();
 
@@ -522,7 +522,7 @@ mod tests {
         let other_pub_key = public_keys[1];
         let digest = multisigned_batch.batch().to_digest();
         let signature = signer
-            .sign_for_contract_digest(ADDRESS, other_pub_key, &digest)
+            .sign_for_contract_digest(ADDRESS, other_pub_key, digest, None)
             .unwrap();
         let reply = BatchCommitmentValidationReply { digest, signature };
 
@@ -581,7 +581,7 @@ mod tests {
         let other_pub_key = public_keys[1];
         let digest = multisigned_batch.batch().to_digest();
         let signature = signer
-            .sign_for_contract_digest(ADDRESS, other_pub_key, &digest)
+            .sign_for_contract_digest(ADDRESS, other_pub_key, digest, None)
             .unwrap();
         let reply = BatchCommitmentValidationReply { digest, signature };
 

ethexe/consensus/src/validator/coordinator.rs

@@ -331,7 +331,7 @@ mod tests {
         let signature = ctx
             .core
             .signer
-            .sign_for_contract_digest(ctx.core.router_address, ctx.core.pub_key, &digest)
+            .sign_for_contract_digest(ctx.core.router_address, ctx.core.pub_key, digest, None)
             .unwrap();
 
         let state = Coordinator::submission(ctx, batch, signature).unwrap();

ethexe/consensus/src/validator/core.rs

@@ -855,6 +855,12 @@ mod tests {
             validators2.clone(),
         );
 
+        // Setup DKG for eras 1 and 2 (era 0 election commits validators for era 1, etc.)
+        let v1: Vec<Address> = validators1.clone().into();
+        let v2: Vec<Address> = validators2.clone().into();
+        setup_test_dkg(&ctx.core.db, &v1, Address([1; 20]), 2, 1).unwrap();
+        setup_test_dkg(&ctx.core.db, &v2, Address([4; 20]), 2, 2).unwrap();
+
         // Before election
         let commitment = ctx
             .core

ethexe/consensus/src/validator/mock.rs

@@ -233,6 +233,12 @@ pub fn setup_test_dkg(
     // Persist public key package for ROAST verification.
     db.set_public_key_package(era, public_key_package);
 
+    // Extract and persist VSS commitment from the first secret share.
+    if let Some((_, first_share)) = secret_shares.iter().next() {
+        let vss_commitment = first_share.commitment().clone();
+        db.set_dkg_vss_commitment(era, vss_commitment);
+    }
+
     if let Some(self_idx) = participants.iter().position(|addr| *addr == self_address) {
         let identifier = identifiers[self_idx];
         let secret_share = secret_shares

ethexe/consensus/src/validator/producer.rs

@@ -263,7 +263,7 @@ mod tests {
         validator::{PendingEvent, mock::*},
     };
     use async_trait::async_trait;
-    use ethexe_common::{Address, Digest, HashOf, db::*, gear::CodeCommitment, mock::*};
+    use ethexe_common::{Address, HashOf, db::*, gear::CodeCommitment, mock::*};
     use nonempty::nonempty;
 
     #[tokio::test]
@@ -352,6 +352,13 @@ mod tests {
         // Waiting for announce to be computed
         assert!(state.is_producer());
 
+        // Set up computed announce in database before processing
+        AnnounceData {
+            announce: state.context().core.db.announce(announce_hash).unwrap(),
+            computed: Some(Default::default()),
+        }
+        .setup(&state.context().core.db);
+
         let (state, event) = state
             .process_computed_announce(ComputedAnnounce::mock(announce_hash))
             .unwrap()
@@ -459,6 +466,13 @@ mod tests {
             .await
             .unwrap();
 
+        // Set up computed announce in database before processing
+        AnnounceData {
+            announce: state.context().core.db.announce(announce_hash).unwrap(),
+            computed: Some(Default::default()),
+        }
+        .setup(&state.context().core.db);
+
         let (state, event) = state
             .process_computed_announce(ComputedAnnounce::mock(announce_hash))
             .unwrap()