Merge branch 'develop' into next

tests/coordinator/src/lib.rs

@@ -30,7 +30,7 @@ use messages::{
 };
 use serai_message_queue::{Service, Metadata, client::MessageQueue};
 
-use serai_client::{primitives::Signature, Serai};
+use serai_client::Serai;
 
 use dockertest::{PullPolicy, Image, TestBodySpecification, DockerOperations};
 
@@ -323,18 +323,16 @@ impl Processor {
               schnorrkel_key_pair[64 ..].copy_from_slice(
                 &(<Ristretto as WrappedGroup>::generator() * *substrate_key).to_bytes(),
               );
-              let signature = Signature(
-                schnorrkel::keys::Keypair::from_bytes(&schnorrkel_key_pair)
-                  .unwrap()
-                  .sign_simple(b"substrate", &cosign_block_msg(block_number, block))
-                  .to_bytes(),
-              );
+              let signature = schnorrkel::keys::Keypair::from_bytes(&schnorrkel_key_pair)
+                .unwrap()
+                .sign_simple(b"substrate", &cosign_block_msg(block_number, block))
+                .to_bytes();
 
               send_message(
                 messages::coordinator::ProcessorMessage::CosignedBlock {
                   block_number,
                   block,
-                  signature: signature.0.to_vec(),
+                  signature: signature.to_vec(),
                 }
                 .into(),
               )

tests/coordinator/src/tests/batch.rs

@@ -18,7 +18,7 @@ use dkg::Participant;
 use scale::Encode;
 
 use serai_client::{
-  primitives::{BlockHash, Signature},
+  primitives::BlockHash,
   in_instructions::{
     primitives::{Batch, SignedBatch, batch_message},
     InInstructionsEvent,
@@ -169,7 +169,8 @@ pub async fn batch(
     schnorrkel::keys::Keypair::from_bytes(&schnorrkel_key_pair)
       .unwrap()
       .sign_simple(b"substrate", &batch_message(&batch))
-      .to_bytes(),
+      .to_bytes()
+      .into(),
   );
 
   let batch = SignedBatch { batch, signature };

tests/coordinator/src/tests/key_gen.rs

@@ -180,7 +180,7 @@ pub async fn key_gen<C: WrappedGroup>(
       .await
       .unwrap()
       .unwrap(),
-    KeyPair(Public(substrate_key), network_key.try_into().unwrap())
+    KeyPair(substrate_key.into(), network_key.try_into().unwrap())
   );
 
   for processor in &mut *processors {