LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

streams: Remove unused seek(size_t)

Browse source
This commit is contained in:
practicalswift 2018-10-03 14:52:08 +02:00
parent 2607c38fc5
commit 958e1a307e
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/streams.h
View file

@ -126,12 +126,6 @@ class CVectorWriter
{ {
return nType; return nType;
} }
void seek(size_t nSize)
{
nPos += nSize;
if(nPos > vchData.size())
vchData.resize(nPos);
}
private: private:
const int nType; const int nType;
const int nVersion; const int nVersion;
@ -158,9 +152,11 @@ public:
* @param[in] pos Starting position. Vector index where reads should start. * @param[in] pos Starting position. Vector index where reads should start.
*/ */
VectorReader(int type, int version, const std::vector<unsigned char>& data, size_t pos) VectorReader(int type, int version, const std::vector<unsigned char>& data, size_t pos)
: m_type(type), m_version(version), m_data(data) : m_type(type), m_version(version), m_data(data), m_pos(pos)
{ {
seek(pos); if (m_pos > m_data.size()) {
throw std::ios_base::failure("VectorReader(...): end of data (m_pos > m_data.size())");
}
} }
/* /*
@ -203,14 +199,6 @@ public:
memcpy(dst, m_data.data() + m_pos, n); memcpy(dst, m_data.data() + m_pos, n);
m_pos = pos_next; m_pos = pos_next;
} }
void seek(size_t n)
{
m_pos += n;
if (m_pos > m_data.size()) {
throw std::ios_base::failure("VectorReader::seek(): end of data");
}
}
}; };
/** Double ended buffer combining vector and stream-like interfaces. /** Double ended buffer combining vector and stream-like interfaces.

10
src/test/streams_tests.cpp
View file

@ -102,15 +102,15 @@ BOOST_AUTO_TEST_CASE(streams_vector_reader)
BOOST_CHECK_THROW(reader >> d, std::ios_base::failure); BOOST_CHECK_THROW(reader >> d, std::ios_base::failure);
// Read a 4 bytes as a signed int from the beginning of the buffer. // Read a 4 bytes as a signed int from the beginning of the buffer.
reader.seek(-6); VectorReader new_reader(SER_NETWORK, INIT_PROTO_VERSION, vch, 0);
reader >> d; new_reader >> d;
BOOST_CHECK_EQUAL(d, 67370753); // 1,255,3,4 in little-endian base-256 BOOST_CHECK_EQUAL(d, 67370753); // 1,255,3,4 in little-endian base-256
BOOST_CHECK_EQUAL(reader.size(), 2); BOOST_CHECK_EQUAL(new_reader.size(), 2);
BOOST_CHECK(!reader.empty()); BOOST_CHECK(!new_reader.empty());
// Reading after end of byte vector throws an error even if the reader is // Reading after end of byte vector throws an error even if the reader is
// not totally empty. // not totally empty.
BOOST_CHECK_THROW(reader >> d, std::ios_base::failure); BOOST_CHECK_THROW(new_reader >> d, std::ios_base::failure);
} }
BOOST_AUTO_TEST_CASE(bitstream_reader_writer) BOOST_AUTO_TEST_CASE(bitstream_reader_writer)