diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-21 16:49:32 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-21 16:49:32 -0700 |
| commit | 457661f6400030f5979564462e8c625840cc5e58 (patch) | |
| tree | 3848fa3602811a368bd44f189ff232f1d4fe54c7 /src/test | |
| parent | 7dbe393629a263675ccfd6fce8e7fc12496c808a (diff) | |
| parent | e46704dd904192d8731eae1226805252e5252a0e (diff) | |
| download | bitcoin-457661f6400030f5979564462e8c625840cc5e58.tar.xz | |
Merge pull request #1124 from sipa/rpcobj3
extension of #1103: encapsulate mapCommands in CRPCTable
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/rpc_tests.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 87462f765b..7a438e5d51 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -3,16 +3,11 @@ #include "base58.h" #include "util.h" -#include "json/json_spirit_reader_template.h" -#include "json/json_spirit_writer_template.h" -#include "json/json_spirit_utils.h" +#include "bitcoinrpc.h" using namespace std; using namespace json_spirit; -typedef Value(*rpcfn_type)(const Array& params, bool fHelp); -extern map<string, rpcfn_type> mapCallTable; - BOOST_AUTO_TEST_SUITE(rpc_tests) static Array @@ -36,7 +31,7 @@ struct TestNetFixture BOOST_FIXTURE_TEST_CASE(rpc_addmultisig, TestNetFixture) { - rpcfn_type addmultisig = mapCallTable["addmultisigaddress"]; + rpcfn_type addmultisig = tableRPC["addmultisigaddress"]->actor; // old, 65-byte-long: const char* address1Hex = "0434e3e09f49ea168c5bbf53f877ff4206923858aab7c7e1df25bc263978107c95e35065a27ef6f1b27222db0ec97e0e895eaca603d3ee0d4c060ce3d8a00286c8"; |