Skip to content

Commit

Permalink
Run formatter
Browse files Browse the repository at this point in the history
Signed-off-by: Sasha Bogicevic <sasha.bogicevic@iohk.io>
  • Loading branch information
v0d1ch committed Jul 18, 2024
1 parent 712aae0 commit 6d3398d
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 66 deletions.
11 changes: 7 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{ self
, flake-parts
, nixpkgs
# TODO remove when haskellNix updated to newer nixpkgs
# TODO remove when haskellNix updated to newer nixpkgs
, nixpkgsLatest
, cardano-node
, ...
Expand Down Expand Up @@ -123,14 +123,17 @@
value = addWerror v;
})
x.components."${y}") [ "benchmarks" "exes" "sublibs" "tests" ]);
in {
in
{
legacyPackages = hsPkgs;

packages =
hydraPackages //
(if pkgs.stdenv.isLinux then (prefixAttrs "docker-" hydraImages) else { }) // {
spec = import ./spec { inherit pkgs;
}; };
spec = import ./spec {
inherit pkgs;
};
};
process-compose."demo" = import ./nix/hydra/demo.nix {
inherit system pkgs inputs self;
demoDir = ./demo;
Expand Down
124 changes: 62 additions & 62 deletions nix/hydra/demo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
};
cardano-node = {
command = ''
${cardano-node}/bin/cardano-node run \
--config devnet/cardano-node.json \
--topology devnet/topology.json \
--database-path devnet/db \
--socket-path devnet/node.socket \
--shelley-operational-certificate devnet/opcert.cert \
--shelley-kes-key devnet/kes.skey \
--shelley-vrf-key devnet/vrf.skey
${cardano-node}/bin/cardano-node run \
--config devnet/cardano-node.json \
--topology devnet/topology.json \
--database-path devnet/db \
--socket-path devnet/node.socket \
--shelley-operational-certificate devnet/opcert.cert \
--shelley-kes-key devnet/kes.skey \
--shelley-vrf-key devnet/vrf.skey
'';
ready_log_line = "NodeIsLeader";
depends_on."prepare-devnet".condition = "process_completed";
Expand All @@ -46,72 +46,72 @@
};
hydra-node-alice = {
command = ''
source .env &&
${hydra-node}/bin/hydra-node \
--node-id 1 \
--port 5001 \
--api-port 4001 \
--monitoring-port 6001 \
--peer 127.0.0.1:5002 \
--peer 127.0.0.1:5003 \
--hydra-signing-key ${demoDir}/alice.sk \
--hydra-verification-key ${demoDir}/bob.vk \
--hydra-verification-key ${demoDir}/carol.vk \
--hydra-scripts-tx-id $HYDRA_SCRIPTS_TX_ID \
--cardano-signing-key devnet/credentials/alice.sk \
--cardano-verification-key devnet/credentials/bob.vk \
--cardano-verification-key devnet/credentials/carol.vk \
--ledger-protocol-parameters devnet/protocol-parameters.json \
--testnet-magic 42 \
--node-socket devnet/node.socket
source .env &&
${hydra-node}/bin/hydra-node \
--node-id 1 \
--port 5001 \
--api-port 4001 \
--monitoring-port 6001 \
--peer 127.0.0.1:5002 \
--peer 127.0.0.1:5003 \
--hydra-signing-key ${demoDir}/alice.sk \
--hydra-verification-key ${demoDir}/bob.vk \
--hydra-verification-key ${demoDir}/carol.vk \
--hydra-scripts-tx-id $HYDRA_SCRIPTS_TX_ID \
--cardano-signing-key devnet/credentials/alice.sk \
--cardano-verification-key devnet/credentials/bob.vk \
--cardano-verification-key devnet/credentials/carol.vk \
--ledger-protocol-parameters devnet/protocol-parameters.json \
--testnet-magic 42 \
--node-socket devnet/node.socket
'';
ready_log_line = "NodeIsLeader";
depends_on."seed-devnet".condition = "process_completed";
};
hydra-node-bob = {
command = ''
source .env &&
${hydra-node}/bin/hydra-node \
--node-id 2 \
--port 5002 \
--api-port 4002 \
--monitoring-port 6002 \
--peer 127.0.0.1:5001 \
--peer 127.0.0.1:5003 \
--hydra-signing-key ${demoDir}/bob.sk \
--hydra-verification-key ${demoDir}/alice.vk \
--hydra-verification-key ${demoDir}/carol.vk \
--hydra-scripts-tx-id $HYDRA_SCRIPTS_TX_ID \
--cardano-signing-key devnet/credentials/bob.sk \
--cardano-verification-key devnet/credentials/alice.vk \
--cardano-verification-key devnet/credentials/carol.vk \
--ledger-protocol-parameters devnet/protocol-parameters.json \
--testnet-magic 42 \
--node-socket devnet/node.socket
source .env &&
${hydra-node}/bin/hydra-node \
--node-id 2 \
--port 5002 \
--api-port 4002 \
--monitoring-port 6002 \
--peer 127.0.0.1:5001 \
--peer 127.0.0.1:5003 \
--hydra-signing-key ${demoDir}/bob.sk \
--hydra-verification-key ${demoDir}/alice.vk \
--hydra-verification-key ${demoDir}/carol.vk \
--hydra-scripts-tx-id $HYDRA_SCRIPTS_TX_ID \
--cardano-signing-key devnet/credentials/bob.sk \
--cardano-verification-key devnet/credentials/alice.vk \
--cardano-verification-key devnet/credentials/carol.vk \
--ledger-protocol-parameters devnet/protocol-parameters.json \
--testnet-magic 42 \
--node-socket devnet/node.socket
'';
ready_log_line = "NodeIsLeader";
depends_on."seed-devnet".condition = "process_completed";
};
hydra-node-carol = {
command = ''
source .env &&
${hydra-node}/bin/hydra-node \
--node-id 3 \
--port 5003 \
--api-port 4003 \
--monitoring-port 6003 \
--peer 127.0.0.1:5001 \
--peer 127.0.0.1:5002 \
--hydra-signing-key ${demoDir}/carol.sk \
--hydra-verification-key ${demoDir}/alice.vk \
--hydra-verification-key ${demoDir}/bob.vk \
--hydra-scripts-tx-id $HYDRA_SCRIPTS_TX_ID \
--cardano-signing-key devnet/credentials/carol.sk \
--cardano-verification-key devnet/credentials/alice.vk \
--cardano-verification-key devnet/credentials/bob.vk \
--ledger-protocol-parameters devnet/protocol-parameters.json \
--testnet-magic 42 \
--node-socket devnet/node.socket
source .env &&
${hydra-node}/bin/hydra-node \
--node-id 3 \
--port 5003 \
--api-port 4003 \
--monitoring-port 6003 \
--peer 127.0.0.1:5001 \
--peer 127.0.0.1:5002 \
--hydra-signing-key ${demoDir}/carol.sk \
--hydra-verification-key ${demoDir}/alice.vk \
--hydra-verification-key ${demoDir}/bob.vk \
--hydra-scripts-tx-id $HYDRA_SCRIPTS_TX_ID \
--cardano-signing-key devnet/credentials/carol.sk \
--cardano-verification-key devnet/credentials/alice.vk \
--cardano-verification-key devnet/credentials/bob.vk \
--ledger-protocol-parameters devnet/protocol-parameters.json \
--testnet-magic 42 \
--node-socket devnet/node.socket
'';
ready_log_line = "NodeIsLeader";
depends_on."seed-devnet".condition = "process_completed";
Expand Down

0 comments on commit 6d3398d

Please sign in to comment.