ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and modernize code:

Browse Source 
This commit removes obsolete comments, dead or no longer useful
code, and workarounds for several issues that were present in older
compilers that we no longer support.

Specifically:

- It improves the transaction metadata handling class, simplifying
  its use and making it less error-prone.
- It reduces the footprint of the Serializer class by consolidating
  code and leveraging templates.
- It cleanups the ST* class hierarchy, removing dead code, improving
  and consolidating code to reduce complexity and code duplication.
- It shores up the handling of currency codes and the conversation
  between 160-bit currency codes and their string representation.
- It migrates beast::secure_erase to the ripple namespace and uses
  a call to OpenSSL_cleanse instead of the custom implementation.
This commit is contained in:
Nik Bougalis
2020-03-27 14:26:46 -07:00
parent 6c72d5cf7e
commit dbee3f01b7
45 changed files with 244 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ripple/shamap/impl/SHAMapTreeNode.cpp
View File

@@ -116,7 +116,7 @@ SHAMapAbstractNode::make(
Throw<std::runtime_error>("short AS node");
uint256 u;
s.get256(u, len - (256 / 8));
s.getBitString(u, len - (256 / 8));
s.chop(256 / 8);
if (u.isZero())
@@ -137,7 +137,7 @@ SHAMapAbstractNode::make(
auto ret = std::make_shared<SHAMapInnerNode>(seq);
for (int i = 0; i < 16; ++i)
{
s.get256(ret->mHashes[i].as_uint256(), i * 32);
s.getBitString(ret->mHashes[i].as_uint256(), i * 32);
if (ret->mHashes[i].isNonZero())
ret->mIsBranch |= (1 << i);
@@ -159,7 +159,7 @@ SHAMapAbstractNode::make(
Throw<std::runtime_error>("short CI node");
if ((pos < 0) || (pos >= 16))
Throw<std::runtime_error>("invalid CI node");
s.get256(ret->mHashes[pos].as_uint256(), i * 33);
s.getBitString(ret->mHashes[pos].as_uint256(), i * 33);
if (ret->mHashes[pos].isNonZero())
ret->mIsBranch |= (1 << pos);
}
@@ -176,7 +176,7 @@ SHAMapAbstractNode::make(
Throw<std::runtime_error>("short TM node");
uint256 u;
s.get256(u, len - (256 / 8));
s.getBitString(u, len - (256 / 8));
s.chop(256 / 8);
if (u.isZero())
@@ -224,7 +224,7 @@ SHAMapAbstractNode::make(
Throw<std::runtime_error>("short PLN node");
uint256 u;
s.get256(u, s.getLength() - 32);
s.getBitString(u, s.getLength() - 32);
s.chop(32);
if (u.isZero())
@@ -250,7 +250,7 @@ SHAMapAbstractNode::make(
for (int i = 0; i < 16; ++i)
{
s.get256(ret->mHashes[i].as_uint256(), i * 32);
s.getBitString(ret->mHashes[i].as_uint256(), i * 32);
if (ret->mHashes[i].isNonZero())
ret->mIsBranch |= (1 << i);
@@ -269,7 +269,7 @@ SHAMapAbstractNode::make(
Throw<std::runtime_error>("short TXN node");
uint256 txID;
s.get256(txID, s.getLength() - 32);
s.getBitString(txID, s.getLength() - 32);
s.chop(32);
auto item = std::make_shared<SHAMapItem const>(txID, s.peekData());
if (hashValid)
@@ -359,7 +359,7 @@ SHAMapInnerNode::addRaw(Serializer& s, SHANodeFormat format) const
if (format == snfHASH)
{
s.add256(mHash.as_uint256());
s.addBitString(mHash.as_uint256());
}
else if (mType == tnINNER)
{
@@ -370,7 +370,7 @@ SHAMapInnerNode::addRaw(Serializer& s, SHANodeFormat format) const
s.add32(HashPrefix::innerNode);
for (auto const& hh : mHashes)
s.add256(hh.as_uint256());
s.addBitString(hh.as_uint256());
}
else // format == snfWIRE
{
@@ -380,7 +380,7 @@ SHAMapInnerNode::addRaw(Serializer& s, SHANodeFormat format) const
for (int i = 0; i < mHashes.size(); ++i)
if (!isEmptyBranch(i))
{
s.add256(mHashes[i].as_uint256());
s.addBitString(mHashes[i].as_uint256());
s.add8(i);
}
@@ -389,7 +389,7 @@ SHAMapInnerNode::addRaw(Serializer& s, SHANodeFormat format) const
else
{
for (auto const& hh : mHashes)
s.add256(hh.as_uint256());
s.addBitString(hh.as_uint256());
s.add8(2);
}
@@ -409,7 +409,7 @@ SHAMapTreeNode::addRaw(Serializer& s, SHANodeFormat format) const
if (format == snfHASH)
{
s.add256(mHash.as_uint256());
s.addBitString(mHash.as_uint256());
}
else if (mType == tnACCOUNT_STATE)
{
@@ -417,12 +417,12 @@ SHAMapTreeNode::addRaw(Serializer& s, SHANodeFormat format) const
{
s.add32(HashPrefix::leafNode);
s.addRaw(mItem->peekData());
s.add256(mItem->key());
s.addBitString(mItem->key());
}
else
{
s.addRaw(mItem->peekData());
s.add256(mItem->key());
s.addBitString(mItem->key());
s.add8(1);
}
}
@@ -445,12 +445,12 @@ SHAMapTreeNode::addRaw(Serializer& s, SHANodeFormat format) const
{
s.add32(HashPrefix::txNode);
s.addRaw(mItem->peekData());
s.add256(mItem->key());
s.addBitString(mItem->key());
}
else
{
s.addRaw(mItem->peekData());
s.add256(mItem->key());
s.addBitString(mItem->key());
s.add8(4);
}
}