From 7fe9087bc27817c93900abc14d2ca0fd38e8532f Mon Sep 17 00:00:00 2001 From: Philipp Hoenisch Date: Mon, 3 May 2021 16:43:23 +1000 Subject: [PATCH] Pull trait-bounds up one level for easier testing. --- swap/src/protocol/bob/state.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/swap/src/protocol/bob/state.rs b/swap/src/protocol/bob/state.rs index 28d268cc..68979f0b 100644 --- a/swap/src/protocol/bob/state.rs +++ b/swap/src/protocol/bob/state.rs @@ -1,3 +1,4 @@ +use crate::bitcoin::wallet::EstimateFeeRate; use crate::bitcoin::{ self, current_epoch, CancelTimelock, ExpiredTimelocks, PunishTimelock, Transaction, TxCancel, TxLock, Txid, @@ -8,6 +9,7 @@ use crate::monero::{monero_private_key, TransferProof}; use crate::monero_ext::ScalarExt; use crate::protocol::{Message0, Message1, Message2, Message3, Message4, CROSS_CURVE_PROOF_SYSTEM}; use anyhow::{anyhow, bail, Context, Result}; +use bdk::database::BatchDatabase; use ecdsa_fun::adaptor::{Adaptor, HashTranscript}; use ecdsa_fun::nonce::Deterministic; use ecdsa_fun::Signature; @@ -143,7 +145,15 @@ impl State0 { } } - pub async fn receive(self, wallet: &bitcoin::Wallet, msg: Message1) -> Result { + pub async fn receive( + self, + wallet: &bitcoin::Wallet, + msg: Message1, + ) -> Result + where + C: EstimateFeeRate, + D: BatchDatabase, + { let valid = CROSS_CURVE_PROOF_SYSTEM.verify( &msg.dleq_proof_s_a, (