diff options
| author | AwfulCrawler <AwfulCrawler@users.noreply.github.com> | 2016-04-18 13:58:22 +1200 |
|---|---|---|
| committer | AwfulCrawler <AwfulCrawler@users.noreply.github.com> | 2016-04-18 13:58:22 +1200 |
| commit | 2d9dfd082096429b4b1876aff8cb8c76f93b7b10 (patch) | |
| tree | 3665fcb864eabc32a754c7bfddc90a3c672dd598 /tests | |
| parent | Merge pull request #799 (diff) | |
| parent | Merge pull request #803 (diff) | |
| download | monero-2d9dfd082096429b4b1876aff8cb8c76f93b7b10.tar.xz | |
Merge pull request #1 from monero-project/master
Catch up with Monero master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/core_tests/chaingen.h | 6 | ||||
| -rw-r--r-- | tests/functional_tests/transactions_flow_test.cpp | 2 | ||||
| -rw-r--r-- | tests/unit_tests/unbound.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h index 44170d116..652413b8a 100644 --- a/tests/core_tests/chaingen.h +++ b/tests/core_tests/chaingen.h @@ -470,13 +470,15 @@ inline bool replay_events_through_core(cryptonote::core& cr, const std::vector<t CATCH_ENTRY_L0("replay_events_through_core", false); } //-------------------------------------------------------------------------- -template<class t_test_class> +template<typename t_test_class> struct get_test_options { - const std::pair<uint8_t, uint64_t> hard_forks[1] = {std::make_pair((uint8_t)1, (uint64_t)0)}; + const std::pair<uint8_t, uint64_t> hard_forks[1]; const cryptonote::test_options test_options = { hard_forks }; + get_test_options():hard_forks{std::make_pair((uint8_t)1, (uint64_t)0)}{} }; + //-------------------------------------------------------------------------- template<class t_test_class> inline bool do_replay_events(std::vector<test_event_entry>& events) diff --git a/tests/functional_tests/transactions_flow_test.cpp b/tests/functional_tests/transactions_flow_test.cpp index 3c3cf3a90..159ccfd83 100644 --- a/tests/functional_tests/transactions_flow_test.cpp +++ b/tests/functional_tests/transactions_flow_test.cpp @@ -85,7 +85,7 @@ bool do_send_money(tools::wallet2& w1, tools::wallet2& w2, size_t mix_in_factor, try { tools::wallet2::pending_tx ptx; - w1.transfer(dsts, mix_in_factor, 0, TEST_FEE, std::vector<uint8_t>(), tools::detail::null_split_strategy, tools::tx_dust_policy(TEST_DUST_THRESHOLD), tx, ptx); + w1.transfer(dsts, mix_in_factor, 0, TEST_FEE, std::vector<uint8_t>(), tools::detail::null_split_strategy, tools::tx_dust_policy(TEST_DUST_THRESHOLD), tx, ptx, true); w1.commit_tx(ptx); return true; } diff --git a/tests/unit_tests/unbound.cpp b/tests/unit_tests/unbound.cpp index 25026ec58..666f68127 100644 --- a/tests/unit_tests/unbound.cpp +++ b/tests/unit_tests/unbound.cpp @@ -30,6 +30,8 @@ #include "gtest/gtest.h" +#ifdef STATICLIB + extern "C" int dnskey_algo_id_is_supported(int); TEST(unbound, supported_algorithms) @@ -47,3 +49,5 @@ TEST(unbound, supported_algorithms) ASSERT_TRUE(dnskey_algo_id_is_supported(13)); } +#endif + |