Skip to content

Commit

Permalink
Merge pull request #1994 from bitshares/graphene_witness_node_change
Browse files Browse the repository at this point in the history
change Graphene Witness Node
  • Loading branch information
oxarbitrage authored Sep 19, 2019
2 parents 2517a6f + 864d215 commit eaae959
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion libraries/app/config_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ static void load_config_file(const fc::path& config_ini_path, const bpo::options
bpo::variables_map& options )
{
deduplicator dedup;
bpo::options_description unique_options("Graphene Witness Node");
bpo::options_description unique_options("BitShares Witness Node");
for( const boost::shared_ptr<bpo::option_description> opt : cfg_options.options() )
{
const boost::shared_ptr<bpo::option_description> od = dedup.next(opt);
Expand Down
2 changes: 1 addition & 1 deletion libraries/plugins/witness/witness.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void new_chain_banner( const graphene::chain::database& db )
"********************************\n"
"* *\n"
"* ------- NEW CHAIN ------ *\n"
"* - Welcome to Graphene! - *\n"
"* - Welcome to BitShares! - *\n"
"* ------------------------ *\n"
"* *\n"
"********************************\n"
Expand Down
4 changes: 2 additions & 2 deletions libraries/protocol/include/graphene/protocol/asset.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ namespace graphene { namespace protocol {
};

/**
* @brief The price struct stores asset prices in the Graphene system.
* @brief The price struct stores asset prices in the BitShares system.
*
* A price is defined as a ratio between two assets, and represents a possible exchange rate between those two
* assets. prices are generally not stored in any simplified form, i.e. a price of (1000 CORE)/(20 USD) is perfectly
* normal.
*
* The assets within a price are labeled base and quote. Throughout the Graphene code base, the convention used is
* The assets within a price are labeled base and quote. Throughout the BitShares code base, the convention used is
* that the base asset is the asset being sold, and the quote asset is the asset being purchased, where the price is
* represented as base/quote, so in the example price above the seller is looking to sell CORE asset and get USD in
* return.
Expand Down
4 changes: 2 additions & 2 deletions libraries/protocol/include/graphene/protocol/proposal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@

namespace graphene { namespace protocol {
/**
* @defgroup proposed_transactions The Graphene Transaction Proposal Protocol
* @defgroup proposed_transactions The BitShares Transaction Proposal Protocol
* @ingroup operations
*
* Graphene allows users to propose a transaction which requires approval of multiple accounts in order to execute.
* BitShares allows users to propose a transaction which requires approval of multiple accounts in order to execute.
* The user proposes a transaction using proposal_create_operation, then signatory accounts use
* proposal_update_operations to add or remove their approvals from this operation. When a sufficient number of
* approvals have been granted, the operations in the proposal are used to create a virtual transaction which is
Expand Down
2 changes: 1 addition & 1 deletion libraries/protocol/include/graphene/protocol/vote.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace graphene { namespace protocol {
*
* In JSON, a vote_id_type is represented as a string "type:instance", i.e. "1:5" would be type 1 and instance 5.
*
* @note In the Graphene protocol, vote_id_type instances are unique across types; that is to say, if an object of
* @note In the BitShares protocol, vote_id_type instances are unique across types; that is to say, if an object of
* type 1 has instance 4, an object of type 0 may not also have instance 4. In other words, the type is not a
* namespace for instances; it is only an informational field.
*/
Expand Down
2 changes: 1 addition & 1 deletion libraries/protocol/include/graphene/protocol/worker.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace graphene { namespace protocol {
* @defgroup workers The Blockchain Worker System
* @ingroup operations
*
* Graphene blockchains allow the creation of special "workers" which are elected positions paid by the blockchain
* BitShares blockchains allow the creation of special "workers" which are elected positions paid by the blockchain
* for services they provide. There may be several types of workers, and the semantics of how and when they are paid
* are defined by the @ref worker_type_enum enumeration. All workers are elected by core stakeholder approval, by
* voting for or against them.
Expand Down
2 changes: 1 addition & 1 deletion libraries/wallet/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.

PROJECT_NAME = "Graphene Wallet API"
PROJECT_NAME = "BitShares Wallet API"

# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
Expand Down
4 changes: 2 additions & 2 deletions libraries/wallet/include/graphene/wallet/wallet.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ class wallet_api
*/
string gethelp(const string& method)const;

/** Loads a specified Graphene wallet.
/** Loads a specified BitShares wallet.
*
* The current wallet is closed before the new wallet is loaded.
*
Expand Down Expand Up @@ -1225,7 +1225,7 @@ class wallet_api

/** Place a limit order attempting to sell one asset for another.
*
* Buying and selling are the same operation on Graphene; if you want to buy BTS
* Buying and selling are the same operation on BitShares; if you want to buy BTS
* with USD, you should sell USD for BTS.
*
* The blockchain will attempt to sell the \c symbol_to_sell for as
Expand Down
2 changes: 1 addition & 1 deletion programs/genesis_util/genesis_update.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int main( int argc, char** argv )
{
try
{
bpo::options_description cli_options("Graphene empty blocks");
bpo::options_description cli_options("BitShares empty blocks");
cli_options.add_options()
("help,h", "Print this help message and exit.")
("genesis-json,g", bpo::value<boost::filesystem::path>(), "File to read genesis state from")
Expand Down
4 changes: 2 additions & 2 deletions programs/witness_node/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ int main(int argc, char** argv) {
app::application* node = new app::application();
fc::oexception unhandled_exception;
try {
bpo::options_description app_options("Graphene Witness Node");
bpo::options_description cfg_options("Graphene Witness Node");
bpo::options_description app_options("BitShares Witness Node");
bpo::options_description cfg_options("BitShares Witness Node");
app_options.add_options()
("help,h", "Print this help message and exit.")
("data-dir,d", bpo::value<boost::filesystem::path>()->default_value("witness_node_data_dir"),
Expand Down
2 changes: 1 addition & 1 deletion tests/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(load_configuration_options_test_config_logging_files_create
auto node = new app::application();
bpo::options_description cli, cfg;
node->set_program_options(cli, cfg);
bpo::options_description cfg_options("Graphene Witness Node");
bpo::options_description cfg_options("BitShares Witness Node");
cfg_options.add(cfg);

/// check preconditions
Expand Down
2 changes: 1 addition & 1 deletion tests/benchmarks/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#define BOOST_TEST_MODULE "C++ Benchmarks for Graphene Blockchain Database"
#define BOOST_TEST_MODULE "C++ Benchmarks for BitShares Blockchain Database"
#include <boost/test/included/unit_test.hpp>

2 changes: 1 addition & 1 deletion tests/generate_empty_blocks/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int main( int argc, char** argv )
{
try
{
bpo::options_description cli_options("Graphene empty blocks");
bpo::options_description cli_options("BitShares empty blocks");
cli_options.add_options()
("help,h", "Print this help message and exit.")
("data-dir", bpo::value<boost::filesystem::path>()->default_value("empty_blocks_data_dir"), "Directory containing generator database")
Expand Down

0 comments on commit eaae959

Please sign in to comment.