Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-06-01 21:22:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary monero wallet trait abstractions

Browse source
This commit is contained in:
Daniel Karzel 2021-03-03 15:42:26 +11:00
parent 1041212a60
commit d63790c2a6
8 changed files with 15 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

14
swap/src/protocol/bob/state.rs
View file

@ -316,15 +316,12 @@ pub struct State3 {
}
impl State3 {
pub async fn watch_for_lock_xmr<W>(
pub async fn watch_for_lock_xmr(
self,
xmr_wallet: &W,
xmr_wallet: &monero::Wallet,
transfer_proof: TransferProof,
monero_wallet_restore_blockheight: BlockHeight,
) -> Result<Result<State4, InsufficientFunds>>
where
W: monero::WatchForTransfer,
{
) -> Result<Result<State4, InsufficientFunds>> {
let S_b_monero =
monero::PublicKey::from_private_key(&monero::PrivateKey::from_scalar(self.s_b));
let S = self.S_a_monero + S_b_monero;
@ -572,10 +569,7 @@ pub struct State5 {
}
impl State5 {
pub async fn claim_xmr<W>(&self, monero_wallet: &W) -> Result<()>
where
W: monero::CreateFromAndLoad,
{
pub async fn claim_xmr(&self, monero_wallet: &monero::Wallet) -> Result<()> {
let s_b = monero::PrivateKey { scalar: self.s_b };
let s = self.s_a + s_b;