Merge pull request EOSIO#132 from enumivo/staging

rename eos

Docker/docker-compose.yml

@@ -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:

circle.yml

@@ -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

contracts/bancor/bancor.hpp

@@ -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>

contracts/dice/README.md

@@ -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
 ````
 

contracts/enumivolib/action.h

@@ -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": {

contracts/enumivolib/transaction.hpp

@@ -86,4 +86,4 @@ namespace enumivo {
 
    ///@} transactioncpp api
 
-} // namespace eos
+} // namespace enumivo

contracts/social/social.cpp

@@ -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

contracts/stltest/stltest.cpp

@@ -135,7 +135,7 @@
 #include <string>
 #include <stdexcept>
 */
-//include <enumivolib/eos.hpp>
+//include <enumivolib/enumivo.hpp>
 #include <enumivolib/dispatcher.hpp>
 
 using namespace enumivo;

libraries/chain/include/enumivo/chain/abi_def.hpp

@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in enumivo/LICENSE.txt
  */
 #pragma once
 

libraries/chain/include/enumivo/chain/unconfirmed_block_object.hpp

@@ -1,7 +1,7 @@
 
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in enumivo/LICENSE.txt
  */
 #pragma once
 #include <enumivo/chain/types.hpp>

libraries/chain/wasm_interface.cpp

@@ -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:

libraries/utilities/git_revision.cpp.in

@@ -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@

libraries/utilities/tempdir.cpp

@@ -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

plugins/txn_test_gen_plugin/README.md

@@ -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": [{
@@ -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

programs/debug_node/main.cpp

@@ -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>

programs/enucli/eosc.pot

@@ -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"
@@ -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"

programs/enucli/help_text.cpp

@@ -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;

scripts/enumivo_tn_roll.sh

@@ -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

tests/consensus-validation-malicious-producers.py

@@ -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)
@@ -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"

tests/distributed-transactions-remote-test.py

@@ -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

tests/distributed-transactions-test.py

@@ -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")

tests/enunode_run_remote_test.py

@@ -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

tests/enunode_run_test.py

@@ -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
@@ -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")))
@@ -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

tests/nodeos_run_test.py

@@ -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
@@ -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")))
@@ -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

tests/p2p_network_test.py

@@ -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:
@@ -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

tests/restart-scenarios-test.py

@@ -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