Page MenuHomePhabricator
Differential D9635

[refactor] replace duplicated AmountFromValue function with Amount::Amount(UniValue T)
AbandonedPublic
Actions

Authored by majcosta on Jun 6 2021, 06:01.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Summary

The AmountFromValue function is defined twice, one of which is only used in bitcoin-tx, once.

The difference between them is that in rpc/util.cpp it throws a UniValue and the bitcoin-tx version throws a std::runtime_error. This deduplicates the code and makes it into a user-defined conversion on the Amount class which throws 'UniValue' as that was the one most used.

Tests are updated to conform to the simpler syntax.
Added a catch block in bitcoin-tx to handle possible UniValue throw there.

Test Plan
ninja all check-all
cmake .. -GNinja -DENABLE_SANITIZERS='undefined,address,fuzzer' -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
ninja bitcoin-fuzzers && ./src/test/fuzz/parse_univalue

Diff Detail

Revision Contents
Changeset List

PathSize
src/
3 lines
17 lines
24 lines
rpc/
2 lines
18 lines
5 lines
1 line
18 lines
test/
fuzz/
2 lines
81 lines
2 lines
util/
3 lines
wallet/
15 lines

Diff 28769

View Options

src/amount.h

Loading...
View Options

src/amount.cpp

Loading...
View Options

src/bitcoin-tx.cpp

Loading...
View Options

src/rpc/avalanche.cpp

Loading...
View Options

src/rpc/rawtransaction.cpp

Loading...
View Options

src/rpc/rawtransaction_util.cpp

Loading...
View Options

src/rpc/util.h

Loading...
View Options

src/rpc/util.cpp

Loading...
View Options

src/test/fuzz/parse_univalue.cpp

Loading...
View Options

src/test/rpc_tests.cpp

Loading...
View Options

src/test/script_tests.cpp

Loading...
View Options

src/util/moneystr.h

Loading...
View Options

src/wallet/rpcwallet.cpp

Loading...