fixed bip16 + SegWit conflict in Network::Unittest

2017-11-06 17:53:45 +03:00 · 2017-11-06 17:53:45 +03:00 · 7ab015648c
parent c7be95b462
commit 7ab015648c
1 changed files with 1 additions and 1 deletions
--- a/network/src/consensus.rs
+++ b/network/src/consensus.rs
@ -144,7 +144,7 @@ impl ConsensusParams {
 						bit: 1,
 						start_time: 0,
 						timeout: ::std::u32::MAX,
-						activation: Some(0),
+						activation: if network == Network::Regtest { Some(0) } else { None },
 					}),
 					ConsensusFork::BitcoinCash(_) => None,
 				},