From 83c25eff0328562cbc7dc63e0e3494bc304e46e0 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 29 Aug 2023 16:20:21 -0400 Subject: [PATCH] Remove no longer necessary async from monero SignatableTransaction::sign --- coins/monero/src/wallet/send/mod.rs | 3 +-- coins/monero/tests/runner.rs | 2 +- processor/src/networks/monero.rs | 1 - tests/full-stack/src/tests/mint_and_burn.rs | 1 - tests/processor/src/networks.rs | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/coins/monero/src/wallet/send/mod.rs b/coins/monero/src/wallet/send/mod.rs index f8f0add0..941ab34a 100644 --- a/coins/monero/src/wallet/send/mod.rs +++ b/coins/monero/src/wallet/send/mod.rs @@ -805,8 +805,7 @@ impl SignableTransaction { } /// Sign this transaction. - // TODO: Remove async - pub async fn sign( + pub fn sign( mut self, rng: &mut R, spend: &Zeroizing, diff --git a/coins/monero/tests/runner.rs b/coins/monero/tests/runner.rs index 0c7d2ed4..9362d860 100644 --- a/coins/monero/tests/runner.rs +++ b/coins/monero/tests/runner.rs @@ -228,7 +228,7 @@ macro_rules! test { let keys = keys.clone(); async move { if !multisig { - tx.sign(&mut OsRng, &spend).await.unwrap() + tx.sign(&mut OsRng, &spend).unwrap() } else { #[cfg(not(feature = "multisig"))] panic!("Multisig branch called without the multisig feature"); diff --git a/processor/src/networks/monero.rs b/processor/src/networks/monero.rs index 44da44d5..32617fcd 100644 --- a/processor/src/networks/monero.rs +++ b/processor/src/networks/monero.rs @@ -630,7 +630,6 @@ impl Network for Monero { ) .unwrap() .sign(&mut OsRng, &Zeroizing::new(Scalar::ONE.0)) - .await .unwrap(); let block = self.get_latest_block_number().await.unwrap() + 1; diff --git a/tests/full-stack/src/tests/mint_and_burn.rs b/tests/full-stack/src/tests/mint_and_burn.rs index 1c436efd..b69f0324 100644 --- a/tests/full-stack/src/tests/mint_and_burn.rs +++ b/tests/full-stack/src/tests/mint_and_burn.rs @@ -387,7 +387,6 @@ async fn mint_and_burn_test() { ) .unwrap() .sign(&mut OsRng, &Zeroizing::new(Scalar::ONE)) - .await .unwrap(); rpc.publish_transaction(&tx).await.unwrap() diff --git a/tests/processor/src/networks.rs b/tests/processor/src/networks.rs index 45a33f95..d2b7cd4b 100644 --- a/tests/processor/src/networks.rs +++ b/tests/processor/src/networks.rs @@ -367,7 +367,6 @@ impl Wallet { ) .unwrap() .sign(&mut OsRng, spend_key) - .await .unwrap(); // Push the change output