From 8a3e8f8432529289e1835a00ef8f619c9bb37874 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 6 Sep 2023 09:07:26 +1000 Subject: [PATCH] Match zcashd's getblockchaininfo capitalisation for NU5 (#7454) --- zebra-chain/src/parameters/network_upgrade.rs | 5 +++-- .../tests/snapshots/get_blockchain_info@mainnet_10.snap | 2 +- .../tests/snapshots/get_blockchain_info@testnet_10.snap | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zebra-chain/src/parameters/network_upgrade.rs b/zebra-chain/src/parameters/network_upgrade.rs index e7de521d..451d7fe3 100644 --- a/zebra-chain/src/parameters/network_upgrade.rs +++ b/zebra-chain/src/parameters/network_upgrade.rs @@ -45,8 +45,9 @@ pub enum NetworkUpgrade { Canopy, /// The Zcash protocol after the Nu5 upgrade. /// - /// Note: Network Upgrade 5 includes the Orchard Shielded Protocol, and - /// other changes. The Nu5 code name has not been chosen yet. + /// Note: Network Upgrade 5 includes the Orchard Shielded Protocol, non-malleable transaction + /// IDs, and other changes. There is no special code name for Nu5. + #[serde(rename = "NU5")] Nu5, } diff --git a/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@mainnet_10.snap b/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@mainnet_10.snap index d81c2efc..595a29bc 100644 --- a/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@mainnet_10.snap +++ b/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@mainnet_10.snap @@ -34,7 +34,7 @@ expression: info "status": "pending" }, "c2d6d0b4": { - "name": "Nu5", + "name": "NU5", "activationheight": 1687104, "status": "pending" } diff --git a/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@testnet_10.snap b/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@testnet_10.snap index e16d8032..10a6f7f0 100644 --- a/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@testnet_10.snap +++ b/zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@testnet_10.snap @@ -34,7 +34,7 @@ expression: info "status": "pending" }, "c2d6d0b4": { - "name": "Nu5", + "name": "NU5", "activationheight": 1842420, "status": "pending" }