Skip to content

Commit 8ad2307

Browse files
committed
Update our Network enum to include rust-bitcoin's Testnet4
Fixes lightningdevkit/ldk-garbagecollected#174
1 parent dc74e82 commit 8ad2307

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

lightning-c-bindings/demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ int main() {
564564
LDKThirtyTwoBytes chain_tip;
565565
memset(&chain_tip, 0, sizeof(chain_tip)); // channel_open_header's prev_blockhash is all-0s
566566

567-
LDKNetwork network = LDKNetwork_Testnet;
567+
LDKNetwork network = LDKNetwork_Testnet3;
568568

569569
// Trait implementations:
570570
LDKBroadcasterInterface broadcast {

lightning-c-bindings/include/lightning.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,11 @@ typedef enum LDKNetwork {
794794
/**
795795
* The testnet3 blockchain.
796796
*/
797-
LDKNetwork_Testnet,
797+
LDKNetwork_Testnet3,
798+
/**
799+
* The testnet4 blockchain.
800+
*/
801+
LDKNetwork_Testnet4,
798802
/**
799803
* A local test blockchain.
800804
*/

lightning-c-bindings/src/bitcoin/network.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ pub enum Network {
88
/// The main Bitcoin blockchain.
99
Bitcoin,
1010
/// The testnet3 blockchain.
11-
Testnet,
11+
Testnet3,
12+
/// The testnet4 blockchain.
13+
Testnet4,
1214
/// A local test blockchain.
1315
Regtest,
1416
/// A blockchain on which blocks are signed instead of mined.
@@ -19,15 +21,17 @@ impl Network {
1921
pub(crate) fn into_bitcoin(&self) -> BitcoinNetwork {
2022
match self {
2123
Network::Bitcoin => BitcoinNetwork::Bitcoin,
22-
Network::Testnet => BitcoinNetwork::Testnet,
24+
Network::Testnet3 => BitcoinNetwork::Testnet,
25+
Network::Testnet4 => BitcoinNetwork::Testnet4,
2326
Network::Regtest => BitcoinNetwork::Regtest,
2427
Network::Signet => BitcoinNetwork::Signet,
2528
}
2629
}
2730
pub(crate) fn from_bitcoin(net: &BitcoinNetwork) -> Self {
2831
match net {
2932
BitcoinNetwork::Bitcoin => Network::Bitcoin,
30-
BitcoinNetwork::Testnet => Network::Testnet,
33+
BitcoinNetwork::Testnet => Network::Testnet3,
34+
BitcoinNetwork::Testnet4 => Network::Testnet4,
3135
BitcoinNetwork::Regtest => Network::Regtest,
3236
BitcoinNetwork::Signet => Network::Signet,
3337
_ => unreachable!(),

0 commit comments

Comments
 (0)