Fix some missed Sapling to Canopy checkpoint code changes

ZcashFoundation · Mar 15, 2021 · 0a1c412 · 0a1c412
1 parent 9e23a51
commit 0a1c412
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/zebra-chain/src/lib.rs b/zebra-chain/src/lib.rs
@@ -62,7 +62,7 @@ impl LedgerState {
 impl Default for LedgerState {
     fn default() -> Self {
         let network = parameters::Network::Mainnet;
-        let tip_height = parameters::NetworkUpgrade::Sapling
+        let tip_height = parameters::NetworkUpgrade::Canopy
             .activation_height(network)
             .unwrap();
 

diff --git a/zebra-consensus/src/checkpoint/list/tests.rs b/zebra-consensus/src/checkpoint/list/tests.rs
@@ -250,18 +250,18 @@ fn checkpoint_list_hard_coded_canopy_testnet() -> Result<(), BoxError> {
     checkpoint_list_hard_coded_canopy(Testnet)
 }
 
-/// Check that the hard-coded lists cover the Sapling network upgrade
+/// Check that the hard-coded lists cover the Canopy network upgrade
 fn checkpoint_list_hard_coded_canopy(network: Network) -> Result<(), BoxError> {
     zebra_test::init();
 
-    let sapling_activation = Canopy
+    let canopy_activation = Canopy
         .activation_height(network)
         .expect("Unexpected network upgrade info: Canopy must have an activation height");
 
     let list = CheckpointList::new(network);
 
     assert!(
-        list.max_height() >= sapling_activation,
+        list.max_height() >= canopy_activation,
         "Pre-Canopy blocks must be verified by checkpoints"
     );