Skip to content

Commit

Permalink
Merge pull request #220 from philmartin2525/replace-lazy-static-with-…
Browse files Browse the repository at this point in the history 
…once-cell

Replace lazy_static dependency in chain crate with once_cell
  • Loading branch information
@dr-orlovsky
dr-orlovsky authored Jan 31, 2022
2 parents 64d727f + d6e621a commit f5d3725
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 74 deletions.
8 changes: 7 additions & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ edition = "2018"
amplify = "3.9.1"
bitcoin = "0.27.1"
bitcoin_hashes = "0.10.0"
once_cell = "1.9.0"
strict_encoding = "1.7.9"
strict_encoding_test = "1.7.6"
serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true }
serde_with = { version = "1.8", features = ["hex"], optional = true }
lazy_static = "1.4.0" # TODO: #213 Remove dependency

[features]
serde = ["serde_crate", "serde_with", "bitcoin_hashes/serde", "bitcoin/use-serde"]
151 changes: 79 additions & 72 deletions chain/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ extern crate bitcoin_hashes;
#[cfg(feature = "serde")]
#[macro_use]
extern crate serde_crate as serde;
#[macro_use]
extern crate lazy_static;

use std::cmp::Ordering;
use std::convert::TryFrom;
Expand All @@ -44,6 +42,7 @@ use bitcoin::hashes::hex::{self, FromHex, ToHex};
use bitcoin::hashes::{sha256d, Hash};
use bitcoin::network::constants::Network;
use bitcoin::BlockHash;
use once_cell::sync::Lazy;
use strict_encoding::{
strict_decode_self, strict_deserialize, strict_encode_list,
strict_serialize, StrictDecode, StrictEncode,
Expand Down Expand Up @@ -280,9 +279,9 @@ pub const GENESIS_HASH_LIQUIDV1: &[u8] = &[
0x37, 0x92, 0x96, 0x88, 0x8a, 0x20, 0x60, 0x03,
];

lazy_static! {
/// Bitcoin mainnet chain parameters
static ref CHAIN_PARAMS_MAINNET: ChainParams = ChainParams {
/// Bitcoin mainnet chain parameters
static CHAIN_PARAMS_MAINNET: Lazy<ChainParams> = Lazy::new(|| {
ChainParams {
name: "bitcoin".to_string(),
p2p_magic: P2pNetworkId::Mainnet,
genesis_hash: BlockHash::from_slice(GENESIS_HASH_MAINNET)
Expand All @@ -307,14 +306,17 @@ lazy_static! {
},
is_testnet: false,
is_pow: true,
};
}
});

/// Bitcoin testnet chain parameters
static ref CHAIN_PARAMS_TESTNET: ChainParams = ChainParams {
/// Bitcoin testnet chain parameters
static CHAIN_PARAMS_TESTNET: Lazy<ChainParams> = Lazy::new(|| {
ChainParams {
name: "testnet".to_string(),
p2p_magic: P2pNetworkId::Testnet,
genesis_hash: BlockHash::from_slice(GENESIS_HASH_TESTNET)
.expect("Bitcoin testnet genesis hash contains invalid binary data"),
genesis_hash: BlockHash::from_slice(GENESIS_HASH_TESTNET).expect(
"Bitcoin testnet genesis hash contains invalid binary data",
),
bip70_name: "test".to_string(),
bip173_prefix: "tb".to_string(),
p2p_port: 18333,
Expand All @@ -329,72 +331,77 @@ lazy_static! {
unit_of_accounting: "Test Bitcoin".to_string(),
indivisible_unit: "Test satoshi".to_string(),
divisibility: 100_000_000,
asset_id: AssetId::from_slice(GENESIS_HASH_TESTNET)
.expect("Bitcoin testnet genesis hash contains invalid binary data"),
asset_id: AssetId::from_slice(GENESIS_HASH_TESTNET).expect(
"Bitcoin testnet genesis hash contains invalid binary data",
),
asset_system: AssetSystem::NativeBlockchain,
},
is_testnet: true,
is_pow: true,
};

/// Bitcoin regtest chain parameters
static ref CHAIN_PARAMS_REGTEST: ChainParams = ChainParams {
name: "regtest".to_string(),
p2p_magic: P2pNetworkId::Regtest,
genesis_hash: BlockHash::from_slice(GENESIS_HASH_REGTEST)
.expect("Bitcoin regtest genesis hash contains invalid binary data"),
bip70_name: "regtest".to_string(),
bip173_prefix: "tb".to_string(),
p2p_port: 28333,
rpc_port: 28332,
ln_height: 1,
rgb_height: 1,
format: ChainFormat::Bitcoin,
dust_limit: 546,
native_asset: AssetParams {
ticker: "tBTC".to_string(),
unit_of_accounting: "Test Bitcoin".to_string(),
indivisible_unit: "Test satoshi".to_string(),
divisibility: 100_000_000,
asset_id: AssetId::from_slice(GENESIS_HASH_REGTEST)
.expect("Bitcoin regtest genesis hash contains invalid binary data"),
asset_system: AssetSystem::NativeBlockchain,
},
is_testnet: true,
is_pow: false,
};

/// Bitcoin signet chain parameters
static ref CHAIN_PARAMS_SIGNET: ChainParams = ChainParams {
name: "signet".to_string(),
p2p_magic: P2pNetworkId::Signet,
genesis_hash: BlockHash::from_slice(GENESIS_HASH_SIGNET)
}
});

/// Bitcoin regtest chain parameters
static CHAIN_PARAMS_REGTEST: Lazy<ChainParams> = Lazy::new(|| ChainParams {
name: "regtest".to_string(),
p2p_magic: P2pNetworkId::Regtest,
genesis_hash: BlockHash::from_slice(GENESIS_HASH_REGTEST)
.expect("Bitcoin regtest genesis hash contains invalid binary data"),
bip70_name: "regtest".to_string(),
bip173_prefix: "tb".to_string(),
p2p_port: 28333,
rpc_port: 28332,
ln_height: 1,
rgb_height: 1,
format: ChainFormat::Bitcoin,
dust_limit: 546,
native_asset: AssetParams {
ticker: "tBTC".to_string(),
unit_of_accounting: "Test Bitcoin".to_string(),
indivisible_unit: "Test satoshi".to_string(),
divisibility: 100_000_000,
asset_id: AssetId::from_slice(GENESIS_HASH_REGTEST).expect(
"Bitcoin regtest genesis hash contains invalid binary data",
),
asset_system: AssetSystem::NativeBlockchain,
},
is_testnet: true,
is_pow: false,
});

/// Bitcoin signet chain parameters
static CHAIN_PARAMS_SIGNET: Lazy<ChainParams> = Lazy::new(|| ChainParams {
name: "signet".to_string(),
p2p_magic: P2pNetworkId::Signet,
genesis_hash: BlockHash::from_slice(GENESIS_HASH_SIGNET)
.expect("Bitcoin signet genesis hash contains invalid binary data"),
bip70_name: "signet".to_string(),
bip173_prefix: "tb".to_string(),
p2p_port: 38333,
rpc_port: 38332,
ln_height: 1,
rgb_height: 1,
format: ChainFormat::Bitcoin,
dust_limit: 546,
native_asset: AssetParams {
ticker: "sBTC".to_string(),
unit_of_accounting: "Signet Bitcoin".to_string(),
indivisible_unit: "Signet satoshi".to_string(),
divisibility: 100_000_000,
asset_id: AssetId::from_slice(GENESIS_HASH_SIGNET)
.expect("Bitcoin signet genesis hash contains invalid binary data"),
bip70_name: "signet".to_string(),
bip173_prefix: "tb".to_string(),
p2p_port: 38333,
rpc_port: 38332,
ln_height: 1,
rgb_height: 1,
format: ChainFormat::Bitcoin,
dust_limit: 546,
native_asset: AssetParams {
ticker: "sBTC".to_string(),
unit_of_accounting: "Signet Bitcoin".to_string(),
indivisible_unit: "Signet satoshi".to_string(),
divisibility: 100_000_000,
asset_id: AssetId::from_slice(GENESIS_HASH_SIGNET)
.expect("Bitcoin signet genesis hash contains invalid binary data"),
asset_system: AssetSystem::NativeBlockchain,
},
is_testnet: true,
is_pow: false,
};

/// Liquid V1 chain parameters
static ref CHAIN_PARAMS_LIQUIDV1: ChainParams = ChainParams {
asset_system: AssetSystem::NativeBlockchain,
},
is_testnet: true,
is_pow: false,
});

/// Liquid V1 chain parameters
static CHAIN_PARAMS_LIQUIDV1: Lazy<ChainParams> = Lazy::new(|| {
ChainParams {
name: "liquidv1".to_string(),
// TODO #216: check Liquid network magic number and change this if needed
// TODO #216: check Liquid network magic number and change this if
// needed
p2p_magic: P2pNetworkId::Mainnet,
genesis_hash: BlockHash::from_slice(GENESIS_HASH_LIQUIDV1)
.expect("Liquid V1 genesis hash contains invalid binary data"),
Expand All @@ -417,8 +424,8 @@ lazy_static! {
},
is_testnet: false,
is_pow: false,
};
}
}
});

/// Enum identifying format for transaction & block structure in a given chain.
/// Right now only two structures are supported: Bitcoin format and
Expand Down

0 comments on commit f5d3725

Please sign in to comment.