DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix NPE in rpc_wallet_tests

Browse Source
This commit is contained in:
Jack Grigg
2017-11-05 12:02:21 -05:00
parent 4305a56221
commit bef1b5ce1b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/rpc_wallet_tests.cpp
View File

@@ -1175,7 +1175,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_internals)
try { try {
proxy.perform_joinsplit(info); proxy.perform_joinsplit(info);
} catch (const std::runtime_error & e) { } catch (const std::runtime_error & e) {
BOOST_CHECK( string(e.what()).find("JoinSplit verifying key not loaded")!= string::npos); BOOST_CHECK( string(e.what()).find("error verifying joinsplit")!= string::npos);
} }
} }
@@ -1365,7 +1365,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_shieldcoinbase_internals)
try { try {
proxy.perform_joinsplit(info); proxy.perform_joinsplit(info);
} catch (const std::runtime_error & e) { } catch (const std::runtime_error & e) {
BOOST_CHECK( string(e.what()).find("JoinSplit verifying key not loaded")!= string::npos); BOOST_CHECK( string(e.what()).find("error verifying joinsplit")!= string::npos);
} }
} }

14
src/test/test_bitcoin.h
View File

@@ -17,11 +17,17 @@ struct BasicTestingSetup {
~BasicTestingSetup(); ~BasicTestingSetup();
}; };
// Setup w.r.t. zk-SNARK API
struct JoinSplitTestingSetup: public BasicTestingSetup {
JoinSplitTestingSetup();
~JoinSplitTestingSetup();
};
/** Testing setup that configures a complete environment. /** Testing setup that configures a complete environment.
* Included are data directory, coins database, script check threads * Included are data directory, coins database, script check threads
* and wallet (if enabled) setup. * and wallet (if enabled) setup.
*/ */
struct TestingSetup: public BasicTestingSetup { struct TestingSetup: public JoinSplitTestingSetup {
CCoinsViewDB *pcoinsdbview; CCoinsViewDB *pcoinsdbview;
boost::filesystem::path pathTemp; boost::filesystem::path pathTemp;
boost::thread_group threadGroup; boost::thread_group threadGroup;
@@ -30,10 +36,4 @@ struct TestingSetup: public BasicTestingSetup {
~TestingSetup(); ~TestingSetup();
}; };
// Setup w.r.t. zk-SNARK API
struct JoinSplitTestingSetup: public BasicTestingSetup {
JoinSplitTestingSetup();
~JoinSplitTestingSetup();
};
#endif #endif