Skip to content
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

feat!: pfm x/params migration + msg_server #128

Merged
merged 15 commits into from
Nov 6, 2023
Merged

feat!: pfm x/params migration + msg_server #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
795a7d3
feat: pfm params migration & msg server
Reecepbcups Oct 27, 2023
166e40a
add e2e upgrade (v2)
Reecepbcups Oct 27, 2023
b58d3bd
make the linter happy
Reecepbcups Oct 27, 2023
60fbe4c
remove leading WORKING_DIRECTORY /
Reecepbcups Oct 27, 2023
b88eb00
relative image path
Reecepbcups Oct 27, 2023
0f2fa62
only migrate packetforward subspace
Reecepbcups Oct 27, 2023
5830c7e
skip other keytables
Reecepbcups Oct 27, 2023
7aae97d
query params after upgrade test
Reecepbcups Oct 27, 2023
7cc6ce3
remove duplicate keys
Reecepbcups Oct 27, 2023
f71f7f9
packetforward query namespace
Reecepbcups Oct 27, 2023
dbadb8a
pfm migrate validation
Reecepbcups Nov 3, 2023
d6fca16
Merge branch 'main' into reece/pfm-params-migration
Reecepbcups Nov 3, 2023
0c529b6
var p types.Params
Reecepbcups Nov 6, 2023
158652b
godoc nit
Reecepbcups Nov 6, 2023
3b5ba48
fmt migration "1->2"
Reecepbcups Nov 6, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/async-icq.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
env:
LINT_VERSION: v1.52
GO_VERSION: 1.21.0
WORKING_DIRECTORY: modules/async-icq/
WORKING_DIRECTORY: modules/async-icq

HOST_TAR_PATH: /tmp/icq-host.tar
HOST_IMAGE_NAME: icq-host
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ibc-hooks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
env:
LINT_VERSION: v1.52
GO_VERSION: 1.21.0
WORKING_DIRECTORY: modules/ibc-hooks/
WORKING_DIRECTORY: modules/ibc-hooks

jobs:
golangci:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/packet-forward-middleware.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
env:
LINT_VERSION: v1.52
GO_VERSION: 1.21.0
WORKING_DIRECTORY: middleware/packet-forward-middleware/
WORKING_DIRECTORY: middleware/packet-forward-middleware

DOCKER_TAG: pfm:local
TAR_PATH: /tmp/pfm-docker-image.tar
Expand Down Expand Up @@ -46,8 +46,7 @@ jobs:
build-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Setup Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
Expand Down Expand Up @@ -81,16 +80,16 @@ jobs:
test:
- "ictest-forward"
- "ictest-timeout"
- "ictest-upgrade"
fail-fast: false

steps:
- name: Set up Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VERSION }}

- name: checkout chain
uses: actions/checkout@v4

- uses: actions/checkout@v4

- name: Download Tarball Artifact
uses: actions/download-artifact@v3
Expand All @@ -101,7 +100,8 @@ jobs:
- name: Load Docker Image
run: |
docker image load -i ${{ env.TAR_PATH }}
docker image load -i testing/previous_images/pfm_7_0_1.tar
docker image ls -a

- name: Run Test
run: make ${{ matrix.test }}
run: make ${{ matrix.test }}
3 changes: 3 additions & 0 deletions middleware/packet-forward-middleware/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ ictest-forward:
ictest-timeout:
cd e2e && go test -race -v -timeout 15m -run TestTimeoutOnForward .

ictest-upgrade:
cd e2e && go test -race -v -timeout 15m -run TestPFMUpgrade .

###############################################################################
### Linting ###
###############################################################################
Expand Down
26 changes: 14 additions & 12 deletions middleware/packet-forward-middleware/e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ go 1.20
require (
cosmossdk.io/math v1.1.2
github.com/cosmos/cosmos-sdk v0.47.5
github.com/cosmos/ibc-go/v7 v7.3.0
github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230927173125-c26d2e206839
github.com/cosmos/gogoproto v1.4.10
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-00000000000000-000000000000
github.com/cosmos/ibc-go/v7 v7.3.1
github.com/docker/docker v24.0.5+incompatible
github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20231025031208-463fdf2292e8
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.25.0
go.uber.org/zap v1.26.0
)

require (
Expand Down Expand Up @@ -37,7 +40,6 @@ require (
github.com/armon/go-metrics v0.4.1 // indirect
github.com/avast/retry-go/v4 v4.5.0 // indirect
github.com/aws/aws-sdk-go v1.44.203 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
Expand All @@ -46,7 +48,7 @@ require (
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/cockroachdb/errors v1.10.0 // indirect
github.com/cockroachdb/errors v1.11.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
Expand All @@ -57,7 +59,6 @@ require (
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/gogoproto v1.4.10 // indirect
github.com/cosmos/iavl v0.20.0 // indirect
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1 // indirect
github.com/cosmos/ics23/go v0.10.0 // indirect
Expand All @@ -76,7 +77,6 @@ require (
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.5+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down Expand Up @@ -121,6 +121,7 @@ require (
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
github.com/huandu/skiplist v1.2.0 // indirect
github.com/iancoleman/orderedmap v0.2.0 // indirect
github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down Expand Up @@ -165,16 +166,16 @@ require (
github.com/pierrec/xxHash v0.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/rakyll/statik v0.1.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/rs/zerolog v1.30.0 // indirect
github.com/rs/zerolog v1.31.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
Expand All @@ -201,7 +202,7 @@ require (
golang.org/x/net v0.14.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/tools v0.12.0 // indirect
Expand Down Expand Up @@ -237,6 +238,7 @@ replace (
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 //indirect
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 => ../
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7
)
Loading
Loading