Skip to content

Commit

Permalink
remove uses of --app-address flag
Browse files Browse the repository at this point in the history 
Signed-off-by: Masanori Yoshida <[email protected]>
  • Loading branch information
@siburu
siburu committed Aug 22, 2024
1 parent a755846 commit 12a3b0d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/datachainlab/yui-relayer-build
go 1.21

replace (
github.com/datachainlab/ethereum-ibc-relay-chain => github.com/siburu/ethereum-ibc-relay-chain v0.0.0-20240821062657-acea618ffec2
github.com/datachainlab/ethereum-ibc-relay-chain => github.com/siburu/ethereum-ibc-relay-chain v0.0.0-20240822140509-4e04d54b84a9
github.com/hyperledger-labs/yui-relayer => github.com/siburu/yui-relayer v0.0.0-20240821053019-0c02fc715efa
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,8 +1047,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/siburu/ethereum-ibc-relay-chain v0.0.0-20240821062657-acea618ffec2 h1:DllYy4v3p0AvHBCIGf3NqM0wDLF4pdK/0jC4Lqom6DY=
github.com/siburu/ethereum-ibc-relay-chain v0.0.0-20240821062657-acea618ffec2/go.mod h1:RrttWTSxetvwg480DW4fa35LyT0diIIILK5dEcldgC4=
github.com/siburu/ethereum-ibc-relay-chain v0.0.0-20240822140509-4e04d54b84a9 h1:awvYFYRdYej2f/htu4bDqItQnkOrseNzuq4bo/zna18=
github.com/siburu/ethereum-ibc-relay-chain v0.0.0-20240822140509-4e04d54b84a9/go.mod h1:RrttWTSxetvwg480DW4fa35LyT0diIIILK5dEcldgC4=
github.com/siburu/yui-relayer v0.0.0-20240821053019-0c02fc715efa h1:kd1Q7hRIfztia3EFxUDQfFZetd1VmPaM7Z6VbS4Z5zE=
github.com/siburu/yui-relayer v0.0.0-20240821053019-0c02fc715efa/go.mod h1:GeCb1dtZjtQdkBNw1L9+LAUHzNQQhQK+kkoOnZYffw0=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
Expand Down
22 changes: 11 additions & 11 deletions tests/cases/eth2eth/scripts/test-channel-upgrade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,35 @@ TIMEOUT_FLAGS="--timeout-height 0-100000000"
# test channel upgrade (crossing-hello)
UPGRADE_FIELDS_FLAGS_A="--ordering UnOrdered --connection-hops $srcAltConnectionId --version mockapp-999"
UPGRADE_FIELDS_FLAGS_B="--ordering UnOrdered --connection-hops $dstAltConnectionId --version mockapp-999"
$RLY eth upgrade propose ibc01 ibc0 --app-address $APP_ADDRESS_A $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY eth upgrade propose ibc01 ibc1 --app-address $APP_ADDRESS_B $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B
$RLY tx channel-upgrade execute ibc01 --target-src-state FLUSHING --target-dst-state FLUSHING
$RLY eth upgrade allow ibc01 ibc0 --app-address $APP_ADDRESS_A --upgrade-sequence 1
$RLY eth upgrade allow ibc01 ibc1 --app-address $APP_ADDRESS_B --upgrade-sequence 1
$RLY eth upgrade allow ibc01 ibc0 --upgrade-sequence 1
$RLY eth upgrade allow ibc01 ibc1 --upgrade-sequence 1
$RLY tx channel-upgrade execute ibc01

# test channel upgrade (non-crossing-hello)
UPGRADE_FIELDS_FLAGS_A="--ordering UnOrdered --connection-hops $srcOrigConnectionId --version mockapp-1"
UPGRADE_FIELDS_FLAGS_B="--ordering UnOrdered --connection-hops $dstOrigConnectionId --version mockapp-1"
$RLY eth upgrade propose ibc01 ibc0 --app-address $APP_ADDRESS_A $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY eth upgrade propose ibc01 ibc0 --app-address $APP_ADDRESS_A $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY eth upgrade propose ibc01 ibc1 --app-address $APP_ADDRESS_B $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B
$RLY tx channel-upgrade execute ibc01 --target-src-state FLUSHING --target-dst-state FLUSHING
$RLY eth upgrade allow ibc01 ibc0 --app-address $APP_ADDRESS_A --upgrade-sequence 3
$RLY eth upgrade allow ibc01 ibc1 --app-address $APP_ADDRESS_B --upgrade-sequence 3
$RLY eth upgrade allow ibc01 ibc0 --upgrade-sequence 3
$RLY eth upgrade allow ibc01 ibc1 --upgrade-sequence 3
$RLY tx channel-upgrade execute ibc01

# test channel upgrade cancel
UPGRADE_FIELDS_FLAGS_A="--ordering UnOrdered --connection-hops $srcAltConnectionId --version mockapp-999"
UPGRADE_FIELDS_FLAGS_B="--ordering UnOrdered --connection-hops $dstAltConnectionId --version mockapp-999"
$RLY eth upgrade propose ibc01 ibc0 --app-address $APP_ADDRESS_A $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY eth upgrade propose ibc01 ibc1 --app-address $APP_ADDRESS_B $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B
$RLY tx channel-upgrade cancel ibc01 ibc0 # create situation where ibc0.error_receipt.sequence >= ibc1.channel.upgrade_sequence
$RLY tx channel-upgrade execute ibc01 # the channel upgrade of ibc1 should be cancelled
10 changes: 5 additions & 5 deletions tests/cases/tm2eth/scripts/test-channel-upgrade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@ TIMEOUT_FLAGS="--timeout-height 0-100000000"
UPGRADE_FIELDS_FLAGS_A="--ordering UnOrdered --connection-hops $srcAltConnectionId --version mockapp-999"
UPGRADE_FIELDS_FLAGS_B="--ordering UnOrdered --connection-hops $dstAltConnectionId --version mockapp-999"
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY eth upgrade propose ibc01 ibc1 --app-address $APP_ADDRESS $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B
$RLY tx channel-upgrade execute ibc01 --target-src-state FLUSHCOMPLETE --target-dst-state FLUSHING
$RLY eth upgrade allow ibc01 ibc1 --app-address $APP_ADDRESS --upgrade-sequence 1
$RLY eth upgrade allow ibc01 ibc1 --upgrade-sequence 1
$RLY tx channel-upgrade execute ibc01

# test channel upgrade (non-crossing-hello)
UPGRADE_FIELDS_FLAGS_A="--ordering Unordered --connection-hops $srcOrigConnectionId --version mockapp-1"
UPGRADE_FIELDS_FLAGS_B="--ordering Unordered --connection-hops $dstOrigConnectionId --version mockapp-1"
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY eth upgrade propose ibc01 ibc1 --app-address $APP_ADDRESS $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B
$RLY tx channel-upgrade execute ibc01 --target-src-state FLUSHCOMPLETE --target-dst-state FLUSHING
$RLY eth upgrade allow ibc01 ibc1 --app-address $APP_ADDRESS --upgrade-sequence 3
$RLY eth upgrade allow ibc01 ibc1 --upgrade-sequence 3
$RLY tx channel-upgrade execute ibc01

# test channel upgrade cancel
UPGRADE_FIELDS_FLAGS_A="--ordering UnOrdered --connection-hops $srcAltConnectionId --version mockapp-999"
UPGRADE_FIELDS_FLAGS_B="--ordering UnOrdered --connection-hops $dstAltConnectionId --version mockapp-999"
$RLY tx channel-upgrade init ibc01 ibc0 $UPGRADE_FIELDS_FLAGS_A
$RLY eth upgrade propose ibc01 ibc1 --app-address $APP_ADDRESS $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY eth upgrade propose ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B $TIMEOUT_FLAGS
$RLY tx channel-upgrade init ibc01 ibc1 $UPGRADE_FIELDS_FLAGS_B
$RLY tx channel-upgrade cancel ibc01 ibc0 # create situation where ibc0.error_receipt.sequence >= ibc1.channel.upgrade_sequence
$RLY tx channel-upgrade execute ibc01 # the channel upgrade of ibc1 should be cancelled

0 comments on commit 12a3b0d

Please sign in to comment.