diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-12-21 14:04:03 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-12-21 14:04:06 +0100 |
| commit | e8cfe1ee2d01c493b758a67ad14707dca15792ea (patch) | |
| tree | 8164f54ddbb171d62bb9bf54949c18a06e5e40dc /src/script/sign.cpp | |
| parent | Merge #9308: [test] Add CCoinsViewCache Access/Modify/Write tests (diff) | |
| parent | Move CTxInWitness inside CTxIn (diff) | |
| download | discoin-e8cfe1ee2d01c493b758a67ad14707dca15792ea.tar.xz discoin-e8cfe1ee2d01c493b758a67ad14707dca15792ea.zip | |
Merge #8589: Inline CTxInWitness inside CTxIn
f6fb7ac Move CTxInWitness inside CTxIn (Pieter Wuille)
Diffstat (limited to 'src/script/sign.cpp')
| -rw-r--r-- | src/script/sign.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index f552ad5bb..b008df259 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -194,9 +194,7 @@ SignatureData DataFromTransaction(const CMutableTransaction& tx, unsigned int nI SignatureData data; assert(tx.vin.size() > nIn); data.scriptSig = tx.vin[nIn].scriptSig; - if (tx.wit.vtxinwit.size() > nIn) { - data.scriptWitness = tx.wit.vtxinwit[nIn].scriptWitness; - } + data.scriptWitness = tx.vin[nIn].scriptWitness; return data; } @@ -204,10 +202,7 @@ void UpdateTransaction(CMutableTransaction& tx, unsigned int nIn, const Signatur { assert(tx.vin.size() > nIn); tx.vin[nIn].scriptSig = data.scriptSig; - if (!data.scriptWitness.IsNull() || tx.wit.vtxinwit.size() > nIn) { - tx.wit.vtxinwit.resize(tx.vin.size()); - tx.wit.vtxinwit[nIn].scriptWitness = data.scriptWitness; - } + tx.vin[nIn].scriptWitness = data.scriptWitness; } bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType) |