ethermintd->laconicd

This commit is contained in:
0xmuralik
2022-10-13 11:23:17 +05:30
parent 995405d204
commit 051ef3fd2a
21 changed files with 56 additions and 56 deletions
@@ -1,8 +1,8 @@
{ pkgs ? import ../../../nix { } }:
let ethermintd = (pkgs.callPackage ../../../. { });
let laconicd = (pkgs.callPackage ../../../. { });
in
ethermintd.overrideAttrs (oldAttrs: {
laconicd.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [
./broken-ethermintd.patch
./broken-laconicd.patch
];
})
@@ -1,7 +1,7 @@
{
dotenv: '../../../scripts/.env',
'ethermint_9000-1': {
cmd: 'ethermintd',
cmd: 'laconicd',
'start-flags': '--trace',
config: {
consensus: {
@@ -2,10 +2,10 @@ let
pkgs = import ../../../nix { };
fetchEthermint = rev: builtins.fetchTarball "https://github.com/evmos/ethermint/archive/${rev}.tar.gz";
released = pkgs.buildGo118Module rec {
name = "ethermintd";
name = "laconicd";
# the commit before https://github.com/evmos/ethermint/pull/943
src = fetchEthermint "f21592ebfe74da7590eb42ed926dae970b2a9a3f";
subPackages = [ "cmd/ethermintd" ];
subPackages = [ "cmd/laconicd" ];
vendorSha256 = "sha256-ABm5t6R/u2S6pThGrgdsqe8n3fH5tIWw7a57kxJPbYw=";
doCheck = false;
};
+1 -1
View File
@@ -11,7 +11,7 @@ from web3.middleware import geth_poa_middleware
from .cosmoscli import CosmosCLI
from .utils import wait_for_port
DEFAULT_CHAIN_BINARY = "ethermintd"
DEFAULT_CHAIN_BINARY = "laconicd"
class Ethermint:
+1 -1
View File
@@ -2,7 +2,7 @@
pkgs.mkShell {
buildInputs = [
pkgs.jq
(pkgs.callPackage ../../. { }) # ethermintd
(pkgs.callPackage ../../. { }) # laconicd
pkgs.start-scripts
pkgs.go-ethereum
pkgs.cosmovisor
+3 -3
View File
@@ -41,11 +41,11 @@ def custom_ethermint(tmp_path_factory):
cmd = [
"nix-build",
"--no-out-link",
Path(__file__).parent / "configs/broken-ethermintd.nix",
Path(__file__).parent / "configs/broken-laconicd.nix",
]
print(*cmd)
broken_binary = (
Path(subprocess.check_output(cmd).strip().decode()) / "bin/ethermintd"
Path(subprocess.check_output(cmd).strip().decode()) / "bin/laconicd"
)
print(broken_binary)
@@ -89,7 +89,7 @@ def test_rollback(custom_ethermint):
cli2.rollback()
print("switch to normal binary")
update_node2_cmd(custom_ethermint.base_dir, "ethermintd", 2)
update_node2_cmd(custom_ethermint.base_dir, "laconicd", 2)
supervisorctl(custom_ethermint.base_dir / "../tasks.ini", "update")
wait_for_port(ports.rpc_port(custom_ethermint.base_port(2)))
+3 -3
View File
@@ -55,7 +55,7 @@ def post_init(path, base_port, config):
{
"command": f"cosmovisor start --home %(here)s/node{i}",
"environment": (
f"DAEMON_NAME=ethermintd,DAEMON_HOME=%(here)s/node{i}"
f"DAEMON_NAME=laconicd,DAEMON_HOME=%(here)s/node{i}"
),
}
)
@@ -80,7 +80,7 @@ def custom_ethermint(tmp_path_factory):
26100,
Path(__file__).parent / "configs/cosmovisor.jsonnet",
post_init=post_init,
chain_binary=str(path / "upgrades/genesis/bin/ethermintd"),
chain_binary=str(path / "upgrades/genesis/bin/laconicd"),
)
@@ -136,7 +136,7 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
# update cli chain binary
custom_ethermint.chain_binary = (
Path(custom_ethermint.chain_binary).parent.parent.parent
/ f"{plan_name}/bin/ethermintd"
/ f"{plan_name}/bin/laconicd"
)
cli = custom_ethermint.cosmos_cli()