From 4bc63d60818017576853e76e8cfefbd1c697ed50 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 21 Aug 2017 12:11:38 +0300 Subject: [PATCH] segwit: revert wrong removal --- network/src/consensus.rs | 17 ++++++++++++++++- network/src/deployments.rs | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/network/src/consensus.rs b/network/src/consensus.rs index bc9a3a78..65b3b906 100644 --- a/network/src/consensus.rs +++ b/network/src/consensus.rs @@ -216,7 +216,6 @@ impl ConsensusFork { mod tests { use super::super::Magic; use super::{ConsensusParams, ConsensusFork}; - //use deployments::tests::DummyDeployments; #[test] fn test_consensus_params_bip34_height() { @@ -253,6 +252,22 @@ mod tests { assert_eq!(ConsensusParams::new(Magic::Regtest, ConsensusFork::NoFork).miner_confirmation_window, 144); } + #[test] + fn test_consensus_fork_min_block_size() { + assert_eq!(ConsensusFork::NoFork.min_block_size(0), 0); + assert_eq!(ConsensusFork::SegWit2x(100).min_block_size(0), 0); + assert_eq!(ConsensusFork::SegWit2x(100).min_block_size(100), 0); + assert_eq!(ConsensusFork::BitcoinCash(100).min_block_size(0), 0); + assert_eq!(ConsensusFork::BitcoinCash(100).min_block_size(100), 1_000_001); + } + + #[test] + fn test_consensus_fork_max_transaction_size() { + assert_eq!(ConsensusFork::NoFork.max_transaction_size(0), 1_000_000); + assert_eq!(ConsensusFork::SegWit2x(100).max_transaction_size(0), 1_000_000); + assert_eq!(ConsensusFork::BitcoinCash(100).max_transaction_size(0), 1_000_000); + } + #[test] fn test_consensus_fork_max_block_sigops() { assert_eq!(ConsensusFork::NoFork.max_block_sigops(0, 1_000_000), 20_000); diff --git a/network/src/deployments.rs b/network/src/deployments.rs index bceec723..4428b22f 100644 --- a/network/src/deployments.rs +++ b/network/src/deployments.rs @@ -20,3 +20,4 @@ impl Deployment { (version & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS && (version & (1 << self.bit)) != 0 } } +