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

Change some asserts in equihash.cpp to be static.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood
2016-08-24 05:39:31 +01:00
parent c6a7e897bc
commit bcf79c78c5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/crypto/equihash.cpp
View File

@@ -136,7 +136,7 @@ void CompressArray(const unsigned char* in, size_t in_len,
// comparison // comparison
void EhIndexToArray(const eh_index i, unsigned char* array) void EhIndexToArray(const eh_index i, unsigned char* array)
{ {
assert(sizeof(eh_index) == 4); BOOST_STATIC_ASSERT(sizeof(eh_index) == 4);
eh_index bei = htobe32(i); eh_index bei = htobe32(i);
memcpy(array, &bei, sizeof(eh_index)); memcpy(array, &bei, sizeof(eh_index));
} }
@@ -145,7 +145,7 @@ void EhIndexToArray(const eh_index i, unsigned char* array)
// comparison // comparison
eh_index ArrayToEhIndex(const unsigned char* array) eh_index ArrayToEhIndex(const unsigned char* array)
{ {
assert(sizeof(eh_index) == 4); BOOST_STATIC_ASSERT(sizeof(eh_index) == 4);
eh_index bei; eh_index bei;
memcpy(&bei, array, sizeof(eh_index)); memcpy(&bei, array, sizeof(eh_index));
return be32toh(bei); return be32toh(bei);
@@ -154,7 +154,7 @@ eh_index ArrayToEhIndex(const unsigned char* array)
eh_trunc TruncateIndex(const eh_index i, const unsigned int ilen) eh_trunc TruncateIndex(const eh_index i, const unsigned int ilen)
{ {
// Truncate to 8 bits // Truncate to 8 bits
assert(sizeof(eh_trunc) == 1); BOOST_STATIC_ASSERT(sizeof(eh_trunc) == 1);
return (i >> (ilen - 8)) & 0xff; return (i >> (ilen - 8)) & 0xff;
} }
@@ -208,7 +208,7 @@ StepRow<WIDTH>::StepRow(const unsigned char* hashIn, size_t hInLen,
template<size_t WIDTH> template<size_t W> template<size_t WIDTH> template<size_t W>
StepRow<WIDTH>::StepRow(const StepRow<W>& a) StepRow<WIDTH>::StepRow(const StepRow<W>& a)
{ {
assert(W <= WIDTH); BOOST_STATIC_ASSERT(W <= WIDTH);
std::copy(a.hash, a.hash+W, hash); std::copy(a.hash, a.hash+W, hash);
} }