Use mNonce256 in SHAMap hashing.

This commit is contained in:
Arthur Britto
2012-06-01 01:17:16 -07:00
parent e6745d0b3b
commit c13bf4d606
2 changed files with 17 additions and 5 deletions

View File

@@ -10,6 +10,20 @@
#include "Serializer.h"
#include "BitcoinUtil.h"
#include "SHAMap.h"
#include "Application.h"
std::size_t hash_SMN::operator() (const SHAMapNode& mn) const
{
return mn.getDepth()
^ *reinterpret_cast<const std::size_t *>(mn.getNodeID().begin())
^ *reinterpret_cast<const std::size_t *>(theApp->getNonce256().begin());
}
std::size_t hash_SMN::operator() (const uint256& u) const
{
return *reinterpret_cast<const std::size_t *>(u.begin())
^ *reinterpret_cast<const std::size_t *>(theApp->getNonce256().begin());
}
SHAMap::SHAMap(uint32 seq) : mSeq(seq), mState(Modifying)
{

View File

@@ -77,13 +77,11 @@ public:
};
class hash_SMN
{ // These must be randomized for release
{
public:
std::size_t operator() (const SHAMapNode& mn) const
{ return mn.getDepth() ^ *reinterpret_cast<const std::size_t *>(mn.getNodeID().begin()); }
std::size_t operator() (const SHAMapNode& mn) const;
std::size_t operator() (const uint256& u) const
{ return *reinterpret_cast<const std::size_t *>(u.begin()); }
std::size_t operator() (const uint256& u) const;
};
class SHAMapItem