Merge #335

335: Implement real vs mock protocol selection r=Jimbo4350 a=Jimbo4350

Implements the `NodeProtocolMode` type which differentiates whether the node is running a real protocol vs a mock protocol.
Changes:
- When running a real protocol, the topology comes from a `JSON` file which is decoded to `RealNodeTopology` which specifies the addresses the node intends to connect to.
- `socket-dir` command line argument is changed to `socket-path` i.e you must specify socket paths and not dirs anymore.
- `NodeId` only needs to be specified for mock protocols (https://github.com/input-output-hk/cardano-node/blob/d24cefd7a4fb1afbf13e8e7f7971e22704673f98/cardano-config/src/Cardano/Config/Protocol.hs#L129)

The `cardano-node` client is now as follows (with further help for both `run` and `run-mock` via `cabal exec cardano-node run/run-mock -- --help`):
```
Usage: cardano-node (run | run-mock) [--help]
  Start node of the Cardano blockchain.

Available options:
  --help                   Show this help text

Execute node with a real protocol.
  run                      Execute node with a real protocol.

Execute node with a mock protocol.
  run-mock                 Execute node with a mock protocol.
```
Relevant: #297, #318, #314

Co-authored-by: Jordan Millar <jordan.millar@iohk.io>

Author: iohk-bors[bot]

benchmarking/chain-sync/benchmark-chain-sync-mainnet.sh

@@ -39,7 +39,7 @@ exec ${NODE} \
   --genesis-hash "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb" \
   --config ${BASEDIR}/configuration/log-configuration.yaml \
   --database-path .//db-mainnet \
-  --socket-dir /tmp/socket-bm-chain-sync \
+  --socket-path /tmp/socket-bm-chain-sync \
   --topology ${BASEDIR}/configuration/topology-local.yaml \
   --host-addr 127.0.0.1 \
   --port 7778 \

benchmarking/chain-sync/configuration/log-config-ci.yaml

@@ -77,7 +77,7 @@ options:
 ##########################################################
 
 
-NodeId: 0
+NodeId:
 Protocol: RealPBFT
 NumCoreNodes: 1
 RequiresNetworkMagic: RequiresNoMagic

benchmarking/chain-sync/configuration/log-configuration.yaml

@@ -85,7 +85,7 @@ options:
 ##########################################################
 
 
-NodeId: 0
+NodeId:
 Protocol: RealPBFT
 NumCoreNodes: 1
 RequiresNetworkMagic: RequiresNoMagic

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
+      }
+   ]
+}

benchmarking/cluster3nodes/configuration/log-config-0.yaml

@@ -75,7 +75,7 @@ options:
 ##########################################################
 
 
-NodeId: 0
+NodeId:
 Protocol: RealPBFT
 NumCoreNodes: 1
 RequiresNetworkMagic: RequiresMagic

benchmarking/cluster3nodes/configuration/log-config-1.yaml

@@ -77,7 +77,7 @@ options:
 ##########################################################
 
 
-NodeId: 1
+NodeId:
 Protocol: RealPBFT
 NumCoreNodes: 1
 RequiresNetworkMagic: RequiresMagic

benchmarking/cluster3nodes/configuration/log-config-2.yaml

@@ -81,7 +81,7 @@ options:
 ##########################################################
 
 
-NodeId: 2
+NodeId:
 Protocol: RealPBFT
 NumCoreNodes: 1
 RequiresNetworkMagic: RequiresMagic

benchmarking/cluster3nodes/configuration/log-config-generator.yaml

@@ -81,7 +81,7 @@ options:
 ##########################################################
 
 
-NodeId: 99
+NodeId:
 Protocol: RealPBFT
 NumCoreNodes: 1
 RequiresNetworkMagic: RequiresMagic

benchmarking/cluster3nodes/configuration/log-config-genesis.yaml

@@ -49,7 +49,7 @@ options:
 ##########################################################
 
 
-NodeId: 0
+NodeId:
 Protocol: RealPBFT
 NumCoreNodes: 1
 RequiresNetworkMagic: RequiresMagic

benchmarking/cluster3nodes/configuration/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
+        }
+     ]
+  }