Permalink
Browse files

remove 'rippled' references

  • Loading branch information...
jedmccaleb committed Jul 27, 2014
1 parent c44367f commit 8831588b6babf3ef1a9331a573f41febbccf9f83
View
@@ -160,7 +160,7 @@ def print_cmd_line_worker(item, fmt, cmd):
global BuildLogFile
if not BuildLogFile:
BuildLogFile = open('rippled-build.log', 'w')
BuildLogFile = open('stellard-build.log', 'w')
if BuildLogFile:
wrapper = textwrap.TextWrapper()
@@ -178,7 +178,7 @@ def print_cmd_line(s, target, src, env):
target = (''.join([str(x) for x in target]))
source = (''.join([str(x) for x in src]))
if ('build/rippled' == target):
if ('build/stellard' == target):
print_cmd_line_worker(target, "%s\n", s)
elif ('tags' == target):
sys.stdout.write(" Generating tags")
@@ -368,7 +368,7 @@ https://ripple.com/wiki/Ubuntu_build_instructions#Ubuntu_versions_older_than_13.
if not USING_CLANG:
if (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) < 8):
print "\n\033[91mTo compile rippled using GCC you need version 4.8.1 or later.\033[0m\n"
print "\n\033[91mTo compile stellard using GCC you need version 4.8.1 or later.\033[0m\n"
if Ubuntu:
print "For information how to update your GCC, please visit:"
@@ -393,11 +393,11 @@ TravisBuild = (os.environ.get('TRAVIS', '0') == 'true') and \
RippleRepository = False
# Determine if we're building against the main ripple repo or a developer repo
# Determine if we're building against the main stellar repo or a developer repo
if TravisBuild:
Slug = os.environ.get('TRAVIS_REPO_SLUG', '')
if (Slug.find ("ripple/") == 0):
if (Slug.find ("stellar/") == 0):
RippleRepository = True
if TravisBuild:
View
@@ -179,11 +179,11 @@
//------------------------------------------------------------------------------
// These control whether or not certain functionality gets
// compiled into the resulting rippled executable
// compiled into the resulting stellard executable
/** Config: RIPPLE_ROCKSDB_AVAILABLE
Controls whether or not the RocksDB database back-end is compiled into
rippled. RocksDB requires a relatively modern C++ compiler (tested with
stellard. RocksDB requires a relatively modern C++ compiler (tested with
gcc versions 4.8.1 and later) that supports some C++11 features.
*/
#ifndef RIPPLE_ROCKSDB_AVAILABLE
@@ -278,7 +278,7 @@ void InboundLedger::addPeers ()
if (vSize == 0)
{
WriteLog (lsERROR, InboundLedger) <<
WriteLog (lsWARNING, InboundLedger) <<
"No peers to add for ledger acquisition";
return;
}
@@ -861,7 +861,7 @@ class ApplicationImp
#if 1
{
std::vector <std::string> const& strings (getConfig().validators);
m_validators->addStrings ("rippled.cfg", strings);
m_validators->addStrings ("stellard.cfg", strings);
}
#endif
@@ -479,7 +479,7 @@ class UniqueNodeListImp
bLoaded = nodeLoad (getConfig ().VALIDATORS_BASE);
}
// Always load from rippled.cfg
// Always load from stellard.cfg
if (!getConfig ().validators.empty ())
{
RippleAddress naInvalid; // Don't want a referrer on added entries.
@@ -30,7 +30,7 @@ class UniqueNodeList : public beast::Stoppable
public:
enum ValidatorSource
{
vsConfig = 'C', // rippled.cfg
vsConfig = 'C', // stellard.cfg
vsInbound = 'I',
vsManual = 'M',
vsReferral = 'R',
@@ -115,16 +115,16 @@ int main (int argc, char** argv)
__GNUC_PATCHLEVEL__;
static_assert (gccver >= 40801,
"GCC version 4.8.1 or later is required to compile rippled.");
"GCC version 4.8.1 or later is required to compile stellard.");
#endif
#ifdef _MSC_VER
static_assert (_MSC_VER >= 1800,
"Visual Studio 2013 or later is required to compile rippled.");
"Visual Studio 2013 or later is required to compile stellard.");
#endif
static_assert (BOOST_VERSION >= 105500,
"Boost version 1.55 or later is required to compile rippled");
"Boost version 1.55 or later is required to compile stellard");
if (sodium_init() == -1) {
std::cerr << "sodium_init failed\n";
@@ -63,7 +63,7 @@ extern void setCallingThreadName (const char* n)
cLine >> pName;
if (pName.empty ())
pName = "rippled";
pName = "stellard";
else
{
size_t zero = pName.find_first_of ('\0');
@@ -105,7 +105,7 @@ class Config
// This replaces CONFIG_FILE_NAME
static char const* getConfigFileName ()
{
return "rippled.cfg";
return "stellard.cfg";
}
static char const* getDatabaseDirName ()
@@ -207,7 +207,7 @@ class Config
beast::URL getValidatorsURL () const;
// DEPRECATED
boost::filesystem::path VALIDATORS_FILE; // As specifed in rippled.cfg.
boost::filesystem::path VALIDATORS_FILE; // As specified in stellard.cfg.
//--------------------------------------------------------------------------
@@ -278,7 +278,7 @@ class Config
*/
int peerPROXYListeningPort;
/** List of Validators entries from rippled.cfg */
/** List of Validators entries from stellard.cfg */
std::vector <std::string> validators;
private:
@@ -307,7 +307,7 @@ class Config
/** Parameters for the main NodeStore database.
This is 1 or more strings of the form <key>=<value>
The 'type' and 'path' keys are required, see rippled-example.cfg
The 'type' and 'path' keys are required, see stellard-example.cfg
@see Database
*/
@@ -351,9 +351,9 @@ class Config
std::string VALIDATORS_SITE; // Where to find validators.txt on the Internet.
std::string VALIDATORS_URI; // URI of validators.txt.
std::string VALIDATORS_BASE; // Name
std::vector<std::string> IPS; // Peer IPs from rippled.cfg.
std::vector<std::string> IPS_FIXED; // Fixed Peer IPs from rippled.cfg.
std::vector<std::string> SNTP_SERVERS; // SNTP servers from rippled.cfg.
std::vector<std::string> IPS; // Peer IPs from stellard.cfg.
std::vector<std::string> IPS_FIXED; // Fixed Peer IPs from stellard.cfg.
std::vector<std::string> SNTP_SERVERS; // SNTP servers from stellard.cfg.
enum StartUpType
{
@@ -4,7 +4,7 @@
## Introduction
The NodeStore provides an interface that stores, in a persistent database, the collection of
NodeObject that rippled uses as its primary representation of ledger items.
NodeObject that stellard uses as its primary representation of ledger items.
## Module directory structure
@@ -76,8 +76,8 @@ class ManagerImp : public Manager
static void missing_backend ()
{
throw std::runtime_error (
"Your rippled.cfg is missing a [node_db] entry, "
"please see the rippled-example.cfg file!"
"Your stellard.cfg is missing a [node_db] entry, "
"please see the stellard-example.cfg file!"
);
}
@@ -3,7 +3,7 @@
## Introduction
The _Ripple payment network_ consists of a collection of _peers_ running the
**rippled software**. Each peer maintains multiple outgoing connections and
**stellard software**. Each peer maintains multiple outgoing connections and
optional incoming connections to other peers. These connections are made over
both the public Internet and private local area networks. This network defines
a fully connected directed graph of nodes. Peers send and receive messages to
@@ -364,11 +364,6 @@ OverlayImpl::onPrepare ()
auto bootstrapIps (getConfig ().IPS);
// If no IPs are specified, use the Ripple Labs round robin
// pool to get some servers to insert into the boot cache.
//if (bootstrapIps.empty ())
// bootstrapIps.push_back ("r.ripple.com 51235");
if (!bootstrapIps.empty ())
{
m_resolver.resolve (bootstrapIps,
@@ -388,7 +383,7 @@ OverlayImpl::onPrepare ()
});
}
// Add the ips_fixed from the rippled.cfg file
// Add the ips_fixed from the stellard.cfg file
if (! getConfig ().RUN_STANDALONE && !getConfig ().IPS_FIXED.empty ())
{
m_resolver.resolve (getConfig ().IPS_FIXED,
@@ -148,7 +148,7 @@ class PeerImp
beast::Journal m_journal;
// A unique identifier (up to a restart of rippled) for this particular
// A unique identifier (up to a restart of stellard) for this particular
// peer instance. A peer that disconnects will, upon reconnection, get a
// new ID.
ShortId m_shortId;

0 comments on commit 8831588

Please sign in to comment.