Merge pull request EOSIO#5 from worldwide-asset-exchange/KEW-1316/Ren…

…ame-all-eosio-to-wax [KEW-1316] Renaming eosio with wax.
eos-amsterdam-rnd · Jun 25, 2019 · 3056a5a · 3056a5a
2 parents a5eaaee + fc1183f
commit 3056a5a
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 79 deletions.
diff --git a/.buildkite/debug.yml b/.buildkite/debug.yml
@@ -3,7 +3,7 @@ steps:
       echo "--- Creating symbolic link to job directory :file_folder:" && \
       sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
       echo "+++ Building :hammer:" && \
-      echo 1 | ./eosio_build.sh -o Debug && \
+      echo 1 | ./wax_build.sh -o Debug && \
       echo "--- Compressing build directory :compression:" && \
       tar -pczf build.tar.gz build/
     label: ":darwin: Build"
@@ -14,7 +14,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
+        echo 1 | ./wax_build.sh -o Debug && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":ubuntu: Build"
@@ -29,7 +29,7 @@ steps:
     
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
+        echo 1 | ./wax_build.sh -o Debug && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":ubuntu: 18.04 Build"
@@ -44,7 +44,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
+        echo 1 | ./wax_build.sh -o Debug && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":fedora: Build"
@@ -59,7 +59,7 @@ steps:
  
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
+        echo 1 | ./wax_build.sh -o Debug && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":centos: Build"
@@ -74,7 +74,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
+        echo 1 | ./wax_build.sh -o Debug && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":aws: Build"

diff --git a/.buildkite/long_running_tests.yml b/.buildkite/long_running_tests.yml
@@ -3,7 +3,7 @@ steps:
       echo "--- Creating symbolic link to job directory :file_folder:" && \
       sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
       echo "+++ Building :hammer:" && \
-      echo 1 | ./eosio_build.sh && \
+      echo 1 | ./wax_build.sh && \
       echo "--- Compressing build directory :compression:" && \
       tar -pczf build.tar.gz build/
     label: ":darwin: Build"
@@ -14,7 +14,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":ubuntu: Build"
@@ -29,7 +29,7 @@ steps:
     
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":ubuntu: 18.04 Build"
@@ -44,7 +44,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":fedora: Build"
@@ -59,7 +59,7 @@ steps:
  
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":centos: Build"
@@ -74,7 +74,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":aws: Build"

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -3,7 +3,7 @@ steps:
       echo "--- Creating symbolic link to job directory :file_folder:" && \
       sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
       echo "+++ Building :hammer:" && \
-      echo 1 | ./eosio_build.sh && \
+      echo 1 | ./wax_build.sh && \
       echo "--- Compressing build directory :compression:" && \
       tar -pczf build.tar.gz build/
     label: ":darwin: High Sierra Build"
@@ -16,7 +16,7 @@ steps:
       echo "--- Creating symbolic link to job directory :file_folder:" && \
       sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
       echo "+++ Building :hammer:" && \
-      echo 1 | ./eosio_build.sh && \
+      echo 1 | ./wax_build.sh && \
       echo "--- Compressing build directory :compression:" && \
       tar -pczf build.tar.gz build/
     label: ":darwin: Mojave Build"
@@ -28,7 +28,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":ubuntu: Build"
@@ -43,7 +43,7 @@ steps:
     
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":ubuntu: 18.04 Build"
@@ -58,7 +58,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":fedora: Build"
@@ -73,7 +73,7 @@ steps:
  
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":centos: Build"
@@ -88,7 +88,7 @@ steps:
 
   - command: |
         echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh && \
+        echo 1 | ./wax_build.sh && \
         echo "--- :compression: Compressing build directory" && \
         tar -pczf build.tar.gz build/
     label: ":aws: Build"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Pending (wax-1.6.1-X.Y.Z)
 
 BREAKING CHANGES:
+- [KEW-1316] Renaming EOSIO with WAX.
 
 FEATURES:
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -244,8 +244,8 @@ install_directory_permissions(DIRECTORY ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio)
 install_directory_permissions(DIRECTORY ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio/launcher)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testnet.template ${CMAKE_CURRENT_BINARY_DIR}/etc/eosio/launcher/testnet.template COPYONLY)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosio.version.in ${CMAKE_CURRENT_BINARY_DIR}/eosio.version.hpp)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eosio.version.hpp DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/wax.version.in ${CMAKE_CURRENT_BINARY_DIR}/wax.version.hpp)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wax.version.hpp DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 
 set(EOS_ROOT_DIR ${CMAKE_BINARY_DIR})
 configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/eosio-config.cmake.in ${CMAKE_BINARY_DIR}/lib/cmake/eosio/eosio-config.cmake @ONLY)

diff --git a/README.md b/README.md
@@ -19,15 +19,15 @@ WAX is released under the open source MIT license and is offered “AS IS” wit
 
 There is no public testnet running currently.
 ### Installation Instructions
-If you have previously installed wax-blockchain, please run the eosio_uninstall script (it is in the directory where you cloned wax-blockchain). Currently, we are not providing pre-compiled packages. Therefore, you will have to compile the source code and install it with the following instructions:
+If you have previously installed wax-blockchain, please run the wax_uninstall script (it is in the directory where you cloned wax-blockchain). Currently, we are not providing pre-compiled packages. Therefore, you will have to compile the source code and install it with the following instructions:
 
 ```console
 
 $ git clone https://github.com/worldwide-asset-exchange/wax-blockchain.git
 $ cd wax-blockchain
 $ git submodule update --init --recursive
-$ ./eosio_compile.sh
-$ sudo ./eosio_install.sh
+$ ./wax_compile.sh
+$ sudo ./wax_install.sh
 ```
 
 ### Supported Operating Systems

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
@@ -1717,7 +1717,7 @@ launcher_def::bounce (const string& node_numbers) {
       const eosd_def& node = node_pair.second;
       const string node_num = node.get_node_num();
       cout << "Bouncing " << node.name << endl;
-      string cmd = "./scripts/eosio-tn_bounce.sh " + eosd_extra_args;
+      string cmd = "./scripts/wax-tn_bounce.sh " + eosd_extra_args;
       if (node_num != "bios" && !specific_nodeos_args.empty()) {
          const auto node_num_i = boost::lexical_cast<uint16_t,string>(node_num);
          if (specific_nodeos_args.count(node_num_i)) {
@@ -1737,7 +1737,7 @@ launcher_def::down (const string& node_numbers) {
       const eosd_def& node = node_pair.second;
       const string node_num = node.get_node_num();
       cout << "Taking down " << node.name << endl;
-      string cmd = "./scripts/eosio-tn_down.sh ";
+      string cmd = "./scripts/wax-tn_down.sh ";
       do_command(host, node.name,
                  { { "EOSIO_HOME", host.eosio_home }, { "EOSIO_NODE", node_num }, { "EOSIO_TN_RESTART_CONFIG_DIR", node.config_dir_name } },
                  cmd);
@@ -1902,8 +1902,8 @@ int main (int argc, char *argv[]) {
     ("launch,l",bpo::value<string>(), "select a subset of nodes to launch. Currently may be \"all\", \"none\", or \"local\". If not set, the default is to launch all unless an output file is named, in which case it starts none.")
     ("output,o",bpo::value<bfs::path>(&top.output),"save a copy of the generated topology in this file")
     ("kill,k", bpo::value<string>(&kill_arg),"The launcher retrieves the previously started process ids and issues a kill to each.")
-    ("down", bpo::value<string>(&down_nodes),"comma-separated list of node numbers that will be taken down using the eosio-tn_down.sh script")
-    ("bounce", bpo::value<string>(&bounce_nodes),"comma-separated list of node numbers that will be restarted using the eosio-tn_bounce.sh script")
+    ("down", bpo::value<string>(&down_nodes),"comma-separated list of node numbers that will be taken down using the wax-tn_down.sh script")
+    ("bounce", bpo::value<string>(&bounce_nodes),"comma-separated list of node numbers that will be restarted using the wax-tn_bounce.sh script")
     ("roll", bpo::value<string>(&roll_nodes),"comma-separated list of host names where the nodes should be rolled to a new version using the eosio-tn_roll.sh script")
     ("version,v", "print version information")
     ("help,h","print this list")

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-configure_file(eosio-tn_bounce.sh eosio-tn_bounce.sh COPYONLY)
-configure_file(eosio-tn_down.sh eosio-tn_down.sh COPYONLY)
-configure_file(eosio-tn_roll.sh eosio-tn_roll.sh COPYONLY)
-configure_file(eosio-tn_up.sh eosio-tn_up.sh COPYONLY)
+configure_file(wax-tn_bounce.sh wax-tn_bounce.sh COPYONLY)
+configure_file(wax-tn_down.sh wax-tn_down.sh COPYONLY)
+configure_file(wax-tn_roll.sh wax-tn_roll.sh COPYONLY)
+configure_file(wax-tn_up.sh wax-tn_up.sh COPYONLY)
 configure_file(abi_is_json.py abi_is_json.py COPYONLY)
diff --git a/scripts/eosio-tn_bounce.sh → scripts/wax-tn_bounce.sh b/scripts/eosio-tn_bounce.sh → scripts/wax-tn_bounce.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 #
-# eosio-tn_bounce is used to restart a node that is acting badly or is down.
-# usage: eosio-tn_bounce.sh [arglist]
+# wax-tn_bounce is used to restart a node that is acting badly or is down.
+# usage: wax-tn_bounce.sh [arglist]
 # arglist will be passed to the node's command line. First with no modifiers
 # then with --hard-replay-blockchain and then a third time with --delete-all-blocks
 #
 # the data directory and log file are set by this script. Do not pass them on
 # the command line.
 #
-# in most cases, simply running ./eosio-tn_bounce.sh is sufficient.
+# in most cases, simply running ./wax-tn_bounce.sh is sufficient.
 #
 
 pushd $EOSIO_HOME
@@ -40,5 +40,5 @@ else
     fi
 fi
 
-bash $EOSIO_HOME/scripts/eosio-tn_down.sh
-bash $EOSIO_HOME/scripts/eosio-tn_up.sh "$*"
+bash $EOSIO_HOME/scripts/wax-tn_down.sh
+bash $EOSIO_HOME/scripts/wax-tn_up.sh "$*"
diff --git a/scripts/eosio-tn_down.sh → scripts/wax-tn_down.sh b/scripts/eosio-tn_down.sh → scripts/wax-tn_down.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# eosio-tn_down.sh is used by the eosio-tn_bounce.sh and eosio-tn_roll.sh scripts.
+# wax-tn_down.sh is used by the wax-tn_bounce.sh and eosio-tn_roll.sh scripts.
 # It is intended to terminate specific EOS.IO daemon processes.
 #
 

diff --git a/scripts/eosio-tn_roll.sh → scripts/wax-tn_roll.sh b/scripts/eosio-tn_roll.sh → scripts/wax-tn_roll.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 #
-# eosio-tn_roll is used to have all of the instances of the EOS daemon on a host brought down
+# wax-tn_roll is used to have all of the instances of the EOS daemon on a host brought down
 # so that the underlying executable image file (the "text file") can be replaced. Then
 # all instances are restarted.
-# usage: eosio-tn_roll.sh [arglist]
+# usage: wax-tn_roll.sh [arglist]
 # arglist will be passed to the node's command line. First with no modifiers
 # then with --hard-replay-blockchain and then a third time with --delete-all-blocks
 #
 # The data directory and log file are set by this script. Do not pass them on
 # the command line.
 #
-# In most cases, simply running ./eosio-tn_roll.sh is sufficient.
+# In most cases, simply running ./wax-tn_roll.sh is sufficient.
 #
 
 if [ -z "$EOSIO_HOME" ]; then
@@ -76,16 +76,16 @@ fi
 
 echo DD = $DD
 
-bash $EOSIO_HOME/scripts/eosio-tn_down.sh
+bash $EOSIO_HOME/scripts/wax-tn_down.sh
 
 cp $SDIR/$RD/$prog $RD/$prog
 
 if [ $DD = "all" ]; then
     for EOSIO_RESTART_DATA_DIR in `ls -d var/lib/node_??`; do
-        bash $EOSIO_HOME/scripts/eosio-tn_up.sh "$*"
+        bash $EOSIO_HOME/scripts/wax-tn_up.sh "$*"
     done
 else
-    bash $EOSIO_HOME/scripts/eosio-tn_up.sh "$*"
+    bash $EOSIO_HOME/scripts/wax-tn_up.sh "$*"
 fi
 unset EOSIO_RESTART_DATA_DIR
 

diff --git a/scripts/eosio-tn_up.sh → scripts/wax-tn_up.sh b/scripts/eosio-tn_up.sh → scripts/wax-tn_up.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# eosio-tn_up is a helper script used to start a node that was previously stopped.
+# wax-tn_up is a helper script used to start a node that was previously stopped.
 # It is not intended to be run stand-alone; it is a companion to the
-# eosio-tn_bounce.sh and eosio-tn_roll.sh scripts.
+# wax-tn_bounce.sh and wax-tn_roll.sh scripts.
 
 connected="0"
 

diff --git a/scripts/eosio_build_amazon.sh → scripts/wax_build_amazon.sh b/scripts/eosio_build_amazon.sh → scripts/wax_build_amazon.sh
diff --git a/scripts/eosio_build_centos.sh → scripts/wax_build_centos.sh b/scripts/eosio_build_centos.sh → scripts/wax_build_centos.sh
diff --git a/scripts/eosio_build_darwin.sh → scripts/wax_build_darwin.sh b/scripts/eosio_build_darwin.sh → scripts/wax_build_darwin.sh
@@ -121,7 +121,7 @@
 		DISPLAY="${DISPLAY}${COUNT}. ${name}\\n\\t"
 		printf "\\t\\t %s ${bldred}NOT${txtrst} found.\\n" "${name}"
 		(( COUNT++ ))
-	done < "${SOURCE_DIR}/scripts/eosio_build_dep"
+	done < "${SOURCE_DIR}/scripts/wax_build_dep"
 	IFS="${var_ifs}"
 
 	printf "\\tChecking Python3 ... "

diff --git a/scripts/eosio_build_dep → scripts/wax_build_dep b/scripts/eosio_build_dep → scripts/wax_build_dep
diff --git a/scripts/eosio_build_fedora.sh → scripts/wax_build_fedora.sh b/scripts/eosio_build_fedora.sh → scripts/wax_build_fedora.sh
diff --git a/scripts/eosio_build_ubuntu.sh → scripts/wax_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh → scripts/wax_build_ubuntu.sh
diff --git a/eosio.version.in → wax.version.in b/eosio.version.in → wax.version.in