remove non-indy brands (INDY-829) (#381)

* removed sovrin/evernym brands from dockerfiles * updated README * restored absolute URLs to wiki * adjusted pool genesis transactions * Adjusted/Removed places where non-indy brands were used * updated comments * temporarily switched to customr Jenkins shared lib * Revert "temporarily switched to customr Jenkins shared lib" This reverts commit acedc40. * replaced bas folder .sovrin with .indy
hyperledger · Sep 18, 2017 · 9f80224 · 9f80224
1 parent bb6f4d1
commit 9f80224
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 39 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,6 @@
 #!groovy
 
+// TODO remove after shared libs refactoring
 @Library('SovrinHelpers') _
 
 def name = 'indy-plenum'

diff --git a/README.md b/README.md
@@ -21,10 +21,10 @@ Plenum.
 ### Installing Plenum
 
 ```
-pip install plenum
+pip install indy-plenum
 ```
 
-From here, you can play with the command-line interface (see the [tutorial](https://github.com/evernym/plenum/wiki))...
+From here, you can play with the command-line interface (see the [tutorial](https://github.com/hyperledger/indy-plenum/wiki))...
 
 Note: For Windows, we recommended using either [cmder](http://cmder.net/) or [conemu](https://conemu.github.io/).
 
@@ -35,12 +35,12 @@ plenum
 ...or run the tests.
 
 ```
-git clone https://github.com/evernym/plenum.git
-cd plenum
+git clone https://github.com/hyperledger/indy-plenum.git
+cd indy-plenum
 python -m plenum.test
 ```
 
-**Details about the protocol, including a great tutorial, can be found on the [wiki](https://github.com/evernym/plenum/wiki).**
+**Details about the protocol, including a great tutorial, can be found on the [wiki](https://github.com/hyperledger/indy-plenum/wiki).**
 
 ### Installing python 3.5 and libsodium:
 

diff --git a/ci/ubuntu.dockerfile b/ci/ubuntu.dockerfile
@@ -2,10 +2,10 @@
 FROM ubuntu:16.04
 
 ARG uid=1000
+ARG user=indy
 
 # Install environment
-RUN apt-get update -y
-RUN apt-get install -y \ 
+RUN apt-get update -y && apt-get install -y \
 	git \
 	wget \
 	python3.5 \
@@ -16,13 +16,13 @@ RUN pip3 install -U \
 	pip \ 
 	setuptools \
 	virtualenv
-RUN useradd -ms /bin/bash -u $uid sovrin
-USER sovrin
-RUN virtualenv -p python3.5 /home/sovrin/test
+RUN useradd -ms /bin/bash -u $uid $user
+USER $user
+RUN virtualenv -p python3.5 /home/$user/test
 USER root
-RUN ln -sf /home/sovrin/test/bin/python /usr/local/bin/python
-RUN ln -sf /home/sovrin/test/bin/pip /usr/local/bin/pip
-USER sovrin
+RUN ln -sf /home/$user/test/bin/python /usr/local/bin/python
+RUN ln -sf /home/$user/test/bin/pip /usr/local/bin/pip
+USER $user
 # TODO: Automate dependency collection
 RUN pip install jsonpickle \
 	ujson \
@@ -46,4 +46,4 @@ RUN pip install jsonpickle \
 	psutil \
 	intervaltree \
 	pytest-xdist
-WORKDIR /home/sovrin
+WORKDIR /home/$user
diff --git a/ci/windows.dockerfile b/ci/windows.dockerfile
@@ -1,6 +1,6 @@
 FROM microsoft/windowsservercore
 
-LABEL Description="plenum" Vendor="Evernym"
+LABEL Description="indy-plenum" Vendor="Hyperledger"
 
 # Install environment
 

diff --git a/data/pool_transactions_sandbox_genesis b/data/pool_transactions_sandbox_genesis
@@ -1,4 +1,4 @@
-{"dest":"3StSG7YV2Em2Wejf9dA1dNZ9BtZLiUUdm3yJgCS4M8eK","data":{"services":["VALIDATOR"],"client_port":9722,"node_ip":"52.33.22.91","alias":"EvernymV1","client_ip":"52.33.22.91","node_port":9721},"type":"0","txnId":"d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35","identifier":"5rArie7XKukPCaEwq5XGQJnM9Fc5aZE3M9HAPVfMU2xC"}
-{"dest":"13qfUHjTDh3TdRHau93LtkLynwNJnLGoRGh9HQxHuiLs","data":{"services":["VALIDATOR"],"client_port":9724,"node_ip":"52.38.24.189","alias":"EvernymV2","client_ip":"52.38.24.189","node_port":9723},"type":"0","txnId":"4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce","identifier":"2btLJAAb1S3x6hZYdVyAePjqtQYi2ZBSRGy4569RZu8h"}
+{"dest":"3StSG7YV2Em2Wejf9dA1dNZ9BtZLiUUdm3yJgCS4M8eK","data":{"services":["VALIDATOR"],"client_port":9722,"node_ip":"52.33.22.91","alias":"IndyV1","client_ip":"52.33.22.91","node_port":9721},"type":"0","txnId":"d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35","identifier":"5rArie7XKukPCaEwq5XGQJnM9Fc5aZE3M9HAPVfMU2xC"}
+{"dest":"13qfUHjTDh3TdRHau93LtkLynwNJnLGoRGh9HQxHuiLs","data":{"services":["VALIDATOR"],"client_port":9724,"node_ip":"52.38.24.189","alias":"IndyV2","client_ip":"52.38.24.189","node_port":9723},"type":"0","txnId":"4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce","identifier":"2btLJAAb1S3x6hZYdVyAePjqtQYi2ZBSRGy4569RZu8h"}
 {"dest":"BkJAXQsFYsHtqgbMUYSVQ8n3okRvyPfozwWcn4gV538Z","data":{"services":["VALIDATOR"],"client_port":9730,"node_ip":"34.200.79.65","alias":"RespectNetwork","client_ip":"34.200.79.65","node_port":9729},"type":"0","txnId":"ef2d127de37b942baad06145e54b0c619a1f22327b2ebbcfbec78f5564afe39e","identifier":"4AdS22kC7xzb4bcqg9JATuCfAMNcQYcZa1u5eWzs6cSJ"}
 {"dest":"DNJdyetPD8B6Xsr58PKHynBtEWE2NrMAdnxSMdtgbFER","data":{"services":["VALIDATOR"],"client_port":9747,"node_ip":"52.56.74.57","alias":"BULLDOG","client_ip":"52.56.74.57","node_port":9746},"type":"0","txnId":"ef2d127de37b942baad06145e54b0c619a1f22327b2ebbcfbec78f5564afe3A2","identifier":"6hbecbh36EMK6yAi5NZ9bLZEuRsWFt6qLa2SyMQGXs7H"}
diff --git a/plenum/cli/cli.py b/plenum/cli/cli.py
@@ -106,7 +106,6 @@ class Cli:
     name = 'plenum'
     properName = 'Plenum'
     fullName = 'Plenum protocol'
-    githubUrl = 'https://github.com/evernym/plenum'
 
     NodeClass = Node
     ClientClass = Client
@@ -901,11 +900,11 @@ def isOkToRunNodeDependentCommands(self):
         if not self.withNode:
             self.print("This command is only available if you start "
                        "this cli with command line argument --with-node "
-                       "(and it assumes you have installed sovrin-node "
+                       "(and it assumes you have installed indy-node "
                        "dependency)")
             return False
         if not self.NodeClass:
-            self.print("This command requires sovrin-node dependency, "
+            self.print("This command requires indy-node dependency, "
                        "please install it and then resume.")
             return False
 

diff --git a/plenum/cli/command.py b/plenum/cli/command.py
@@ -168,7 +168,7 @@ def __str__(self):
     usage="use wallet <name|absolute-wallet-file-path>",
     examples=[
         "use wallet mywallet",
-        "use wallet /home/ubuntu/.sovrin/wallets/test/mywallet.wallet"])
+        "use wallet /home/ubuntu/.indy/wallets/test/mywallet.wallet"])
 
 saveWalletCmd = Command(
     id="save wallet",

diff --git a/plenum/common/script_helper.py b/plenum/common/script_helper.py
@@ -250,7 +250,7 @@ def changeHA(looper, config, nodeName, nodeSeed, newNodeHA,
     stewardWallet = Wallet(stewardName)
     stewardWallet.addIdentifier(signer=stewardSigner)
 
-    # prepare client to submit change ha request to sovrin
+    # prepare client to submit change ha request
     _, randomClientPort = genHa()
     client = Client(stewardName,
                     ha=('0.0.0.0', randomClientPort), config=config)

diff --git a/plenum/common/util.py b/plenum/common/util.py
@@ -34,7 +34,7 @@
 from stp_core.network.exceptions import \
     InvalidEndpointIpAddress, InvalidEndpointPort
 
-# Do not remove the next import until imports in sovrin are fixed
+# TODO Do not remove the next import until imports in indy are fixed
 from stp_core.common.util import adict
 
 

diff --git a/plenum/config.py b/plenum/config.py
@@ -137,7 +137,7 @@
 
 # OPTIONS RELATED TO TESTS
 
-# todo test 60sec after https://evernym.atlassian.net/browse/SOV-995 closed
+# TODO test 60sec
 TestRunningTimeLimitSec = 100
 
 # Expected time for one stack to get connected to another

diff --git a/plenum/server/notifier_plugin_manager.py b/plenum/server/notifier_plugin_manager.py
@@ -21,7 +21,7 @@
 
 
 class PluginManager:
-    prefix = 'sovrinnotifier'
+    prefix = 'indynotifier'
     __instance = None
 
     def __new__(cls):

diff --git a/plenum/test/waits.py b/plenum/test/waits.py
@@ -74,6 +74,7 @@ def expectedPoolInterconnectionTime(nodeCount):
     # bug (`'str' object has no attribute 'keys'`) which supposed to be
     # fixed in the 3pcbatch feature
     # https://evernym.atlassian.net/browse/SOV-995
+    # TODO check actual state
     # multiply by 2 because we need to re-create connections which can be done on a second re-try only
     # (we may send pings on some of the re-tries)
     return min(0.8 * config.TestRunningTimeLimitSec,
@@ -116,12 +117,6 @@ def expectedPoolGetReadyTimeout(nodeCount):
         expectedPoolCatchupTime(nodeCount)
 
 
-def expectedPoolLedgerCheck(nodeCount):
-    # TODO this is a legacy for sovrin-node
-    # remove it and replace in the sovrin-node
-    return 5 * nodeCount
-
-
 def expectedPoolLedgerRepliedMsgPersisted(nodeCount):
     """
     From: a message is replied to client
@@ -242,6 +237,7 @@ def expectedClientToPoolConnectionTimeout(nodeCount):
     # bug (`'str' object has no attribute 'keys'`) which supposed to be
     # fixed in the 3pcbatch feature
     # https://evernym.atlassian.net/browse/SOV-995
+    # TODO check actual state
     return config.ExpectedConnectTime * nodeCount + \
         config.RETRY_TIMEOUT_RESTRICTED
 

diff --git a/scripts/filter_log b/scripts/filter_log
@@ -24,9 +24,9 @@ filter_log -i Node1.log -p MONITORING
 
 filter_log -i Node1.log -o filtered.log -l INFO
 
-filter_log -i /home/user/.sovrin/Node1.log -o /home/user/filtered.log -l DEBUG -p "VIEW CHANGE"
+filter_log -i /home/user/.indy/Node1.log -o /home/user/filtered.log -l DEBUG -p "VIEW CHANGE"
 
-filter_log --input /home/user/.sovrin/Node1.log --output /home/user/filtered.log --level DEBUG --prefix "VIEW CHANGE"
+filter_log --input /home/user/.indy/Node1.log --output /home/user/filtered.log --level DEBUG --prefix "VIEW CHANGE"
 """
 
 import argparse

diff --git a/scripts/get_keys b/scripts/get_keys
@@ -12,7 +12,7 @@ from stp_core.crypto.nacl_wrappers import Signer, Privateer
 
 
 # TODO: Abstract this functionality in a method inside plenum/common/raet.py so
-# it can be used in sovrin too. Look at how init_plenum_keys is implemented
+# it can be re-used. Look at how init_plenum_keys is implemented
 
 def breakIt(message):
     print(message)

diff --git a/scripts/log_stats b/scripts/log_stats
@@ -16,7 +16,7 @@ Examples:
 
 log_stats Node1.log
 
-log_stats /home/user/.sovrin/Node1.log /home/user/stats.txt
+log_stats /home/user/.indy/Node1.log /home/user/stats.txt
 """
 
 import argparse

diff --git a/settings/dictionary.xml b/settings/dictionary.xml
@@ -6,7 +6,7 @@
       <w>authz</w>
       <w>dirname</w>
       <w>epub</w>
-      <w>evernym</w>
+      <w>indy</w>
       <w>ioflo</w>
       <w>jsonpickle</w>
       <w>poc's</w>

diff --git a/setup.py b/setup.py
@@ -84,7 +84,7 @@
     with open(CONFIG_FILE, 'w') as f:
         msg = "# Here you can create config entries according to your " \
               "needs.\n " \
-              "# For help, refer config.py in the sovrin package.\n " \
+              "# For help, refer config.py in the plenum module.\n " \
               "# Any entry you add here would override that from config " \
               "example\n"
         f.write(msg)

diff --git a/stp_zmq/test/test_zstack.py b/stp_zmq/test/test_zstack.py
@@ -45,8 +45,9 @@ def testUnrestricted2ZStackCommunication(tdir, looper, tconf):
 
 
 def testZStackSendMethodReturnsFalseIfDestinationIsUnknown(tdir, looper, tconf):
-    """
-    Checks: https://evernym.atlassian.net/browse/SOV-971
+    """Case: stp fails on send if a remote close the socket
+
+    Checks:
     1. Connect two stacks
     2. Disconnect a remote from one side
     3. Send a message from disconnected remote