rchain-community · jimscarver · Jul 22, 2021 · Jul 21, 2021 · Jul 21, 2021 · Jul 21, 2021
diff --git a/bootstrap/deploy-all b/bootstrap/deploy-all
@@ -49,7 +49,7 @@ tail -F "$LOGFILE"|sed -e '/Making a transition to Running state./q' | sed "s/^/
 deployFiles() {
    WAITPID=""
    while read -r t;do
-      $DEPLOY "$t" &
+      $DEPLOY "$t"
       # shellcheck disable=SC2030
       WAITPID="$WAITPID $!"
    done |tee -a log/deployment.log 2>&1
@@ -68,20 +68,11 @@ if [ -f "$ERRORLOG" ]; then
    exit 2;
 fi
 
-# deploy rgov
-find \
-../Ballot.rho \
-../Group.rho \
-../CrowdFund.rho \
-../Directory.rho \
-../Inbox.rho \
-../Issue.rho \
-../Kudos.rho \
-../memberIdGovRev.rho \
-../RevIssuer.rho \
-../Echo.rho \
-./voter-insertion.rho \
-| deployFiles
+# deploy rgov core
+find ../rholang/core -name "*.rho" | deployFiles
+
+# deploy rchain voters
+echo ./voter-insertion.rho | deployFiles
 
 if [ -f "$ERRORLOG" ]; then
    echo "$ME: DeployFiles error:";
@@ -111,12 +102,13 @@ s/^/"/
 '>> ../src/MasterURI.localhost.json
 echo "}}" >> ../src/MasterURI.localhost.json
 
+# double-check the directory was created.
 echo "$ME: listing master directory"
 ./deploy listMasterURI.rho
 rnode --grpc-port 40402 propose 2>&1 | tee -a log/deployment.log
 
-echo "$ME: creating member directory"
-./deploy ../MemberDirectory.rho
+# deploy rholang 'features' that depend on core
+find ../rholang/feature -name "*.rho" | deployFiles
 rnode --grpc-port 40402 propose 2>&1 | tee -a log/deployment.log
 
 echo "$ME: Waiting for rnode to finalize (10s)" && sleep 10 && echo "$ME: Stopping deployment rnode"

diff --git a/Ballot.rho → rholang/core/Ballot.rho b/Ballot.rho → rholang/core/Ballot.rho
diff --git a/CrowdFund.rho → rholang/core/CrowdFund.rho b/CrowdFund.rho → rholang/core/CrowdFund.rho
diff --git a/Directory.rho → rholang/core/Directory.rho b/Directory.rho → rholang/core/Directory.rho
diff --git a/Group.rho → rholang/core/Group.rho b/Group.rho → rholang/core/Group.rho
diff --git a/Inbox.rho → rholang/core/Inbox.rho b/Inbox.rho → rholang/core/Inbox.rho
diff --git a/Issue.rho → rholang/core/Issue.rho b/Issue.rho → rholang/core/Issue.rho
diff --git a/Kudos.rho → rholang/core/Kudos.rho b/Kudos.rho → rholang/core/Kudos.rho
diff --git a/RevIssuer.rho → rholang/core/RevIssuer.rho b/RevIssuer.rho → rholang/core/RevIssuer.rho
diff --git a/memberIdGovRev.rho → rholang/core/memberIdGovRev.rho b/memberIdGovRev.rho → rholang/core/memberIdGovRev.rho
diff --git a/MemberDirectory.rho → rholang/feature/MemberDirectory.rho b/MemberDirectory.rho → rholang/feature/MemberDirectory.rho