diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-28 11:08:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-28 11:28:24 +0100 |
| commit | 62f2d769e45043c1f262ed45babb70fe237ad2bb (patch) | |
| tree | 23fc429dc67fc4455d108a5f727e50dbb9571604 /src/test | |
| parent | 20a408ca99dad3cbb8c1cea0fe5c3d52f328061e (diff) | |
| parent | d13f65ebac13ec18b7eb55176c31f1404f185c0c (diff) | |
| download | bitcoin-62f2d769e45043c1f262ed45babb70fe237ad2bb.tar.xz | |
Merge #7348: MOVE ONLY: move rpc* to rpc/
d13f65e rpc: update inline comments to refer to new file paths (Daniel Cousens)
a0eaff8 move rpc* to rpc/ (Daniel Cousens)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/rpc_tests.cpp | 6 | ||||
| -rw-r--r-- | src/test/rpc_wallet_tests.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index cc52e3ea06..d6309ca384 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "rpcserver.h" -#include "rpcclient.h" +#include "rpc/server.h" +#include "rpc/client.h" #include "base58.h" #include "netbase.h" @@ -260,7 +260,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban) adr = find_value(o1, "address"); banned_until = find_value(o1, "banned_until"); BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24"); - int64_t now = GetTime(); + int64_t now = GetTime(); BOOST_CHECK(banned_until.get_int64() > now); BOOST_CHECK(banned_until.get_int64()-now <= 200); diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index 398372af3c..3443be2093 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "rpcserver.h" -#include "rpcclient.h" +#include "rpc/server.h" +#include "rpc/client.h" #include "base58.h" #include "main.h" |