diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-22 15:51:44 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-22 15:57:31 -0500 |
| commit | 2e17ac83c65b65fe2037b8c8941c25e288905903 (patch) | |
| tree | 143d73d45bae5e0046ac994a3432f4353d9c0382 /src/test/multisig_tests.cpp | |
| parent | ce336fdc21c25c055ffef28fbe7c61164df7ca24 (diff) | |
Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care)
Diffstat (limited to 'src/test/multisig_tests.cpp')
| -rw-r--r-- | src/test/multisig_tests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 58f62b9542..742083f3cf 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1) BOOST_CHECK(Solver(s, whichType, solutions)); BOOST_CHECK(solutions.size() == 1); CBitcoinAddress addr; - BOOST_CHECK(ExtractAddress(s, &keystore, addr)); + BOOST_CHECK(ExtractAddress(s, addr)); BOOST_CHECK(addr == keyaddr[0]); BOOST_CHECK(IsMine(keystore, s)); BOOST_CHECK(!IsMine(emptykeystore, s)); @@ -205,7 +205,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1) BOOST_CHECK(Solver(s, whichType, solutions)); BOOST_CHECK(solutions.size() == 1); CBitcoinAddress addr; - BOOST_CHECK(ExtractAddress(s, &keystore, addr)); + BOOST_CHECK(ExtractAddress(s, addr)); BOOST_CHECK(addr == keyaddr[0]); BOOST_CHECK(IsMine(keystore, s)); BOOST_CHECK(!IsMine(emptykeystore, s)); @@ -218,7 +218,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1) BOOST_CHECK(Solver(s, whichType, solutions)); BOOST_CHECK_EQUAL(solutions.size(), 4); CBitcoinAddress addr; - BOOST_CHECK(!ExtractAddress(s, &keystore, addr)); + BOOST_CHECK(!ExtractAddress(s, addr)); BOOST_CHECK(IsMine(keystore, s)); BOOST_CHECK(!IsMine(emptykeystore, s)); } @@ -231,7 +231,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1) BOOST_CHECK_EQUAL(solutions.size(), 4); vector<CBitcoinAddress> addrs; int nRequired; - BOOST_CHECK(ExtractAddresses(s, &keystore, whichType, addrs, nRequired)); + BOOST_CHECK(ExtractAddresses(s, whichType, addrs, nRequired)); BOOST_CHECK(addrs[0] == keyaddr[0]); BOOST_CHECK(addrs[1] == keyaddr[1]); BOOST_CHECK(nRequired = 1); |