diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-28 08:56:35 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-04-02 10:12:43 +0200 |
| commit | bb78c1599e555fbece13ad50ab4b1dfa68ebc372 (patch) | |
| tree | 5c3778685a4d6fcee5e2af7821e436c231397a15 | |
| parent | 51ea44f01c0d63aeacb8657b6305040b3419e9f1 (diff) | |
Restore CalculateMaximumSignedTxSize function signature
| -rw-r--r-- | src/wallet/feebumper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index 57c879447c..61b7a730b5 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -20,7 +20,7 @@ // calculation, but we should be able to refactor after priority is removed). // NOTE: this requires that all inputs must be in mapWallet (eg the tx should // be IsAllFromMe). -int64_t CalculateMaximumSignedTxSize(const CWallet *pWallet, const CTransaction &tx) +int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *pWallet) { CMutableTransaction txNew(tx); std::vector<std::pair<const CWalletTx *, unsigned int>> vCoins; @@ -120,7 +120,7 @@ CFeeBumper::CFeeBumper(const CWallet *pWallet, const uint256 txidIn, int newConf // Calculate the expected size of the new transaction. int64_t txSize = GetVirtualTransactionSize(*(wtx.tx)); - const int64_t maxNewTxSize = CalculateMaximumSignedTxSize(pWallet, *wtx.tx); + const int64_t maxNewTxSize = CalculateMaximumSignedTxSize(*wtx.tx, pWallet); if (maxNewTxSize < 0) { vErrors.push_back("Transaction contains inputs that cannot be signed"); currentResult = BumpFeeResult::INVALID_ADDRESS_OR_KEY; |