ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups and bug fix.

Browse Source
This commit is contained in:
JoelKatz
2012-02-07 17:30:06 -08:00
parent a5a4a373f7
commit 43c70696ce
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SHAMapSync.cpp
View File

@@ -79,7 +79,7 @@ bool SHAMap::getNodeFat(const SHAMapNode& wanted, std::vector<SHAMapNode>& nodeI
node->addRaw(s); node->addRaw(s);
rawNodes.push_back(s.peekData()); rawNodes.push_back(s.peekData());
if(wanted.isRoot()) // don't get a fat root if(node->isRoot() || node->isLeaf()) // don't get a fat root, can't get a fat leaf
return true; return true;
for(int i=0; i<16; i++) for(int i=0; i<16; i++)
@@ -104,7 +104,7 @@ bool SHAMap::addRootNode(const std::vector<unsigned char>& rootNode)
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
// we already have a root node // we already have a root node
if(!!root->getNodeHash()) if(root->getNodeHash().isNonZero())
{ {
#ifdef DEBUG #ifdef DEBUG
std::cerr << "got root node, already have one" << std::endl; std::cerr << "got root node, already have one" << std::endl;
@@ -133,7 +133,7 @@ bool SHAMap::addRootNode(const uint256& hash, const std::vector<unsigned char>&
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
// we already have a root node // we already have a root node
if(!!root->getNodeHash()) if(root->getNodeHash().isNonZero())
{ {
#ifdef DEBUG #ifdef DEBUG
std::cerr << "got root node, already have one" << std::endl; std::cerr << "got root node, already have one" << std::endl;
@@ -314,6 +314,8 @@ static bool confuseMap(SHAMap &map, int count)
std::list<uint256> items; std::list<uint256> items;
map.dump(true);
for(int i=0; i<count; i++) for(int i=0; i<count; i++)
{ {
SHAMapItem::pointer item=makeRandomAS(); SHAMapItem::pointer item=makeRandomAS();
@@ -337,6 +339,7 @@ static bool confuseMap(SHAMap &map, int count)
if(beforeHash!=map.getHash()) if(beforeHash!=map.getHash())
{ {
std::cerr << "Hashes do not match" << std::endl; std::cerr << "Hashes do not match" << std::endl;
map.dump(true);
return false; return false;
} }
@@ -345,19 +348,22 @@ static bool confuseMap(SHAMap &map, int count)
bool SHAMap::syncTest() bool SHAMap::syncTest()
{ {
#if 0
unsigned int seed; unsigned int seed;
RAND_pseudo_bytes(reinterpret_cast<unsigned char *>(&seed), sizeof(seed)); RAND_pseudo_bytes(reinterpret_cast<unsigned char *>(&seed), sizeof(seed));
srand(seed); srand(seed);
#endif
srand(2);
SHAMap source, destination; SHAMap source, destination;
// add random data to the source map // add random data to the source map
int items=10000; int items=8;
for(int i=0; i<items; i++) for(int i=0; i<items; i++)
source.addItem(*makeRandomAS(), false); source.addItem(*makeRandomAS(), false);
if(!confuseMap(source, 350)) if(!confuseMap(source, 3))
return false; return false;
source.setImmutable(); source.setImmutable();