diff options
| author | Luke Dashjr <[email protected]> | 2012-11-14 21:32:36 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-14 21:32:36 +0000 |
| commit | c6911a9755ef8daf7b9ae7d277c78ebf8e25b230 (patch) | |
| tree | 70fc4b026a6bb78f6d152678dfb1092d5914754e /src/test | |
| parent | Fixes a race condition in CreateNewBlock and a future null deref on testnet. (diff) | |
| parent | Merge branch '0.6.0.x' into 0.6.x (diff) | |
| download | discoin-c6911a9755ef8daf7b9ae7d277c78ebf8e25b230.tar.xz discoin-c6911a9755ef8daf7b9ae7d277c78ebf8e25b230.zip | |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/bitcoinrpc.cpp
src/crypter.h
src/main.cpp
src/qt/bitcoin.cpp
src/qt/qtipcserver.cpp
src/util.cpp
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/rpc_tests.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index eb820ade6..505ec8f5f 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -22,14 +22,7 @@ createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL) return result; } -// This can be removed this when addmultisigaddress is enabled on main net: -struct TestNetFixture -{ - TestNetFixture() { fTestNet = true; } - ~TestNetFixture() { fTestNet = false; } -}; - -BOOST_FIXTURE_TEST_CASE(rpc_addmultisig, TestNetFixture) +BOOST_AUTO_TEST_CASE(rpc_addmultisig) { rpcfn_type addmultisig = tableRPC["addmultisigaddress"]->actor; |