Merge pull request #2812

9ac52127 unit_tests: fix build after wallet2 list/vector change (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-11-14 21:33:38 +02:00
commit 74b699beda
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -76,7 +76,7 @@ TEST(select_outputs, one_out_of_N)
tools::wallet2::transfer_container transfers = make_transfers_container(10); tools::wallet2::transfer_container transfers = make_transfers_container(10);
transfers[6].m_block_height = 700; transfers[6].m_block_height = 700;
std::vector<size_t> unused_indices({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}); std::vector<size_t> unused_indices({0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
std::list<size_t> selected; std::vector<size_t> selected;
SELECT(2); SELECT(2);
PICK(6); PICK(6);
} }
@ -93,7 +93,7 @@ TEST(select_outputs, order)
transfers[3].m_block_height = 716; transfers[3].m_block_height = 716;
transfers[4].m_block_height = 701; transfers[4].m_block_height = 701;
std::vector<size_t> unused_indices({0, 1, 2, 3, 4}); std::vector<size_t> unused_indices({0, 1, 2, 3, 4});
std::list<size_t> selected; std::vector<size_t> selected;
SELECT(0); SELECT(0);
PICK(3); // first the one that's far away PICK(3); // first the one that's far away
PICK(2); // then the one that's close PICK(2); // then the one that's close