Skip to content

fix ctl8, add test #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2024
Merged

fix ctl8, add test #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
url = "github:intersectmbo/cardano-node?ref=8.1.1";
};
"cardano-configurations-8.1.1" = {
url = "github:input-output-hk/cardano-configurations/cc75f41fcd854e2088d3792c46eb7033b445489b";
url = "github:input-output-hk/cardano-configurations/9b69b59ef2fb2838855017f19af57b38c5d4abe4";
flake = false;
};

Expand Down
1 change: 1 addition & 0 deletions modules/node.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ in {
services.cardano-node = {
enable = true;

package = lib.mkDefault pkgs.cardano-node;
inherit (cfg) socketPath;
nodeConfigFile = cfg.configPath;
environment = config.cardano.network;
Expand Down
9 changes: 5 additions & 4 deletions packages/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,28 @@
};
flake.overlays = {
default = config.flake.overlays."cardano-node-8.7.3";
"ctl-8" = config.flake.overlays."cardano-node-8.1.1";
"cardano-node-8.7.3" = final: _prev:
# overlay for recent packages
let
inherit ((config.perSystem final.system)) packages;
inherit (config.perSystem final.system) packages;
in {
cardano-cli = packages."cardano-cli-8.7.3";
cardano-node = packages."cardano-node-8.7.3";
cardano-configurations = packages."cardano-configurations-8.7.3";
ogmios = packages."ogmios-6.1.0";
kupo = packages."kupo-2.8.0";
};
"ctl-8" = final: _prev:
"cardano-node-8.1.1" = final: _prev:
# overlay for packages compatible with cardano-transaction-lib 8.0.0
let
inherit ((config.perSystem final.system)) packages;
inherit (config.perSystem final.system) packages;
in {
cardano-cli = packages."cardano-cli-8.1.1";
cardano-node = packages."cardano-node-8.1.1";
cardano-configurations = packages."cardano-configurations-8.1.1";
ogmios = packages."ogmios-6.0.3";
kupo = packages."kupo-2.2.0";
kupo = packages."kupo-2.6.1";
};
};
}
34 changes: 34 additions & 0 deletions tests/ctl-8.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{self, ...}: {
perSystem.vmTests.tests.ctl-8 = {
impure = true;
module = {
nodes .machine = {pkgs, ...}: {
# use packages compatible with cardano-transaction-lib 8.0.0
nixpkgs.overlays = [self.overlays.ctl-8];

cardano = {
network = "preview";
cli.enable = true;
node.enable = true;
ogmios.enable = true;
kupo.enable = true;
};

environment.systemPackages = with pkgs; [jq bc curl];
};

testScript = {nodes, ...}: let
magic = toString nodes.machine.config.cardano.networkNumber;
in ''
machine.wait_for_unit("cardano-node")
machine.wait_for_unit("cardano-node-socket")
machine.wait_until_succeeds("""[[ $(echo "$(cardano-cli query tip --testnet-magic ${magic} | jq '.syncProgress' --raw-output) > 0.001" | bc) == "1" ]]""")
machine.wait_for_unit("ogmios")
machine.succeed("curl --silent --fail http://localhost:1337/health")
machine.wait_for_unit("kupo")
machine.succeed("curl --silent --fail http://localhost:1442/health")
machine.wait_until_succeeds("""[[ $(echo "$(curl --silent --fail http://localhost:1337/health | jq '.networkSynchronization' --raw-output) > 0.00001" | bc) == "1" ]]""")
'';
};
};
}
1 change: 1 addition & 0 deletions tests/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
./kupo.nix
./http.nix
./db-sync.nix
./ctl-8.nix
];
}