diff options
| author | John Newbery <john@johnnewbery.com> | 2019-04-02 17:03:37 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-04-09 17:53:08 -0400 |
| commit | 91a25d1e711bfc0617027eee18b9777ff368d6b9 (patch) | |
| tree | af7b5dbb366b9f9aac68ecf668f330d180bc31f4 /src/rpc | |
| parent | 99517866b62c261f990e1f897502855afc12f2a7 (diff) | |
| download | bitcoin-91a25d1e711bfc0617027eee18b9777ff368d6b9.tar.xz | |
[build] Add several util units
Adds the following util units and adds them to libbitcoin_util:
- `util/url.cpp` takes `urlDecode` from `httpserver.cpp`
- `util/error.cpp` takes `TransactionErrorString` from
`node/transaction.cpp` and `AmountHighWarn` and `AmountErrMsg` from
`ui_interface.cpp`
- `util/fees.cpp` takes `StringForFeeReason` and `FeeModeFromString` from `policy/fees.cpp`
- `util/rbf.cpp` takes `SignalsOptInRBF` from `policy/rbf.cpp`
- 'util/validation.cpp` takes `FormatStateMessage` and `strMessageMagic` from 'validation.cpp`
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/blockchain.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/mining.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/misc.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/rawtransaction_util.cpp | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index d35f458b2e..3db24080db 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -29,6 +29,7 @@ #include <txmempool.h> #include <util/strencodings.h> #include <util/system.h> +#include <util/validation.h> #include <validation.h> #include <validationinterface.h> #include <versionbitsinfo.h> diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 480d610235..c636102b20 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -21,8 +21,10 @@ #include <rpc/util.h> #include <shutdown.h> #include <txmempool.h> +#include <util/fees.h> #include <util/strencodings.h> #include <util/system.h> +#include <util/validation.h> #include <validation.h> #include <validationinterface.h> #include <versionbitsinfo.h> diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 0a97f80297..f221847347 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -20,6 +20,7 @@ #include <timedata.h> #include <util/system.h> #include <util/strencodings.h> +#include <util/validation.h> #include <warnings.h> #include <stdint.h> diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp index 8b2ab8fa91..728fc62e25 100644 --- a/src/rpc/rawtransaction_util.cpp +++ b/src/rpc/rawtransaction_util.cpp @@ -11,12 +11,12 @@ #include <key_io.h> #include <keystore.h> #include <policy/policy.h> -#include <policy/rbf.h> #include <primitives/transaction.h> #include <rpc/protocol.h> #include <rpc/util.h> #include <tinyformat.h> #include <univalue.h> +#include <util/rbf.h> #include <util/strencodings.h> CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniValue& outputs_in, const UniValue& locktime, const UniValue& rbf) |