Updates snapshots, removes unnecessary FIXMEs, fixes issues with bad merge conflict resolution

Author: arya2

zebra-chain/src/parameters/network/testnet.rs

@@ -118,35 +118,24 @@ impl From<&BTreeMap<Height, NetworkUpgrade>> for ConfiguredActivationHeights {
         let mut configured_activation_heights = ConfiguredActivationHeights::default();
 
         for (height, network_upgrade) in activation_heights.iter() {
-            match network_upgrade {
+            let field = match network_upgrade {
                 NetworkUpgrade::BeforeOverwinter => {
-                    configured_activation_heights.before_overwinter = Some(height.0);
-                }
-                NetworkUpgrade::Overwinter => {
-                    configured_activation_heights.overwinter = Some(height.0);
-                }
-                NetworkUpgrade::Sapling => {
-                    configured_activation_heights.sapling = Some(height.0);
-                }
-                NetworkUpgrade::Blossom => {
-                    configured_activation_heights.blossom = Some(height.0);
-                }
-                NetworkUpgrade::Heartwood => {
-                    configured_activation_heights.heartwood = Some(height.0);
-                }
-                NetworkUpgrade::Canopy => {
-                    configured_activation_heights.canopy = Some(height.0);
-                }
-                NetworkUpgrade::Nu5 => {
-                    configured_activation_heights.nu5 = Some(height.0);
-                }
-                NetworkUpgrade::Nu6 => {
-                    configured_activation_heights.nu6 = Some(height.0);
+                    &mut configured_activation_heights.before_overwinter
                 }
+                NetworkUpgrade::Overwinter => &mut configured_activation_heights.overwinter,
+                NetworkUpgrade::Sapling => &mut configured_activation_heights.sapling,
+                NetworkUpgrade::Blossom => &mut configured_activation_heights.blossom,
+                NetworkUpgrade::Heartwood => &mut configured_activation_heights.heartwood,
+                NetworkUpgrade::Canopy => &mut configured_activation_heights.canopy,
+                NetworkUpgrade::Nu5 => &mut configured_activation_heights.nu5,
+                NetworkUpgrade::Nu6 => &mut configured_activation_heights.nu6,
+                NetworkUpgrade::Nu7 => &mut configured_activation_heights.nu7,
                 NetworkUpgrade::Genesis => {
                     continue;
                 }
-            }
+            };
+
+            *field = Some(height.0)
         }
 
         configured_activation_heights
@@ -890,7 +879,6 @@ impl Network {
 
     /// Returns post-Canopy funding streams for this network at the provided height
     pub fn funding_streams(&self, height: Height) -> &FundingStreams {
-        // FIXME: Would this work after Nu7 activation?
         if NetworkUpgrade::current(self, height) < NetworkUpgrade::Nu6 {
             self.pre_nu6_funding_streams()
         } else {

zebra-consensus/src/transaction/tests.rs

@@ -17,7 +17,7 @@ use zebra_chain::{
     amount::{Amount, NonNegative},
     block::{self, Block, Height},
     orchard::{Action, AuthorizedAction, Flags},
-    parameters::{Network, NetworkUpgrade},
+    parameters::{testnet::ConfiguredActivationHeights, Network, NetworkUpgrade},
     primitives::{ed25519, x25519, Groth16Proof},
     sapling,
     serialization::{DateTime32, ZcashDeserialize, ZcashDeserializeInto},
@@ -1007,7 +1007,10 @@ async fn mempool_request_with_immature_spend_is_rejected() {
 async fn mempool_request_with_transparent_coinbase_spend_is_accepted_on_regtest() {
     let _init_guard = zebra_test::init();
 
-    let network = Network::new_regtest(None, Some(1_000));
+    let network = Network::new_regtest(ConfiguredActivationHeights {
+        nu6: Some(1_000),
+        ..Default::default()
+    });
     let mut state: MockService<_, _, _, _> = MockService::build().for_unit_tests();
     let verifier = Verifier::new_for_tests(&network, state.clone());
 

zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@mainnet_10.snap

@@ -1,6 +1,5 @@
 ---
 source: zebra-rpc/src/methods/tests/snapshot.rs
-assertion_line: 562
 expression: info
 ---
 {
@@ -87,11 +86,6 @@ expression: info
       "name": "NU6",
       "activationheight": 2726400,
       "status": "pending"
-    },
-    "77190ad8": {
-      "name": "NU7",
-      "activationheight": 3111000,
-      "status": "pending"
     }
   },
   "consensus": {

zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@testnet_10.snap

@@ -1,6 +1,5 @@
 ---
 source: zebra-rpc/src/methods/tests/snapshot.rs
-assertion_line: 562
 expression: info
 ---
 {
@@ -87,11 +86,6 @@ expression: info
       "name": "NU6",
       "activationheight": 2976000,
       "status": "pending"
-    },
-    "77190ad8": {
-      "name": "NU7",
-      "activationheight": 3222000,
-      "status": "pending"
     }
   },
   "consensus": {

zebrad/tests/acceptance.rs

@@ -3377,7 +3377,6 @@ async fn nu6_funding_streams_and_coinbase_balance() -> Result<()> {
         panic!("this getblocktemplate call without parameters should return the `TemplateMode` variant of the response")
     };
 
-    // FIXME: Would this work after Nu7 activation?
     let proposal_block = proposal_block_from_template(&block_template, None, NetworkUpgrade::Nu6)?;
     let hex_proposal_block = HexData(proposal_block.zcash_serialize_to_vec()?);
 
@@ -3486,7 +3485,6 @@ async fn nu6_funding_streams_and_coinbase_balance() -> Result<()> {
         ..(*block_template)
     };
 
-    // FIXME: Would this work after Nu7 activation?
     let proposal_block = proposal_block_from_template(&block_template, None, NetworkUpgrade::Nu6)?;
 
     // Submit the invalid block with an excessive coinbase output value
@@ -3530,7 +3528,6 @@ async fn nu6_funding_streams_and_coinbase_balance() -> Result<()> {
         ..block_template
     };
 
-    // FIXME: Would this work after Nu7 activation?
     let proposal_block = proposal_block_from_template(&block_template, None, NetworkUpgrade::Nu6)?;
 
     // Submit the invalid block with an excessive coinbase input value