zecfoundation
/
parity-zcash
mirror of https://github.com/ZcashFoundation/parity-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bitcoincash_november

This commit is contained in:
Svyatoslav Nikolsky 2017-11-06 12:52:12 +03:00
parent 2b96829fb8 0bf96f1649
commit 9379677679
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
network/src/consensus.rs
View File

@ -206,6 +206,7 @@ impl ConsensusFork {
match *self { match *self {
// size of first fork block must be larger than 1MB // size of first fork block must be larger than 1MB
ConsensusFork::BitcoinCash(ref fork) if height == fork.height => 1_000_001, ConsensusFork::BitcoinCash(ref fork) if height == fork.height => 1_000_001,
ConsensusFork::SegWit2x(ref fork) if height == fork.height => 1_000_001,
ConsensusFork::NoFork | ConsensusFork::BitcoinCash(_) | ConsensusFork::SegWit2x(_) => 0, ConsensusFork::NoFork | ConsensusFork::BitcoinCash(_) | ConsensusFork::SegWit2x(_) => 0,
} }
} }
@ -314,7 +315,7 @@ mod tests {
assert_eq!(ConsensusFork::NoFork.min_block_size(0), 0); assert_eq!(ConsensusFork::NoFork.min_block_size(0), 0);
let fork = ConsensusFork::SegWit2x(Default::default()); let fork = ConsensusFork::SegWit2x(Default::default());
assert_eq!(fork.min_block_size(0), 0); assert_eq!(fork.min_block_size(0), 0);
assert_eq!(fork.min_block_size(fork.activation_height()), 0); assert_eq!(fork.min_block_size(fork.activation_height()), 1_000_001);
let fork = ConsensusFork::BitcoinCash(Default::default()); let fork = ConsensusFork::BitcoinCash(Default::default());
assert_eq!(fork.min_block_size(0), 0); assert_eq!(fork.min_block_size(0), 0);
assert_eq!(fork.min_block_size(fork.activation_height()), 1_000_001); assert_eq!(fork.min_block_size(fork.activation_height()), 1_000_001);