state: fix missed diff marker after rebase

crates/state/src/consensus.rs

@@ -2,12 +2,12 @@
 //! chain and the p2p network.  These will be expanded further as we actually
 //! implement the consensus logic.
 
+use std::collections::*;
+
 use arbitrary::Arbitrary;
 use borsh::{BorshDeserialize, BorshSerialize};
-use std::collections::*;
 
 use alpen_vertex_primitives::buf::Buf64;
-use borsh::{BorshDeserialize, BorshSerialize};
 
 use crate::{block::L2BlockId, l1::L1BlockId};
 
@@ -16,11 +16,7 @@ use crate::{block::L2BlockId, l1::L1BlockId};
 /// This is updated when we see a consensus-relevant message.  This is L2 blocks
 /// but also L1 blocks being published with interesting things in them, and
 /// various other events.
-<<<<<<< HEAD
-#[derive(Clone, Debug, PartialEq, Eq, BorshSerialize, BorshDeserialize, Arbitrary)]
-=======
-#[derive(Clone, Debug, BorshDeserialize, BorshSerialize)]
->>>>>>> b70fef1 (state: tweak to consensus state, added Borsh serde derives)
+#[derive(Clone, Debug, Eq, PartialEq, Arbitrary, BorshSerialize, BorshDeserialize)]
 pub struct ConsensusState {
     /// Important consensus state.
     pub(super) chain_state: ConsensusChainState,
@@ -50,11 +46,7 @@ impl ConsensusState {
 ///
 /// This is updated when we get a new L2 block and is kept more precisely
 /// synchronized across all nodes.
-<<<<<<< HEAD
-#[derive(Clone, Debug, PartialEq, Eq, BorshSerialize, BorshDeserialize, Arbitrary)]
-=======
-#[derive(Clone, Debug, BorshDeserialize, BorshSerialize)]
->>>>>>> b70fef1 (state: tweak to consensus state, added Borsh serde derives)
+#[derive(Clone, Debug, Eq, PartialEq, Arbitrary, BorshSerialize, BorshDeserialize)]
 pub struct ConsensusChainState {
     /// Accepted and valid L2 blocks that we might still reorg.  The last of
     /// these is the chain tip.
@@ -77,7 +69,7 @@ impl ConsensusChainState {
 }
 
 /// Transfer from L1 into L2.
-#[derive(Clone, Debug, Eq, PartialEq, BorshSerialize, BorshDeserialize, Arbitrary)]
+#[derive(Clone, Debug, Eq, PartialEq, Arbitrary, BorshDeserialize, BorshSerialize)]
 pub struct PendingDeposit {
     /// Deposit index.
     idx: u64,
@@ -90,7 +82,7 @@ pub struct PendingDeposit {
 }
 
 /// Transfer from L2 back to L1.
-#[derive(Clone, Debug, Eq, PartialEq BorshSerialize, BorshDeserialize, Arbitrary)]
+#[derive(Clone, Debug, Eq, PartialEq, Arbitrary, BorshDeserialize, BorshSerialize)]
 pub struct PendingWithdraw {
     /// Withdraw index.
     idx: u64,