From 21dbf5cb69c355a5148f388cd9eacf48675adeb6 Mon Sep 17 00:00:00 2001
From: Alfredo Garcia <oxarbitrage@gmail.com>
Date: Sun, 14 Feb 2021 18:00:02 -0300
Subject: [PATCH] fix rust beta panic string warnings (#1731)

---
 zebra-chain/src/sprout/address.rs  |  4 +---
 zebra-chain/src/sprout/keys.rs     |  8 ++------
 zebra-chain/src/work/difficulty.rs |  9 ++++-----
 zebra-state/src/tests.rs           | 10 +++++-----
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/zebra-chain/src/sprout/address.rs b/zebra-chain/src/sprout/address.rs
index bbe9f1c4..b23c8dc7 100644
--- a/zebra-chain/src/sprout/address.rs
+++ b/zebra-chain/src/sprout/address.rs
@@ -74,9 +74,7 @@ impl ZcashDeserialize for SproutShieldedAddress {
         let network = match version_bytes {
             magics::MAINNET => Network::Mainnet,
             magics::TESTNET => Network::Testnet,
-            _ => panic!(SerializationError::Parse(
-                "bad sprout shielded addr version/type",
-            )),
+            _ => panic!("SerializationError: bad sprout shielded addr version/type"),
         };
 
         Ok(SproutShieldedAddress {
diff --git a/zebra-chain/src/sprout/keys.rs b/zebra-chain/src/sprout/keys.rs
index 59c5ed52..d8124cd2 100644
--- a/zebra-chain/src/sprout/keys.rs
+++ b/zebra-chain/src/sprout/keys.rs
@@ -89,9 +89,7 @@ impl ZcashDeserialize for SpendingKey {
         let network = match version_bytes {
             sk_magics::MAINNET => Network::Mainnet,
             sk_magics::TESTNET => Network::Testnet,
-            _ => panic!(SerializationError::Parse(
-                "bad sprout spending key version/type",
-            )),
+            _ => panic!("SerializationError: bad sprout spending key version/type"),
         };
 
         Ok(SpendingKey {
@@ -277,9 +275,7 @@ impl ZcashDeserialize for IncomingViewingKey {
         let network = match version_bytes {
             ivk_magics::MAINNET => Network::Mainnet,
             ivk_magics::TESTNET => Network::Testnet,
-            _ => panic!(SerializationError::Parse(
-                "bad sprout incoming viewing key network",
-            )),
+            _ => panic!("SerializationError: bad sprout incoming viewing key network"),
         };
 
         Ok(IncomingViewingKey {
diff --git a/zebra-chain/src/work/difficulty.rs b/zebra-chain/src/work/difficulty.rs
index b8fcdf91..dcd43470 100644
--- a/zebra-chain/src/work/difficulty.rs
+++ b/zebra-chain/src/work/difficulty.rs
@@ -364,16 +364,15 @@ impl ExpandedDifficulty {
         // This assertion also makes sure that size fits in its 8 bit compact field
         assert!(
             size < (31 + OFFSET) as _,
-            format!(
-                "256^size (256^{}) must fit in a u256, after the sign bit adjustment and offset",
-                size
-            )
+            "256^size (256^{}) must fit in a u256, after the sign bit adjustment and offset",
+            size
         );
         let size = u32::try_from(size).expect("a 0-6 bit value fits in a u32");
 
         assert!(
             mantissa <= UNSIGNED_MANTISSA_MASK.into(),
-            format!("mantissa {:x?} must fit in its compact field", mantissa)
+            "mantissa {:x?} must fit in its compact field",
+            mantissa
         );
         let mantissa = u32::try_from(mantissa).expect("a 0-23 bit value fits in a u32");
 
diff --git a/zebra-state/src/tests.rs b/zebra-state/src/tests.rs
index 8e17019e..8510504f 100644
--- a/zebra-state/src/tests.rs
+++ b/zebra-state/src/tests.rs
@@ -151,10 +151,10 @@ fn test_block_locator_heights() {
             "locators must end with the specified final height"
         );
         assert!(height - final_height.0 <= constants::MAX_BLOCK_REORG_HEIGHT,
-                    format!("locator for {} must not be more than the maximum reorg height {} below the tip, but {} is {} blocks below the tip",
-                         height,
-                         constants::MAX_BLOCK_REORG_HEIGHT,
-                         final_height.0,
-                         height - final_height.0));
+                    "locator for {} must not be more than the maximum reorg height {} below the tip, but {} is {} blocks below the tip",
+                    height,
+                    constants::MAX_BLOCK_REORG_HEIGHT,
+                    final_height.0,
+                    height - final_height.0);
     }
 }