diff options
| author | MarcoFalke <[email protected]> | 2019-04-27 09:28:51 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-04-27 09:28:54 -0400 |
| commit | 3356799ee3f5441b8d6e68b9172eb641011354f8 (patch) | |
| tree | c7d9cfc35fb92eb7f9cc60f006b01955e5ab809c /src/interfaces/node.cpp | |
| parent | Merge #15846: [POLICY] Make sending to future native witness outputs standard (diff) | |
| parent | [wallet] Move maxTxFee to wallet (diff) | |
| download | discoin-3356799ee3f5441b8d6e68b9172eb641011354f8.tar.xz discoin-3356799ee3f5441b8d6e68b9172eb641011354f8.zip | |
Merge #15778: [wallet] Move maxtxfee from node to wallet
5c759c73b2 [wallet] Move maxTxFee to wallet (John Newbery)
Pull request description:
Closes #15355
Moves the `-maxtxfee` from the node to the wallet. See discussion in issue for details.
This is a cleanup. There is no change in behaviour.
Completes #15620
ACKs for commit 5c759c:
MarcoFalke:
utACK 5c759c73b2602c7fde1c50dbafe5525904c1b64c
ryanofsky:
utACK 5c759c73b2602c7fde1c50dbafe5525904c1b64c. Changes since last review: updated commit message and an error message and method name.
meshcollider:
utACK https://github.com/bitcoin/bitcoin/pull/15778/commits/5c759c73b2602c7fde1c50dbafe5525904c1b64c
Tree-SHA512: 2f9b2729da3940a5cda994d3f3bc11ee1a52fcc1c5e9842ea0ea63e4eb0300e8416853046776311298bc449ba07554aa46f0f245ce28598a5b0bd7347c12e752
Diffstat (limited to 'src/interfaces/node.cpp')
| -rw-r--r-- | src/interfaces/node.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 73a507413..f3ee8fe36 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -207,7 +207,6 @@ public: } } bool getNetworkActive() override { return g_connman && g_connman->GetNetworkActive(); } - CAmount getMaxTxFee() override { return ::maxTxFee; } CFeeRate estimateSmartFee(int num_blocks, bool conservative, int* returned_target = nullptr) override { FeeCalculation fee_calc; |