From 7f5715e147dcf668bb442f1b4ba4a2a30ff6b4cc Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Wed, 24 Mar 2021 16:31:49 +1100 Subject: [PATCH] Remove unnecessary serde implementations --- swap/src/protocol/alice/state.rs | 9 +++------ swap/src/protocol/bob/state.rs | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/swap/src/protocol/alice/state.rs b/swap/src/protocol/alice/state.rs index ae9e58dd..e16fd8e1 100644 --- a/swap/src/protocol/alice/state.rs +++ b/swap/src/protocol/alice/state.rs @@ -74,7 +74,7 @@ impl fmt::Display for AliceState { } } -#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)] +#[derive(Clone, Debug, PartialEq)] pub struct State0 { pub a: bitcoin::SecretKey, pub s_a: monero::Scalar, @@ -82,7 +82,6 @@ pub struct State0 { pub(crate) S_a_monero: monero::PublicKey, pub(crate) S_a_bitcoin: bitcoin::PublicKey, pub dleq_proof_s_a: CrossCurveDLEQProof, - #[serde(with = "::bitcoin::util::amount::serde::as_sat")] pub btc: bitcoin::Amount, pub xmr: monero::Amount, pub cancel_timelock: CancelTimelock, @@ -168,7 +167,7 @@ impl State0 { } } -#[derive(Clone, Debug, Deserialize, Serialize)] +#[derive(Clone, Debug)] pub struct State1 { a: bitcoin::SecretKey, B: bitcoin::PublicKey, @@ -180,7 +179,6 @@ pub struct State1 { v: monero::PrivateViewKey, v_a: monero::PrivateViewKey, dleq_proof_s_a: CrossCurveDLEQProof, - #[serde(with = "::bitcoin::util::amount::serde::as_sat")] btc: bitcoin::Amount, xmr: monero::Amount, cancel_timelock: CancelTimelock, @@ -223,7 +221,7 @@ impl State1 { } } -#[derive(Clone, Debug, Deserialize, Serialize)] +#[derive(Clone, Debug)] pub struct State2 { a: bitcoin::SecretKey, B: bitcoin::PublicKey, @@ -231,7 +229,6 @@ pub struct State2 { S_b_monero: monero::PublicKey, S_b_bitcoin: bitcoin::PublicKey, v: monero::PrivateViewKey, - #[serde(with = "::bitcoin::util::amount::serde::as_sat")] btc: bitcoin::Amount, xmr: monero::Amount, cancel_timelock: CancelTimelock, diff --git a/swap/src/protocol/bob/state.rs b/swap/src/protocol/bob/state.rs index dd3a3bea..2b49399c 100644 --- a/swap/src/protocol/bob/state.rs +++ b/swap/src/protocol/bob/state.rs @@ -69,7 +69,7 @@ impl fmt::Display for BobState { } } -#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)] +#[derive(Clone, Debug, PartialEq)] pub struct State0 { b: bitcoin::SecretKey, s_b: monero::Scalar, @@ -77,7 +77,6 @@ pub struct State0 { S_b_bitcoin: bitcoin::PublicKey, v_b: monero::PrivateViewKey, dleq_proof_s_b: CrossCurveDLEQProof, - #[serde(with = "::bitcoin::util::amount::serde::as_sat")] btc: bitcoin::Amount, xmr: monero::Amount, cancel_timelock: CancelTimelock, @@ -170,7 +169,7 @@ impl State0 { } } -#[derive(Debug, Deserialize, Serialize)] +#[derive(Debug)] pub struct State1 { A: bitcoin::PublicKey, b: bitcoin::SecretKey,