diff --git a/coordinator/src/tests/tributary/dkg.rs b/coordinator/src/tests/tributary/dkg.rs index 8434f334..073f8e81 100644 --- a/coordinator/src/tests/tributary/dkg.rs +++ b/coordinator/src/tests/tributary/dkg.rs @@ -318,7 +318,6 @@ async fn dkg_test() { let spec = spec.clone(); let key_pair = key_pair.clone(); async move { - let tx = tx.0; // Version, Pallet, Call, Network, Key Pair, Signature let expected_len = 1 + 1 + 1 + 1 + 32 + 1 + key_pair.1.len() + 64; // It's length prefixed diff --git a/coordinator/src/tributary/handle.rs b/coordinator/src/tributary/handle.rs index 2c737894..eb88bdcc 100644 --- a/coordinator/src/tributary/handle.rs +++ b/coordinator/src/tributary/handle.rs @@ -10,7 +10,6 @@ use scale::{Encode, Decode}; use serai_client::{ Public, Signature, validator_sets::primitives::{ValidatorSet, KeyPair}, - subxt::utils::Encoded, SeraiValidatorSets, }; @@ -138,7 +137,7 @@ pub(crate) async fn handle_application_tx< D: Db, Pro: Processors, FPst: Future, - PST: Clone + Fn(ValidatorSet, Encoded) -> FPst, + PST: Clone + Fn(ValidatorSet, Vec) -> FPst, FRid: Future, RID: RIDTrait, >( diff --git a/coordinator/src/tributary/scanner.rs b/coordinator/src/tributary/scanner.rs index ed63463e..8873de38 100644 --- a/coordinator/src/tributary/scanner.rs +++ b/coordinator/src/tributary/scanner.rs @@ -8,7 +8,7 @@ use ciphersuite::{Ciphersuite, Ristretto}; use tokio::sync::broadcast; use scale::{Encode, Decode}; -use serai_client::{validator_sets::primitives::ValidatorSet, subxt::utils::Encoded, Serai}; +use serai_client::{validator_sets::primitives::ValidatorSet, Serai}; use serai_db::DbTxn; @@ -48,7 +48,7 @@ async fn handle_block< D: Db, Pro: Processors, FPst: Future, - PST: Clone + Fn(ValidatorSet, Encoded) -> FPst, + PST: Clone + Fn(ValidatorSet, Vec) -> FPst, FRid: Future, RID: RIDTrait, P: P2p, @@ -134,7 +134,7 @@ pub(crate) async fn handle_new_blocks< D: Db, Pro: Processors, FPst: Future, - PST: Clone + Fn(ValidatorSet, Encoded) -> FPst, + PST: Clone + Fn(ValidatorSet, Vec) -> FPst, FRid: Future, RID: RIDTrait, P: P2p, diff --git a/substrate/client/src/serai/mod.rs b/substrate/client/src/serai/mod.rs index 35a67f01..4702f2e4 100644 --- a/substrate/client/src/serai/mod.rs +++ b/substrate/client/src/serai/mod.rs @@ -1,3 +1,5 @@ +use core::ops::Deref; + use thiserror::Error; use futures::stream::{Stream, StreamExt}; diff --git a/tests/coordinator/src/tests/sign.rs b/tests/coordinator/src/tests/sign.rs index 8066df83..08ff5eb2 100644 --- a/tests/coordinator/src/tests/sign.rs +++ b/tests/coordinator/src/tests/sign.rs @@ -210,16 +210,12 @@ async fn sign_test() { // Fund the new account to pay for fees let balance = Balance { coin: Coin::Serai, amount: Amount(1_000_000_000) }; serai - .publish( - &serai - .sign( - &PairSigner::new(insecure_pair_from_name("Ferdie")), - &SeraiCoins::transfer(address, balance), - 0, - Default::default(), - ) - .unwrap(), - ) + .publish(&serai.sign( + &PairSigner::new(insecure_pair_from_name("Ferdie")), + &SeraiCoins::transfer(address, balance), + 0, + Default::default(), + )) .await .unwrap(); @@ -275,16 +271,12 @@ async fn sign_test() { }, }; serai - .publish( - &serai - .sign( - &serai_pair, - &SeraiCoins::burn_with_instruction(out_instruction.clone()), - 0, - Default::default(), - ) - .unwrap(), - ) + .publish(&serai.sign( + &serai_pair, + &SeraiCoins::burn_with_instruction(out_instruction.clone()), + 0, + Default::default(), + )) .await .unwrap(); diff --git a/tests/full-stack/src/tests/mint_and_burn.rs b/tests/full-stack/src/tests/mint_and_burn.rs index 2c3615e1..639c0fc3 100644 --- a/tests/full-stack/src/tests/mint_and_burn.rs +++ b/tests/full-stack/src/tests/mint_and_burn.rs @@ -248,16 +248,12 @@ async fn mint_and_burn_test() { // Fund the new account to pay for fees let balance = Balance { coin: Coin::Serai, amount: Amount(1_000_000_000) }; serai - .publish( - &serai - .sign( - &PairSigner::new(insecure_pair_from_name("Ferdie")), - &SeraiCoins::transfer(address, balance), - 0, - Default::default(), - ) - .unwrap(), - ) + .publish(&serai.sign( + &PairSigner::new(insecure_pair_from_name("Ferdie")), + &SeraiCoins::transfer(address, balance), + 0, + Default::default(), + )) .await .unwrap(); @@ -506,16 +502,12 @@ async fn mint_and_burn_test() { }; serai - .publish( - &serai - .sign( - serai_pair, - &SeraiCoins::burn_with_instruction(out_instruction), - nonce, - Default::default(), - ) - .unwrap(), - ) + .publish(&serai.sign( + serai_pair, + &SeraiCoins::burn_with_instruction(out_instruction), + nonce, + Default::default(), + )) .await .unwrap(); }