From 48e5eb8d6c53e53e7ee3ce38ce6abb6c29653230 Mon Sep 17 00:00:00 2001 From: rishflab Date: Fri, 9 Oct 2020 08:48:00 +1100 Subject: [PATCH] Remove redundant type declarations --- xmr-btc/src/alice.rs | 10 +++++----- xmr-btc/src/bob.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xmr-btc/src/alice.rs b/xmr-btc/src/alice.rs index ce311c8d..61ef1334 100644 --- a/xmr-btc/src/alice.rs +++ b/xmr-btc/src/alice.rs @@ -35,19 +35,19 @@ pub async fn next_state< .send_message(state0.next_message(rng).into()) .await?; - let bob_message0: bob::Message0 = transport.receive_message().await?.try_into()?; + let bob_message0 = transport.receive_message().await?.try_into()?; let state1 = state0.receive(bob_message0)?; Ok(state1.into()) } State::State1(state1) => { - let bob_message1: bob::Message1 = transport.receive_message().await?.try_into()?; + let bob_message1 = transport.receive_message().await?.try_into()?; let state2 = state1.receive(bob_message1); - let alice_message1: Message1 = state2.next_message(); + let alice_message1 = state2.next_message(); transport.send_message(alice_message1.into()).await?; Ok(state2.into()) } State::State2(state2) => { - let bob_message2: bob::Message2 = transport.receive_message().await?.try_into()?; + let bob_message2 = transport.receive_message().await?.try_into()?; let state3 = state2.receive(bob_message2)?; Ok(state3.into()) } @@ -65,7 +65,7 @@ pub async fn next_state< transport.send_message(state5.next_message().into()).await?; // todo: pass in state4b as a parameter somewhere in this call to prevent the // user from waiting for a message that wont be sent - let message3: bob::Message3 = transport.receive_message().await?.try_into()?; + let message3 = transport.receive_message().await?.try_into()?; let state6 = state5.receive(message3); tracing::info!("alice has received bob message 3"); tracing::info!("alice is redeeming btc"); diff --git a/xmr-btc/src/bob.rs b/xmr-btc/src/bob.rs index d0809678..1a97f202 100644 --- a/xmr-btc/src/bob.rs +++ b/xmr-btc/src/bob.rs @@ -38,14 +38,14 @@ pub async fn next_state< transport .send_message(state0.next_message(rng).into()) .await?; - let message0: alice::Message0 = transport.receive_message().await?.try_into()?; + let message0 = transport.receive_message().await?.try_into()?; let state1 = state0.receive(bitcoin_wallet, message0).await?; Ok(state1.into()) } State::State1(state1) => { transport.send_message(state1.next_message().into()).await?; - let message1: alice::Message1 = transport.receive_message().await?.try_into()?; + let message1 = transport.receive_message().await?.try_into()?; let state2 = state1.receive(message1)?; Ok(state2.into()) } @@ -57,7 +57,7 @@ pub async fn next_state< Ok(state3.into()) } State::State3(state3) => { - let message2: alice::Message2 = transport.receive_message().await?.try_into()?; + let message2 = transport.receive_message().await?.try_into()?; let state4 = state3.watch_for_lock_xmr(monero_wallet, message2).await?; tracing::info!("bob has seen that alice has locked xmr"); Ok(state4.into())