From 86710f007ec993901192da39fc7ee6325b831deb Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Wed, 5 May 2021 18:05:01 +0200 Subject: [PATCH 1/4] Use start-multi command in e2e test suite --- e2e/e2e/relayer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/e2e/relayer.py b/e2e/e2e/relayer.py index e50e0817f6..e953b7c057 100644 --- a/e2e/e2e/relayer.py +++ b/e2e/e2e/relayer.py @@ -14,7 +14,7 @@ def start(c: Config, src: ChainId, dst: ChainId, src_port: Optional[PortId], src if src_channel != None: args.extend(['-c', str(src_channel)]) - full_cmd = f'{c.relayer_cmd} -c {c.config_file} --json start'.split(' ') + full_cmd = f'{c.relayer_cmd} -c {c.config_file} -j start-multi'.split(' ') full_cmd.extend(args) l.debug(' '.join(full_cmd)) From fe22c307b9e07607396b8a5bec74ff295efe4998 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Fri, 7 May 2021 12:41:10 +0200 Subject: [PATCH 2/4] Fix start-multi command invocation --- e2e/e2e/relayer.py | 17 +++-------------- e2e/run.py | 5 ++--- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/e2e/e2e/relayer.py b/e2e/e2e/relayer.py index e953b7c057..a941b96268 100644 --- a/e2e/e2e/relayer.py +++ b/e2e/e2e/relayer.py @@ -1,22 +1,11 @@ from subprocess import Popen import logging as l -from typing import Optional from .cmd import Config -from .common import ChainId, PortId, ChannelId -def start(c: Config, src: ChainId, dst: ChainId, src_port: Optional[PortId], src_channel: Optional[ChannelId]) -> Popen: - args = [str(src), str(dst)] - if src_port != None: - args.extend(['-p', str(src_port)]) - if src_channel != None: - args.extend(['-c', str(src_channel)]) - - full_cmd = f'{c.relayer_cmd} -c {c.config_file} -j start-multi'.split(' ') - full_cmd.extend(args) - - l.debug(' '.join(full_cmd)) - +def start(c: Config) -> Popen: + full_cmd = f'{c.relayer_cmd} -c {c.config_file} -j start-multi' + l.debug(full_cmd) return Popen(full_cmd) diff --git a/e2e/run.py b/e2e/run.py index 454ad021f4..fa3aec038d 100755 --- a/e2e/run.py +++ b/e2e/run.py @@ -79,9 +79,8 @@ def loop(c: Config): assert (len(unreceived) == 2), (unreceived, "unreceived packet mismatch") - # 4. start relaying on the channel - it should clear the unreceived packets - proc = relayer.start(c, src=IBC_0, dst=IBC_1, - src_port=TRANSFER, src_channel=IBC_0_CHANNEL) + # 4. start relaying - it should clear the unreceived packets + proc = relayer.start(c) # 5. wait a bit and make sure there are no pending packets From 91c1700ceaa4c23f183f8f91363bbc7fba180ea3 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Fri, 7 May 2021 12:41:44 +0200 Subject: [PATCH 3/4] More sleep --- e2e/run.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/e2e/run.py b/e2e/run.py index fa3aec038d..d1881fb7eb 100755 --- a/e2e/run.py +++ b/e2e/run.py @@ -51,7 +51,7 @@ def loop(c: Config): packet.packet_send(c, src=IBC_0, dst=IBC_1, src_port=TRANSFER, src_channel=IBC_0_CHANNEL, amount=10000, height_offset=1000, number_msgs=4) - sleep(5.0) + sleep(10.0) # 3. verify the expected number of unreceived packets and acks on each channel end @@ -79,9 +79,13 @@ def loop(c: Config): assert (len(unreceived) == 2), (unreceived, "unreceived packet mismatch") + sleep(2.0) + # 4. start relaying - it should clear the unreceived packets proc = relayer.start(c) + sleep(5.0) + # 5. wait a bit and make sure there are no pending packets # hermes tx raw ft-transfer ibc-0 ibc-1 transfer channel-1 10000 1000 -n 3 From d0d0b56e151e5b39851993b85cbe1e139b2206af Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Fri, 7 May 2021 12:53:33 +0200 Subject: [PATCH 4/4] Fix Popen invocation --- e2e/e2e/relayer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/e2e/relayer.py b/e2e/e2e/relayer.py index a941b96268..cadfcb0d4d 100644 --- a/e2e/e2e/relayer.py +++ b/e2e/e2e/relayer.py @@ -6,6 +6,6 @@ def start(c: Config) -> Popen: - full_cmd = f'{c.relayer_cmd} -c {c.config_file} -j start-multi' - l.debug(full_cmd) + full_cmd = f'{c.relayer_cmd} -c {c.config_file} -j start-multi'.split(' ') + l.debug(' '.join(full_cmd)) return Popen(full_cmd)