diff --git a/SHAMapNodes.cpp b/SHAMapNodes.cpp index 688970bd8..9c15b8798 100644 --- a/SHAMapNodes.cpp +++ b/SHAMapNodes.cpp @@ -108,7 +108,7 @@ SHAMapNode::SHAMapNode(const void *ptr, int len) void SHAMapNode::addIDRaw(Serializer &s) const { s.add256(mNodeID); - s.add1(mDepth); + s.add8(mDepth); } SHAMapNode SHAMapNode::getChildNodeID(int m) const @@ -204,7 +204,7 @@ SHAMapTreeNode::SHAMapTreeNode(const SHAMapNode& id, const std::vector=16)) throw SHAMapException(InvalidNode); s.get256(mHashes[pos], i*33); } @@ -221,7 +221,7 @@ void SHAMapTreeNode::addRaw(Serializer &s) if(mType==TRANSACTION) { mItem->addRaw(s); - s.add1(0); + s.add8(0); assert(s.getLength()>32); return; } @@ -230,7 +230,7 @@ void SHAMapTreeNode::addRaw(Serializer &s) { mItem->addRaw(s); s.add160(mItem->getTag().to160()); - s.add1(1); + s.add8(1); return; } @@ -240,15 +240,15 @@ void SHAMapTreeNode::addRaw(Serializer &s) if(mHashes[i].isNonZero()) { s.add256(mHashes[i]); - s.add1(i); + s.add8(i); } - s.add1(3); + s.add8(3); return; } for(int i=0; i<16; i++) s.add256(mHashes[i]); - s.add1(2); + s.add8(2); } bool SHAMapTreeNode::updateHash() diff --git a/Serializer.cpp b/Serializer.cpp index 03deb0136..15a9bf610 100644 --- a/Serializer.cpp +++ b/Serializer.cpp @@ -114,14 +114,14 @@ uint256 Serializer::get256(int offset) const return ret; } -int Serializer::add1(unsigned char byte) +int Serializer::add8(unsigned char byte) { int ret=mData.size(); mData.push_back(byte); return ret; } -bool Serializer::get1(int& byte, int offset) const +bool Serializer::get8(int& byte, int offset) const { if(offset>=mData.size()) return false; byte=mData[offset]; diff --git a/Serializer.h b/Serializer.h index 42efc85fb..48b91c656 100644 --- a/Serializer.h +++ b/Serializer.h @@ -22,7 +22,7 @@ class Serializer Serializer(const std::string& data) : mData(data.data(), (data.data()) + data.size()) { ; } // assemble functions - int add1(unsigned char byte); + int add8(unsigned char byte); int add16(uint16); int add32(uint32); // ledger indexes, account sequence int add64(uint64); // timestamps, amounts @@ -32,8 +32,8 @@ class Serializer int addRaw(const void *ptr, int len); // disassemble functions - bool get1(int&, int offset) const; - bool get1(unsigned char&, int offset) const; + bool get8(int&, int offset) const; + bool get8(unsigned char&, int offset) const; bool get16(uint16&, int offset) const; bool get32(uint32&, int offset) const; bool get64(uint64&, int offset) const;