diff options
| author | Pieter Wuille <[email protected]> | 2016-01-03 18:54:50 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2016-06-22 15:43:00 +0200 |
| commit | 2b1f6f9ccf36f1e0a2c9d99154e1642f796d7c2b (patch) | |
| tree | 30b17fa55ea6c9ae0055c0c16d2e271a0c799d16 /src/test/test_bitcoin.h | |
| parent | [RPC] Return witness data in blockchain RPCs (diff) | |
| download | discoin-2b1f6f9ccf36f1e0a2c9d99154e1642f796d7c2b.tar.xz discoin-2b1f6f9ccf36f1e0a2c9d99154e1642f796d7c2b.zip | |
BIP141: Other consensus critical limits, and BIP145
Includes changes by Suhas Daftuar, Luke-jr, and mruddy.
Diffstat (limited to 'src/test/test_bitcoin.h')
| -rw-r--r-- | src/test/test_bitcoin.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h index 78b87e710..bc0d2fe31 100644 --- a/src/test/test_bitcoin.h +++ b/src/test/test_bitcoin.h @@ -70,12 +70,12 @@ struct TestMemPoolEntryHelper unsigned int nHeight; bool hadNoDependencies; bool spendsCoinbase; - unsigned int sigOpCount; + unsigned int sigOpCost; LockPoints lp; TestMemPoolEntryHelper() : nFee(0), nTime(0), dPriority(0.0), nHeight(1), - hadNoDependencies(false), spendsCoinbase(false), sigOpCount(1) { } + hadNoDependencies(false), spendsCoinbase(false), sigOpCost(4) { } CTxMemPoolEntry FromTx(CMutableTransaction &tx, CTxMemPool *pool = NULL); CTxMemPoolEntry FromTx(CTransaction &tx, CTxMemPool *pool = NULL); @@ -87,6 +87,6 @@ struct TestMemPoolEntryHelper TestMemPoolEntryHelper &Height(unsigned int _height) { nHeight = _height; return *this; } TestMemPoolEntryHelper &HadNoDependencies(bool _hnd) { hadNoDependencies = _hnd; return *this; } TestMemPoolEntryHelper &SpendsCoinbase(bool _flag) { spendsCoinbase = _flag; return *this; } - TestMemPoolEntryHelper &SigOps(unsigned int _sigops) { sigOpCount = _sigops; return *this; } + TestMemPoolEntryHelper &SigOpsCost(unsigned int _sigopsCost) { sigOpCost = _sigopsCost; return *this; } }; #endif |