Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

[CBR-414] fix demo-nix.sh to have all core nodes working #3582

Merged
merged 2 commits into from
Sep 13, 2018
Merged

[CBR-414] fix demo-nix.sh to have all core nodes working #3582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7348a2f
[CBR-414] fix demo-nix.sh to have all core nodes working
cleverca22 Sep 13, 2018
76424c9
[CBR-414] switch core and relay nodes in demo-nix.sh over to 0 based …
cleverca22 Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/launch/demo-cluster/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ let
topologyFile = import ./make-topology.nix { inherit (pkgs) lib; cores = numCoreNodes; relays = numRelayNodes; };
walletTopologyFile = builtins.toFile "wallet-topology.yaml" (builtins.toJSON {
wallet = {
relays = [ [ { addr = "127.0.0.1"; port = 3101; } ] ];
relays = [ [ { addr = "127.0.0.1"; port = 3100; } ] ];
valency = 1;
fallbacks = 1;
};
Expand Down Expand Up @@ -116,15 +116,15 @@ in pkgs.writeScript "demo-cluster" ''

trap "stop_cardano" INT TERM
echo "Launching a demo cluster..."
for i in {1..${builtins.toString numCoreNodes}}
for i in {0..${builtins.toString (numCoreNodes - 1)}}
do
node_args="--db-path ${stateDir}/core-db$i --rebuild-db ${if launchGenesis then "--keyfile ${stateDir}/genesis-keys/generated-keys/rich/key$((i - 1)).sk" else "--genesis-secret $i"} --listen 127.0.0.1:$((3000 + i)) --json-log ${stateDir}/logs/core$i.json --logs-prefix ${stateDir}/logs --system-start $system_start --metrics +RTS -N2 -qg -A1m -I0 -T -RTS --node-id core$i --topology ${topologyFile} --configuration-file $config_files/configuration.yaml --configuration-key ${configurationKey} ${ifAssetLock "--asset-lock-file ${assetLockFile}"}"
node_args="--db-path ${stateDir}/core-db$i --rebuild-db ${if launchGenesis then "--keyfile ${stateDir}/genesis-keys/generated-keys/rich/key\${i}.sk" else "--genesis-secret $i"} --listen 127.0.0.1:$((3000 + i)) --json-log ${stateDir}/logs/core$i.json --logs-prefix ${stateDir}/logs --system-start $system_start --metrics +RTS -N2 -qg -A1m -I0 -T -RTS --node-id core$i --topology ${topologyFile} --configuration-file $config_files/configuration.yaml --configuration-key ${configurationKey} ${ifAssetLock "--asset-lock-file ${assetLockFile}"}"
echo Launching core node $i: cardano-node-simple $node_args
${stackExec}cardano-node-simple $node_args &> ${stateDir}/logs/core$i.log &
core_pid[$i]=$!

done
for i in {1..${builtins.toString numRelayNodes}}
for i in {0..${builtins.toString (numRelayNodes - 1)}}
do
node_args="--db-path ${stateDir}/relay-db$i --rebuild-db --listen 127.0.0.1:$((3100 + i)) --json-log ${stateDir}/logs/relay$i.json --logs-prefix ${stateDir}/logs --system-start $system_start --metrics +RTS -N2 -qg -A1m -I0 -T -RTS --node-id relay$i --topology ${topologyFile} --configuration-file $config_files/configuration.yaml --configuration-key ${configurationKey}"
echo Launching relay node $i: cardano-node-simple $node_args
Expand Down
6 changes: 3 additions & 3 deletions scripts/launch/demo-cluster/make-topology.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ lib, cores, relays }:
with lib;
let
coreNames = map (index: "core${toString index}") (range 1 cores);
relayNames = map (index: "relay${toString index}") (range 1 relays);
coreNames = map (index: "core${toString index}") (range 0 (cores - 1));
relayNames = map (index: "relay${toString index}") (range 0 (relays - 1));
peers = node: remove node (coreNames ++ relayNames);
mkNodeTopology = type: index: let
offset = if type == "relay" then 100 else 0;
Expand All @@ -17,7 +17,7 @@ let
};
};
topology = {
nodes = builtins.listToAttrs ((map (mkNodeTopology "core") (range 1 cores)) ++ (map (mkNodeTopology "relay") (range 1 relays)));
nodes = builtins.listToAttrs ((map (mkNodeTopology "core") (range 0 (cores - 1))) ++ (map (mkNodeTopology "relay") (range 0 (relays - 1))));
};
topologyFile = builtins.toFile "topology.yaml" (builtins.toJSON topology);
in topologyFile