Skip to content

Commit

Permalink
rename eos
Browse files Browse the repository at this point in the history
  • Loading branch information
aidenthefox committed May 18, 2018
1 parent c4d225f commit 2016646
Show file tree
Hide file tree
Showing 31 changed files with 64 additions and 64 deletions.
2 changes: 1 addition & 1 deletion Docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
- enunode-data-volume:/opt/enumivo/bin/data-dir

enuwallet:
image: enumivo/eos
image: enumivo/enu
command: /opt/enumivo/bin/enuwallet --wallet-dir /opt/enumivo/bin/data-dir
hostname: enuwallet
links:
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ machine:

dependencies:
override:
- cd ~/eos && docker build -t enumivo/eos -f Docker/Dockerfile .
- cd ~/enumivo && docker build -t enumivo/enumivo -f Docker/Dockerfile .

test:
pre:
- sleep 5
override:
- docker run enumivo/eos
- docker run enumivo/enumivo
2 changes: 1 addition & 1 deletion contracts/bancor/bancor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
#pragma once

#include <enumivolib/eos.hpp>
#include <enumivolib/enumivo.hpp>
#include <enumivolib/token.hpp>
#include <enumivolib/reflect.hpp>
#include <enumivolib/generic_currency.hpp>
Expand Down
2 changes: 1 addition & 1 deletion contracts/dice/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ enucli push action dice withdraw '[ "alice", "103.0000 EOS" ]' -p alice

##### Balance of alice after withdraw
````bash
enucli get currency balance enumivo.coin alice eos
enucli get currency balance enumivo.coin alice enu
1003.0000 EOS
````

2 changes: 1 addition & 1 deletion contracts/enumivolib/action.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extern "C" {
* @code
* // Assume this action is used for the following examples:
* // {
* // "code": "eos",
* // "code": "enu",
* // "type": "transfer",
* // "authorization": [{ "account": "inita", "permission": "active" }],
* // "data": {
Expand Down
2 changes: 1 addition & 1 deletion contracts/enumivolib/transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ namespace enumivo {

///@} transactioncpp api

} // namespace eos
} // namespace enumivo
2 changes: 1 addition & 1 deletion contracts/social/social.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @file
* @copyright defined in enumivo/LICENSE.txt
*/
#include <eos.hpp>
#include <enumivo.hpp>

/**
* The purpose of this contract is to implement something like Steem on EOS, this
Expand Down
2 changes: 1 addition & 1 deletion contracts/stltest/stltest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
#include <string>
#include <stdexcept>
*/
//include <enumivolib/eos.hpp>
//include <enumivolib/enumivo.hpp>
#include <enumivolib/dispatcher.hpp>

using namespace enumivo;
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/include/enumivo/chain/abi_def.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file
* @copyright defined in eos/LICENSE.txt
* @copyright defined in enumivo/LICENSE.txt
*/
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/**
* @file
* @copyright defined in eos/LICENSE.txt
* @copyright defined in enumivo/LICENSE.txt
*/
#pragma once
#include <enumivo/chain/types.hpp>
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/wasm_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ class compiler_builtins : public context_aware_api {


/*
* This api will be removed with fix for `eos #2561`
* This api will be removed with fix for `enu #2561`
*/
class call_depth_api : public context_aware_api {
public:
Expand Down
2 changes: 1 addition & 1 deletion libraries/utilities/git_revision.cpp.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <stdint.h>
#include <eos/utilities/git_revision.hpp>
#include <enumivo/utilities/git_revision.hpp>

#define ENU_GIT_REVISION_SHA "@ENU_GIT_REVISION_SHA@"
#define ENU_GIT_REVISION_UNIX_TIMESTAMP @ENU_GIT_REVISION_UNIX_TIMESTAMP@
Expand Down
2 changes: 1 addition & 1 deletion libraries/utilities/tempdir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fc::path temp_directory_path()
const char* enu_tempdir = getenv("ENU_TEMPDIR");
if( enu_tempdir != nullptr )
return fc::path( enu_tempdir );
return fc::temp_directory_path() / "eos-tmp";
return fc::temp_directory_path() / "enu-tmp";
}

} } // enumivo::utilities
10 changes: 5 additions & 5 deletions plugins/txn_test_gen_plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ This plugin provides a way to generate a given amount of transactions per second
The following instructions describe how to use the `txn_test_gen_plugin` plugin to generate 1,000 transaction per second load on a simple Enumivo node.

### Create config and data directories
Make an empty directory for our configs and data, `mkdir ~/eos.data`, and define a logging.json that doesn't print debug information (which occurs for each txn) to the console:
Make an empty directory for our configs and data, `mkdir ~/enumivo.data`, and define a logging.json that doesn't print debug information (which occurs for each txn) to the console:
```bash
cat << EOF > ~/eos.data/logging.json
cat << EOF > ~/enumivo.data/logging.json
{
"includes": [],
"appenders": [{
Expand Down Expand Up @@ -49,18 +49,18 @@ EOF

### Launch producer
```bash
$ ./enunode -d ~/eos.data/producer_node --config-dir ~/eos.data/producer_node -l ~/eos.data/logging.json --http-server-address "" -p enumivo -e
$ ./enunode -d ~/enumivo.data/producer_node --config-dir ~/enumivo.data/producer_node -l ~/enumivo.data/logging.json --http-server-address "" -p enumivo -e
```

### Launch non-producer that will generate transactions
```bash
$ ./enunode -d ~/eos.data/generator_node --config-dir ~/eos.data/generator_node -l ~/eos.data/logging.json --plugin enumivo::txn_test_gen_plugin --plugin enumivo::wallet_api_plugin --plugin enumivo::chain_api_plugin --p2p-peer-address localhost:9876 --p2p-listen-endpoint localhost:5555
$ ./enunode -d ~/enumivo.data/generator_node --config-dir ~/enumivo.data/generator_node -l ~/enumivo.data/logging.json --plugin enumivo::txn_test_gen_plugin --plugin enumivo::wallet_api_plugin --plugin enumivo::chain_api_plugin --p2p-peer-address localhost:9876 --p2p-listen-endpoint localhost:5555
```

### Create a wallet on the non-producer and set bios contract
```bash
$ ./enucli wallet create
$ ./enucli set contract enumivo ~/eos/build.release/contracts/enumivo.bios/
$ ./enucli set contract enumivo ~/enumivo/build.release/contracts/enumivo.bios/
```

### Initialize the accounts txn_test_gen_plugin uses
Expand Down
4 changes: 2 additions & 2 deletions programs/debug_node/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* @file
* @copyright defined in enumivo/LICENSE.txt
*/
#include <eos/app/application.hpp>
#include <enumivo/app/application.hpp>

#include <eos/debug_producer/debug_producer.hpp>
#include <enumivo/debug_producer/debug_producer.hpp>

#include <fc/exception/exception.hpp>
#include <fc/thread/thread.hpp>
Expand Down
8 changes: 4 additions & 4 deletions programs/enucli/eosc.pot
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ msgstr ""
msgid "the port where eosd is running"
msgstr ""

msgid "the host where eos-walletd is running"
msgid "the host where enu-walletd is running"
msgstr ""

msgid "the port where eos-walletd is running"
msgid "the port where enu-walletd is running"
msgstr ""

msgid "output verbose messages on error"
Expand Down Expand Up @@ -496,10 +496,10 @@ msgstr ""
msgid "The JSON array of the transactions to push"
msgstr ""

msgid "Failed to connect to eosd at ${ip}:${port}; is eosd running?"
msgid "Failed to connect to enu at ${ip}:${port}; is eosd running?"
msgstr ""

msgid "Failed to connect to eos-walletd at ${ip}:${port}; is eos-walletd running?"
msgid "Failed to connect to enu-walletd at ${ip}:${port}; is enu-walletd running?"
msgstr ""

msgid "Failed to connect"
Expand Down
2 changes: 1 addition & 1 deletion programs/enucli/help_text.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ const std::map<int64_t, std::string> error_advice = {
namespace enumivo { namespace client { namespace help {

bool print_recognized_errors(const fc::exception& e, const bool verbose_errors) {
// eos recognized error code is from 3000000
// enu recognized error code is from 3000000
// refer to libraries/chain/include/enumivo/chain/exceptions.hpp
if (e.code() >= chain_exception::code_value) {
std::string advice, explanation, stack_trace;
Expand Down
2 changes: 1 addition & 1 deletion scripts/enumivo_tn_roll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if [ \( -z "$prog" \) -o \( -z "$RD" \) ]; then
exit 1
fi

SDIR=staging/eos
SDIR=staging/enu
if [ ! -e $SDIR/$RD/$prog ]; then
echo $SDIR/$RD/$prog does not exist
exit 1
Expand Down
4 changes: 2 additions & 2 deletions tests/consensus-validation-malicious-producers.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def myTest(transWillEnterBlock):
delay=0
Print("Stand up cluster")
if cluster.launch(pnodes, total_nodes, topo, delay) is False:
error("Failed to stand up eos cluster.")
error("Failed to stand up enu cluster.")
return False

accounts=testUtils.Cluster.createAccountKeys(1)
Expand All @@ -263,7 +263,7 @@ def myTest(transWillEnterBlock):

Print("Stand up walletd")
if walletMgr.launch() is False:
error("Failed to stand up eos walletd.")
error("Failed to stand up enu walletd.")
return False

testWalletName="test"
Expand Down
2 changes: 1 addition & 1 deletion tests/distributed-transactions-remote-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def errorExit(msg="", errorCode=1):
(pnodes, total_nodes-pnodes, topo, delay))
Print("Stand up cluster")
if cluster.launch(pnodes, total_nodes, prodCount, topo, delay) is False:
errorExit("Failed to stand up eos cluster.")
errorExit("Failed to stand up enu cluster.")

Print ("Wait for Cluster stabilization")
# wait for cluster to start producing blocks
Expand Down
2 changes: 1 addition & 1 deletion tests/distributed-transactions-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def errorExit(msg="", errorCode=1):

Print("Stand up cluster")
if cluster.launch(pnodes, total_nodes, topo=topo, delay=delay) is False:
errorExit("Failed to stand up eos cluster.")
errorExit("Failed to stand up enu cluster.")

#exit(0)
Print ("Wait for Cluster stabilization")
Expand Down
2 changes: 1 addition & 1 deletion tests/enunode_run_remote_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def errorExit(msg="", errorCode=1):
(pnodes, total_nodes-pnodes, topo, delay))
Print("Stand up cluster")
if cluster.launch(pnodes, total_nodes, prodCount, topo, delay, onlyBios=onlyBios, dontKill=dontKill) is False:
errorExit("Failed to stand up eos cluster.")
errorExit("Failed to stand up enu cluster.")

Print ("Wait for Cluster stabilization")
# wait for cluster to start producing blocks
Expand Down
8 changes: 4 additions & 4 deletions tests/enunode_run_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def cmdError(name, cmdCode=0, exitNow=False):
Print("Stand up cluster")
if cluster.launch(prodCount=prodCount, onlyBios=onlyBios, dontKill=dontKill) is False:
cmdError("launcher")
errorExit("Failed to stand up eos cluster.")
errorExit("Failed to stand up enu cluster.")
else:
cluster.initializeNodes(defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey)
killEnuInstances=False
Expand Down Expand Up @@ -132,13 +132,13 @@ def cmdError(name, cmdCode=0, exitNow=False):
walletMgr.cleanup()
if walletMgr.launch() is False:
cmdError("%s" % (WalletdName))
errorExit("Failed to stand up eos walletd.")
errorExit("Failed to stand up enu walletd.")

testWalletName="test"
Print("Creating wallet \"%s\"." % (testWalletName))
testWallet=walletMgr.create(testWalletName)
if testWallet is None:
cmdError("eos wallet create")
cmdError("enu wallet create")
errorExit("Failed to create wallet %s." % (testWalletName))

Print("Wallet \"%s\" password=%s." % (testWalletName, testWallet.password.encode("utf-8")))
Expand All @@ -153,7 +153,7 @@ def cmdError(name, cmdCode=0, exitNow=False):
Print("Creating wallet \"%s\"." % (defproduceraWalletName))
defproduceraWallet=walletMgr.create(defproduceraWalletName)
if defproduceraWallet is None:
cmdError("eos wallet create")
cmdError("enu wallet create")
errorExit("Failed to create wallet %s." % (defproduceraWalletName))

defproduceraAccount=cluster.defproduceraAccount
Expand Down
8 changes: 4 additions & 4 deletions tests/nodeos_run_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def cmdError(name, cmdCode=0, exitNow=False):
Print("Stand up cluster")
if cluster.launch(prodCount=prodCount, onlyBios=onlyBios, dontKill=dontKill) is False:
cmdError("launcher")
errorExit("Failed to stand up eos cluster.")
errorExit("Failed to stand up enu cluster.")
else:
cluster.initializeNodes(defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey)
killEnuInstances=False
Expand Down Expand Up @@ -129,13 +129,13 @@ def cmdError(name, cmdCode=0, exitNow=False):
walletMgr.cleanup()
if walletMgr.launch() is False:
cmdError("%s" % (WalletdName))
errorExit("Failed to stand up eos walletd.")
errorExit("Failed to stand up enu walletd.")

testWalletName="test"
Print("Creating wallet \"%s\"." % (testWalletName))
testWallet=walletMgr.create(testWalletName)
if testWallet is None:
cmdError("eos wallet create")
cmdError("enu wallet create")
errorExit("Failed to create wallet %s." % (testWalletName))

Print("Wallet \"%s\" password=%s." % (testWalletName, testWallet.password.encode("utf-8")))
Expand All @@ -150,7 +150,7 @@ def cmdError(name, cmdCode=0, exitNow=False):
Print("Creating wallet \"%s\"." % (defproduceraWalletName))
defproduceraWallet=walletMgr.create(defproduceraWalletName)
if defproduceraWallet is None:
cmdError("eos wallet create")
cmdError("enu wallet create")
errorExit("Failed to create wallet %s." % (defproduceraWalletName))

defproduceraAccount=cluster.defproduceraAccount
Expand Down
6 changes: 3 additions & 3 deletions tests/p2p_network_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@
print("Stand up walletd")
if walletMgr.launch() is False:
cmdError("%s" % (WalletdName))
errorExit("Failed to stand up eos walletd.")
errorExit("Failed to stand up enu walletd.")

testWalletName="test"
Print("Creating wallet \"%s\"." % (testWalletName))
testWallet=walletMgr.create(testWalletName)
if testWallet is None:
cmdError("eos wallet create")
cmdError("enu wallet create")
errorExit("Failed to create wallet %s." % (testWalletName))

for account in accounts:
Expand All @@ -129,7 +129,7 @@
Print("Creating wallet \"%s\"." % (defproduceraWalletName))
defproduceraWallet=walletMgr.create(defproduceraWalletName)
if defproduceraWallet is None:
cmdError("eos wallet create")
cmdError("enu wallet create")
errorExit("Failed to create wallet %s." % (defproduceraWalletName))

defproduceraAccount=testUtils.Cluster.defproduceraAccount
Expand Down
2 changes: 1 addition & 1 deletion tests/restart-scenarios-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def errorExit(msg="", errorCode=1):

Print("Stand up cluster")
if cluster.launch(pnodes, total_nodes, topo=topo, delay=delay) is False:
errorExit("Failed to stand up eos cluster.")
errorExit("Failed to stand up enu cluster.")

Print ("Wait for Cluster stabilization")
# wait for cluster to start producing blocks
Expand Down
Loading

0 comments on commit 2016646

Please sign in to comment.