Skip to content

Commit

Permalink
Remove boost dependency (boost/assign/std/vector.hpp)
Browse files Browse the repository at this point in the history
Github-Pull: bitcoin#13545
Rebased-From: 962d8ee
  • Loading branch information
practicalswift authored and MarcoFalke committed Jul 13, 2018
1 parent 1062199 commit e15e3a9
Showing 1 changed file with 13 additions and 16 deletions.
29 changes: 13 additions & 16 deletions src/test/streams_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@
#include <support/allocators/zeroafterfree.h>
#include <test/test_bitcoin.h>

#include <boost/assign/std/vector.hpp> // for 'operator+=()'
#include <boost/test/unit_test.hpp>

using namespace boost::assign; // bring 'operator+=()' into scope

BOOST_FIXTURE_TEST_SUITE(streams_tests, BasicTestingSetup)

BOOST_AUTO_TEST_CASE(streams_vector_writer)
Expand Down Expand Up @@ -80,25 +77,25 @@ BOOST_AUTO_TEST_CASE(streams_serializedata_xor)

// Degenerate case

key += '\x00';
key += '\x00';
key.push_back('\x00');
key.push_back('\x00');
ds.Xor(key);
BOOST_CHECK_EQUAL(
std::string(expected_xor.begin(), expected_xor.end()),
std::string(ds.begin(), ds.end()));

in += '\x0f';
in += '\xf0';
expected_xor += '\xf0';
expected_xor += '\x0f';
in.push_back('\x0f');
in.push_back('\xf0');
expected_xor.push_back('\xf0');
expected_xor.push_back('\x0f');

// Single character key

ds.clear();
ds.insert(ds.begin(), in.begin(), in.end());
key.clear();

key += '\xff';
key.push_back('\xff');
ds.Xor(key);
BOOST_CHECK_EQUAL(
std::string(expected_xor.begin(), expected_xor.end()),
Expand All @@ -108,17 +105,17 @@ BOOST_AUTO_TEST_CASE(streams_serializedata_xor)

in.clear();
expected_xor.clear();
in += '\xf0';
in += '\x0f';
expected_xor += '\x0f';
expected_xor += '\x00';
in.push_back('\xf0');
in.push_back('\x0f');
expected_xor.push_back('\x0f');
expected_xor.push_back('\x00');

ds.clear();
ds.insert(ds.begin(), in.begin(), in.end());

key.clear();
key += '\xff';
key += '\x0f';
key.push_back('\xff');
key.push_back('\x0f');

ds.Xor(key);
BOOST_CHECK_EQUAL(
Expand Down

0 comments on commit e15e3a9

Please sign in to comment.