From f19f0d0949dc17baaca08e21de399a34fbae110c Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Mon, 22 Mar 2021 12:20:44 +1000
Subject: [PATCH] clippy: fix inconsistent struct ordering

---
 tower-batch/tests/ed25519.rs                | 2 +-
 zebra-consensus/src/primitives/groth16.rs   | 2 +-
 zebra-consensus/src/primitives/redjubjub.rs | 2 +-
 zebra-state/src/request.rs                  | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tower-batch/tests/ed25519.rs b/tower-batch/tests/ed25519.rs
index 947c0736..396fc85c 100644
--- a/tower-batch/tests/ed25519.rs
+++ b/tower-batch/tests/ed25519.rs
@@ -32,7 +32,7 @@ impl Ed25519Verifier {
         let batch = batch::Verifier::default();
         // XXX(hdevalence) what's a reasonable choice here?
         let (tx, _) = channel(10);
-        Self { tx, batch }
+        Self { batch, tx }
     }
 }
 
diff --git a/zebra-consensus/src/primitives/groth16.rs b/zebra-consensus/src/primitives/groth16.rs
index ed3a8faa..7049b0fb 100644
--- a/zebra-consensus/src/primitives/groth16.rs
+++ b/zebra-consensus/src/primitives/groth16.rs
@@ -146,7 +146,7 @@ impl VerifierImpl {
         // let batch = batch::Verifier::default();
         let batch = Batch::default();
         let (tx, _) = channel(super::BROADCAST_BUFFER_SIZE);
-        Self { batch, tx, pvk }
+        Self { batch, pvk, tx }
     }
 }
 
diff --git a/zebra-consensus/src/primitives/redjubjub.rs b/zebra-consensus/src/primitives/redjubjub.rs
index ba60d246..d3750c5c 100644
--- a/zebra-consensus/src/primitives/redjubjub.rs
+++ b/zebra-consensus/src/primitives/redjubjub.rs
@@ -63,7 +63,7 @@ impl Default for Verifier {
     fn default() -> Self {
         let batch = batch::Verifier::default();
         let (tx, _) = channel(super::BROADCAST_BUFFER_SIZE);
-        Self { tx, batch }
+        Self { batch, tx }
     }
 }
 
diff --git a/zebra-state/src/request.rs b/zebra-state/src/request.rs
index a47a271e..016d73fb 100644
--- a/zebra-state/src/request.rs
+++ b/zebra-state/src/request.rs
@@ -141,8 +141,8 @@ impl From<Arc<Block>> for FinalizedBlock {
 
         Self {
             block,
-            height,
             hash,
+            height,
             new_outputs,
             transaction_hashes,
         }
@@ -153,15 +153,15 @@ impl From<PreparedBlock> for FinalizedBlock {
     fn from(prepared: PreparedBlock) -> Self {
         let PreparedBlock {
             block,
-            height,
             hash,
+            height,
             new_outputs,
             transaction_hashes,
         } = prepared;
         Self {
             block,
-            height,
             hash,
+            height,
             new_outputs,
             transaction_hashes,
         }