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

Remove RippleAddress:

Browse Source 
The RippleAddress class was used to represent a number of fundamentally
different types: account public keys, account secret keys, node public
keys, node secret keys, seeds and generators.

The class is replaced by the following types:
* PublicKey for account and node public keys
* SecretKey for account and node private keys
* Generator for generating secp256k1 accounts
* Seed for account, node and generator seeds
This commit is contained in:
Nik Bougalis
2015-10-22 02:15:04 -07:00
parent e0af6ec567
commit 3974ddd8f7
116 changed files with 2445 additions and 4272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ripple/overlay/impl/Cluster.cpp
View File

@@ -26,7 +26,6 @@
#include <ripple/overlay/Cluster.h>
#include <ripple/overlay/ClusterNode.h>
#include <ripple/protocol/JsonFields.h>
#include <ripple/protocol/RippleAddress.h>
#include <ripple/protocol/tokens.h>
#include <boost/regex.hpp>
#include <memory.h>
@@ -39,7 +38,7 @@ Cluster::Cluster (beast::Journal j)
}
boost::optional<std::string>
Cluster::member (RippleAddress const& identity) const
Cluster::member (PublicKey const& identity) const
{
std::lock_guard<std::mutex> lock(mutex_);
@@ -53,12 +52,13 @@ std::size_t
Cluster::size() const
{
std::lock_guard<std::mutex> lock(mutex_);
return nodes_.size();
}
bool
Cluster::update (
RippleAddress const& identity,
PublicKey const& identity,
std::string name,
std::uint32_t loadFee,
NetClock::time_point reportTime)
@@ -120,23 +120,24 @@ Cluster::load (Section const& nodes)
return false;
}
auto const nid = RippleAddress::createNodePublic (match[1]);
auto const id = parseBase58<PublicKey>(
TokenType::TOKEN_NODE_PUBLIC, match[1]);
if (!nid.isValid())
if (!id)
{
JLOG (j_.error) <<
"Invalid node identity: " << match[1];
return false;
}
if (member (nid))
if (member (*id))
{
JLOG (j_.warning) <<
"Duplicate node identity: " << match[1];
continue;
}
update(nid, trim_whitespace(match[2]));
update(*id, trim_whitespace(match[2]));
}
return true;