Update Scripts

IntersectMBO · Nov 29, 2019 · f02c173 · f02c173
1 parent 7b88987
commit f02c173
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 10 deletions.
diff --git a/benchmarking/chain-sync/benchmark-chain-sync-mainnet.sh b/benchmarking/chain-sync/benchmark-chain-sync-mainnet.sh
@@ -20,7 +20,7 @@ ulimit -t $CPU_TIME_LIMIT
 
 date --iso-8601=seconds > STARTTIME
 
-NODE="cabal new-run exe:cardano-node -- "
+NODE="cabal new-run exe:cardano-node -- run"
 
 exec ${NODE} \
   --genesis-file ${BASEDIR}/../../configuration/mainnet-genesis.json \

diff --git a/benchmarking/chain-sync/configuration/topology-local.yaml b/benchmarking/chain-sync/configuration/topology-local.yaml
@@ -1 +1,9 @@
-[{"nodeAddress":{"addr":"127.0.0.1","port":3001},"nodeId":0,"producers":[{"addr":"127.0.0.1","port":7777,"valency":1}]}]
+{
+   "Producers":[
+      {
+         "addr":"127.0.0.1",
+         "port":7777,
+         "valency":1
+      }
+   ]
+}
diff --git a/cardano-config/src/Cardano/Config/Topology.hs b/cardano-config/src/Cardano/Config/Topology.hs
@@ -140,7 +140,7 @@ data RealNodeTopology = RealNodeTopology { rProducers :: ![RemoteAddress] }
 instance FromJSON RealNodeTopology where
   parseJSON = withObject "RealNodeTopology" $ \v ->
     RealNodeTopology
-      <$> v .: "rProducers"
+      <$> v .: "Producers"
 
 instance FromJSON NodeId where
   parseJSON v = CoreId <$> parseJSON v

diff --git a/configuration/realPBFT/simple-topology-real-pbft-node-0.json b/configuration/realPBFT/simple-topology-real-pbft-node-0.json
@@ -0,0 +1,15 @@
+
+  {
+     "Producers":[
+        {
+           "addr":"127.0.0.1",
+           "port":3001,
+           "valency":1
+        },
+        {
+           "addr":"127.0.0.1",
+           "port":3002,
+           "valency":1
+        }
+     ]
+  }
diff --git a/configuration/realPBFT/simple-topology-real-pbft-node-1.json b/configuration/realPBFT/simple-topology-real-pbft-node-1.json
@@ -0,0 +1,14 @@
+{
+  "Producers":[
+     {
+        "addr":"127.0.0.1",
+        "port":3000,
+        "valency":1
+     },
+     {
+        "addr":"127.0.0.1",
+        "port":3002,
+        "valency":1
+     }
+  ]
+}
diff --git a/configuration/realPBFT/simple-topology-real-pbft-node-2.json b/configuration/realPBFT/simple-topology-real-pbft-node-2.json
@@ -0,0 +1,14 @@
+{
+  "Producers":[
+     {
+        "addr":"127.0.0.1",
+        "port":3000,
+        "valency":1
+     },
+     {
+        "addr":"127.0.0.1",
+        "port":3001,
+        "valency":1
+     }
+  ]
+}
diff --git a/configuration/topology-proxy-follower.json → ...ion/realPBFT/topology-proxy-follower.json b/configuration/topology-proxy-follower.json → ...ion/realPBFT/topology-proxy-follower.json
@@ -1,5 +1,5 @@
 {
-  "rProducers": [
+  "Producers": [
     {
       "addr": "18.185.45.45",
       "port": 3001,

diff --git a/scripts/lib-node.sh b/scripts/lib-node.sh
@@ -18,10 +18,10 @@ function dlgcert () {
         printf -- "--delegation-certificate ${genesis_root}/delegation-cert.%03d.json " "$1"
 }
 function commonargs() {
-        printf -- "--topology configuration/simple-topology.json "
-        printf -- "--database-path ./db/node-$1 "
+        printf -- "--topology configuration/realPBFT/simple-topology-real-pbft-node-$1.json "
+        printf -- "--database-path ./node-$1 "
         printf -- "--genesis-file ${genesis_file} "
-        printf -- "--socket-path ./socket/$1 "
+        printf -- "--socket-path ./socket/node-core-$1.socket "
 }
 
 function acceptorargs() {

diff --git a/scripts/shelley-testnet.sh b/scripts/shelley-testnet.sh
@@ -54,8 +54,8 @@ tmux select-pane -t 4
 tmux send-keys "cd '${PWD}'; ${CMD} trace-acceptor $(acceptorargs)" C-m
 sleep 2
 tmux select-pane -t 1
-tmux send-keys "cd '${PWD}'; ${CMD} exe:cardano-node $(nodeargs 0 "${ALGO} $(echo -n ${EXTRA})") " C-m
+tmux send-keys "cd '${PWD}'; ${CMD} exe:cardano-node run $(nodeargs 0 "${ALGO} $(echo -n ${EXTRA})") " C-m
 tmux select-pane -t 2
-tmux send-keys "cd '${PWD}'; ${CMD} exe:cardano-node $(nodeargs 1 "${ALGO} $(echo -n ${EXTRA})") " C-m
+tmux send-keys "cd '${PWD}'; ${CMD} exe:cardano-node run $(nodeargs 1 "${ALGO} $(echo -n ${EXTRA})") " C-m
 tmux select-pane -t 3
-tmux send-keys "cd '${PWD}'; ${CMD} exe:cardano-node $(nodeargs 2 "${ALGO} $(echo -n ${EXTRA})") " C-m
+tmux send-keys "cd '${PWD}'; ${CMD} exe:cardano-node run $(nodeargs 2 "${ALGO} $(echo -n ${EXTRA})") " C-m