changed testnet ports

BeamMW · Feb 13, 2019 · 7353f1b · 7353f1b
1 parent 4ddf45e
commit 7353f1b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -250,21 +250,21 @@ after_success:
   # deploy using ftp server
   - BUILDS_SERVER_PATH=${BUILD_SERVER}/files/$TRAVIS_BRANCH/$(date +%Y.%m.%d)/$BUILD_TYPE/$OS_FOLDER
   - tar -cvzf beam-node-testnet-$BEAM_VERSION.tar.gz --directory=$HOME/build/BeamMW/beam/beam beam-node-testnet beam-node.cfg
-  - tar -cvzf beam-wallet-testnet-cli-$BEAM_VERSION.tar.gz --directory=$HOME/build/BeamMW/beam/wallet beam-wallet-testnet beam-wallet.cfg
+  - tar -cvzf beam-wallet-cli-testnet-$BEAM_VERSION.tar.gz --directory=$HOME/build/BeamMW/beam/wallet beam-wallet-testnet beam-wallet.cfg
   - tar -cvzf wallet-api-testnet-$BEAM_VERSION.tar.gz --directory=$HOME/build/BeamMW/beam/wallet wallet-api-testnet wallet-api.cfg
 
   # prep for deploy to AWS S3
   - cp $HOME/build/BeamMW/beam/$BEAM_WALLET_UI_IN $HOME/build/BeamMW/beam/$BEAM_WALLET_UI_OUT
 
   # upload binaries to FTP
   - curl --retry 3 --ftp-create-dirs -T beam-node-testnet-$BEAM_VERSION.tar.gz $BUILDS_SERVER_PATH/
-  - curl --retry 3 --ftp-create-dirs -T beam-wallet-testnet-cli-$BEAM_VERSION.tar.gz $BUILDS_SERVER_PATH/
+  - curl --retry 3 --ftp-create-dirs -T beam-wallet-cli-testnet-$BEAM_VERSION.tar.gz $BUILDS_SERVER_PATH/
   - curl --retry 3 --ftp-create-dirs -T wallet-api-testnet-$BEAM_VERSION.tar.gz $BUILDS_SERVER_PATH/
   - curl --retry 3 --ftp-create-dirs -T "$HOME/build/BeamMW/beam/$BEAM_WALLET_UI_IN" "$BUILDS_SERVER_PATH/$BEAM_WALLET_UI_OUT"
 
   # upload binaries to S3
   - artifacts upload --target-paths "$TRAVIS_BRANCH/$(date +%Y.%m.%d)/$BUILD_TYPE/$OS_FOLDER/" beam-node-testnet-$BEAM_VERSION.tar.gz
-  - artifacts upload --target-paths "$TRAVIS_BRANCH/$(date +%Y.%m.%d)/$BUILD_TYPE/$OS_FOLDER/" beam-wallet-testnet-cli-$BEAM_VERSION.tar.gz
+  - artifacts upload --target-paths "$TRAVIS_BRANCH/$(date +%Y.%m.%d)/$BUILD_TYPE/$OS_FOLDER/" beam-wallet-cli-testnet-$BEAM_VERSION.tar.gz
   - artifacts upload --target-paths "$TRAVIS_BRANCH/$(date +%Y.%m.%d)/$BUILD_TYPE/$OS_FOLDER/" wallet-api-testnet-$BEAM_VERSION.tar.gz
   - artifacts upload --target-paths "$TRAVIS_BRANCH/$(date +%Y.%m.%d)/$BUILD_TYPE/$OS_FOLDER/" $HOME/build/BeamMW/beam/$BEAM_WALLET_UI_OUT
 

diff --git a/beam/beam-node.cfg b/beam/beam-node.cfg
@@ -3,7 +3,7 @@
 ################################################################################
 
 # port to start server on
-# port=10000
+# port=11000
 
 # log level [info|debug|verbose]
 # log_level=debug

diff --git a/ui/model/settings.cpp b/ui/model/settings.cpp
@@ -128,7 +128,7 @@ uint WalletSettings::getLocalNodePort() const
 {
     Lock lock(m_mutex);
 #ifdef BEAM_TESTNET
-    return m_data.value(LocalNodePort, 10006).toUInt();
+    return m_data.value(LocalNodePort, 11005).toUInt();
 #else
     return m_data.value(LocalNodePort, 10005).toUInt();
 #endif // BEAM_TESTNET

diff --git a/ui/viewmodel/start_view.cpp b/ui/viewmodel/start_view.cpp
@@ -533,7 +533,7 @@ QString StartViewModel::selectCustomWalletDB()
 QString StartViewModel::defaultPortToListen() const
 {
 #ifdef BEAM_TESTNET
-    return "10006";
+    return "11005";
 #else
     return "10005";
 #endif  // BEAM_TESTNET
@@ -542,7 +542,7 @@ QString StartViewModel::defaultPortToListen() const
 QString StartViewModel::defaultRemoteNodeAddr() const
 {
 #ifdef BEAM_TESTNET
-    return "127.0.0.1:10006";
+    return "127.0.0.1:11005";
 #else
     return "127.0.0.1:10005";
 #endif // BEAM_TESTNET

diff --git a/utility/options.cpp b/utility/options.cpp
@@ -147,7 +147,7 @@ namespace beam
 
         po::options_description node_options("Node options");
         node_options.add_options()
-            (cli::PORT_FULL, po::value<uint16_t>()->default_value(10000), "port to start the server on")
+            (cli::PORT_FULL, po::value<uint16_t>()->default_value(11000), "port to start the server on")
             (cli::STORAGE, po::value<string>()->default_value("node.db"), "node storage path")
             (cli::HISTORY, po::value<string>()->default_value(szLocalDir), "directory for compressed history")
             (cli::TEMP, po::value<string>()->default_value(szTempDir), "temp directory for compressed history, must be on the same volume")

diff --git a/wallet/beam-wallet.cfg b/wallet/beam-wallet.cfg
@@ -2,9 +2,6 @@
 # General options:
 ################################################################################
 
-# port to start server on
-# port=10000
-
 # log level [info|debug|verbose]
 # log_level=debug