From 2e17ac83c65b65fe2037b8c8941c25e288905903 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 22 Dec 2011 15:51:44 -0500 Subject: Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care) --- src/test/multisig_tests.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/test') 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 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); -- cgit v1.2.3