Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-01-13 00:19:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove scopes

Browse Source
This commit is contained in:
Franck Royer 2021-02-05 16:41:20 +11:00
parent a48823a665
commit dee8c1e335
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
swap/src/protocol/bob/execution_setup.rs
View File

@ -71,11 +71,9 @@ impl Behaviour {
) { ) {
self.inner self.inner
.do_protocol_dialer(alice, move |mut substream| async move { .do_protocol_dialer(alice, move |mut substream| async move {
let bob_message0 = state0.next_message();
substream substream
.write_message( .write_message(
&serde_cbor::to_vec(&bob_message0) &serde_cbor::to_vec(&state0.next_message())
.context("failed to serialize message0")?, .context("failed to serialize message0")?,
) )
.await?; .await?;
@ -83,32 +81,26 @@ impl Behaviour {
let message1 = let message1 =
serde_cbor::from_slice::<Message1>(&substream.read_message(BUF_SIZE).await?) serde_cbor::from_slice::<Message1>(&substream.read_message(BUF_SIZE).await?)
.context("failed to deserialize message1")?; .context("failed to deserialize message1")?;
let state1 = state0.receive(bitcoin_wallet.as_ref(), message1).await?; let state1 = state0.receive(bitcoin_wallet.as_ref(), message1).await?;
{
let message2 = state1.next_message(); substream
substream .write_message(
.write_message( &serde_cbor::to_vec(&state1.next_message())
&serde_cbor::to_vec(&message2) .context("failed to serialize message2")?,
.context("failed to serialize message2")?, )
) .await?;
.await?;
}
let message3 = let message3 =
serde_cbor::from_slice::<Message3>(&substream.read_message(BUF_SIZE).await?) serde_cbor::from_slice::<Message3>(&substream.read_message(BUF_SIZE).await?)
.context("failed to deserialize message3")?; .context("failed to deserialize message3")?;
let state2 = state1.receive(message3)?; let state2 = state1.receive(message3)?;
{ substream
let message4 = state2.next_message(); .write_message(
substream &serde_cbor::to_vec(&state2.next_message())
.write_message( .context("failed to serialize message4")?,
&serde_cbor::to_vec(&message4) )
.context("failed to serialize message4")?, .await?;
)
.await?;
}
Ok(state2) Ok(state2)
}) })