diff --git a/eth/main.cpp b/eth/main.cpp index 6ac52a974..b4f0326a9 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -801,7 +801,7 @@ int main(int argc, char** argv) { bytes block(8); in.read((char*)block.data(), 8); - block.resize(RLP(block, RLP::LaisezFaire).actualSize()); + block.resize(RLP(block, RLP::LaissezFaire).actualSize()); in.read((char*)block.data() + 8, block.size() - 8); switch (web3.ethereum()->queueBlock(block, safeImport)) diff --git a/libdevcore/RLP.cpp b/libdevcore/RLP.cpp index 330893c76..92d97aec4 100644 --- a/libdevcore/RLP.cpp +++ b/libdevcore/RLP.cpp @@ -320,7 +320,7 @@ std::ostream& dev::operator<<(std::ostream& _out, RLP const& _d) if (_d.isNull()) _out << "null"; else if (_d.isInt()) - _out << std::showbase << std::hex << std::nouppercase << _d.toInt(RLP::LaisezFaire) << dec; + _out << std::showbase << std::hex << std::nouppercase << _d.toInt(RLP::LaissezFaire) << dec; else if (_d.isData()) _out << escaped(_d.toString(), false); else if (_d.isList()) diff --git a/libdevcore/RLP.h b/libdevcore/RLP.h index dee438be4..67f464b9d 100644 --- a/libdevcore/RLP.h +++ b/libdevcore/RLP.h @@ -71,7 +71,7 @@ public: FailIfTooSmall = 16, Strict = ThrowOnFail | FailIfTooBig, VeryStrict = ThrowOnFail | FailIfTooBig | FailIfTooSmall, - LaisezFaire = AllowNonCanon + LaissezFaire = AllowNonCanon }; using Strictness = int; diff --git a/libethereum/EthereumPeer.cpp b/libethereum/EthereumPeer.cpp index 88878334c..eea5d23dc 100644 --- a/libethereum/EthereumPeer.cpp +++ b/libethereum/EthereumPeer.cpp @@ -86,7 +86,7 @@ unsigned EthereumPeer::askOverride() const if (s->info().clientVersion.substr(0, badGeth.size()) == badGeth) return 1; bytes const& d = repMan().data(*s, name()); - return d.empty() ? c_maxBlocksAsk : RLP(d).toInt(RLP::LaisezFaire); + return d.empty() ? c_maxBlocksAsk : RLP(d).toInt(RLP::LaissezFaire); } void EthereumPeer::setRude() diff --git a/rlp/main.cpp b/rlp/main.cpp index 400a0cb70..8ff7202c3 100644 --- a/rlp/main.cpp +++ b/rlp/main.cpp @@ -113,9 +113,9 @@ public: m_out << "null"; else if (_d.isInt() && !m_prefs.stringInts) if (m_prefs.hexInts) - m_out << (m_prefs.hexPrefix ? "0x" : "") << toHex(toCompactBigEndian(_d.toInt(RLP::LaisezFaire), 1), 1); + m_out << (m_prefs.hexPrefix ? "0x" : "") << toHex(toCompactBigEndian(_d.toInt(RLP::LaissezFaire), 1), 1); else - m_out << _d.toInt(RLP::LaisezFaire); + m_out << _d.toInt(RLP::LaissezFaire); else if (_d.isData() || (_d.isInt() && m_prefs.stringInts)) if (m_prefs.forceString || (!m_prefs.forceHex && isAscii(_d.toString()))) m_out << escaped(_d.toString(), m_prefs.escapeAll);