Use ChainHash instead of BlockHash as applicable

[rust-lightning] / lightning / src / routing / test_utils.rs

diff --git a/lightning/src/routing/test_utils.rs b/lightning/src/routing/test_utils.rs
index d0e44eb214cf4fe3d43a5a8c52b6b6e340a9f2b9..f4048f58d4dc9ef5478b43b9922c8082754938c4 100644 (file)
--- a/lightning/src/routing/test_utils.rs
+++ b/lightning/src/routing/test_utils.rs
@@ -14,10 +14,10 @@ use crate::ln::msgs::{UnsignedChannelAnnouncement, ChannelAnnouncement, RoutingM
 use crate::util::test_utils;
 use crate::util::ser::Writeable;
 
+use bitcoin::blockdata::constants::ChainHash;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hashes::Hash;
 use bitcoin::network::constants::Network;
-use bitcoin::blockdata::constants::genesis_block;
 
 use hex;
 
@@ -39,7 +39,7 @@ pub(super) fn add_channel(
 
        let unsigned_announcement = UnsignedChannelAnnouncement {
                features,
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id,
                node_id_1,
                node_id_2,
@@ -154,7 +154,7 @@ pub(super) fn build_line_graph() -> (
                        add_channel(&gossip_sync, &secp_ctx, &cur_privkey, &next_privkey,
                                ChannelFeatures::from_le_bytes(id_to_feature_flags(1)), cur_short_channel_id);
                        update_channel(&gossip_sync, &secp_ctx, &cur_privkey, UnsignedChannelUpdate {
-                               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+                               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                                short_channel_id: cur_short_channel_id,
                                timestamp: idx as u32,
                                flags: 0,
@@ -166,7 +166,7 @@ pub(super) fn build_line_graph() -> (
                                excess_data: Vec::new()
                        });
                        update_channel(&gossip_sync, &secp_ctx, &next_privkey, UnsignedChannelUpdate {
-                               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+                               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                                short_channel_id: cur_short_channel_id,
                                timestamp: (idx as u32)+1,
                                flags: 1,
@@ -259,7 +259,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &our_privkey, &privkeys[0], ChannelFeatures::from_le_bytes(id_to_feature_flags(1)), 1);
        update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 1,
                timestamp: 1,
                flags: 1,
@@ -275,7 +275,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &our_privkey, &privkeys[1], ChannelFeatures::from_le_bytes(id_to_feature_flags(2)), 2);
        update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 2,
                timestamp: 1,
                flags: 0,
@@ -287,7 +287,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[1], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 2,
                timestamp: 1,
                flags: 1,
@@ -303,7 +303,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &our_privkey, &privkeys[7], ChannelFeatures::from_le_bytes(id_to_feature_flags(12)), 12);
        update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 12,
                timestamp: 1,
                flags: 0,
@@ -315,7 +315,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[7], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 12,
                timestamp: 1,
                flags: 1,
@@ -331,7 +331,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &privkeys[0], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(3)), 3);
        update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 3,
                timestamp: 1,
                flags: 0,
@@ -343,7 +343,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 3,
                timestamp: 1,
                flags: 1,
@@ -357,7 +357,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &privkeys[1], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(4)), 4);
        update_channel(&gossip_sync, &secp_ctx, &privkeys[1], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 4,
                timestamp: 1,
                flags: 0,
@@ -369,7 +369,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 4,
                timestamp: 1,
                flags: 1,
@@ -383,7 +383,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &privkeys[7], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(13)), 13);
        update_channel(&gossip_sync, &secp_ctx, &privkeys[7], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 13,
                timestamp: 1,
                flags: 0,
@@ -395,7 +395,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 13,
                timestamp: 1,
                flags: 1,
@@ -411,7 +411,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &privkeys[2], &privkeys[4], ChannelFeatures::from_le_bytes(id_to_feature_flags(6)), 6);
        update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 6,
                timestamp: 1,
                flags: 0,
@@ -423,7 +423,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[4], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 6,
                timestamp: 1,
                flags: 1,
@@ -437,7 +437,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &privkeys[4], &privkeys[3], ChannelFeatures::from_le_bytes(id_to_feature_flags(11)), 11);
        update_channel(&gossip_sync, &secp_ctx, &privkeys[4], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 11,
                timestamp: 1,
                flags: 0,
@@ -449,7 +449,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[3], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 11,
                timestamp: 1,
                flags: 1,
@@ -467,7 +467,7 @@ pub(super) fn build_graph() -> (
 
        add_channel(&gossip_sync, &secp_ctx, &privkeys[2], &privkeys[5], ChannelFeatures::from_le_bytes(id_to_feature_flags(7)), 7);
        update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 7,
                timestamp: 1,
                flags: 0,
@@ -479,7 +479,7 @@ pub(super) fn build_graph() -> (
                excess_data: Vec::new()
        });
        update_channel(&gossip_sync, &secp_ctx, &privkeys[5], UnsignedChannelUpdate {
-               chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+               chain_hash: ChainHash::using_genesis_block(Network::Testnet),
                short_channel_id: 7,
                timestamp: 1,
                flags: 1,