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.

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

chore: upgrade rate-limiting to ibc-go v10 #234

Merged
merged 7 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 18 additions & 7 deletions .github/workflows/rate-limiting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,25 @@ jobs:
name: Linter
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: golangci-lint
uses: golangci/golangci-lint-action@v2
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.23"
check-latest: true
- uses: technote-space/get-diff-action@v6.1.2
id: git_diff
with:
version: ${{ env.LINT_VERSION }}
working-directory: ${{ env.WORKING_DIRECTORY }}
args: --timeout=5m
PATTERNS: |
**/*.go
go.mod
go.sum
**/go.mod
**/go.sum
- name: run linting
if: env.GIT_DIFF
run: |
cd ${{ env.WORKING_DIRECTORY }}
make lint
test:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion modules/rate-limiting/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# make local-image
# docker run --rm -it rate-limiting:local q

FROM golang:1.22-alpine3.18 as builder
FROM golang:1.23-alpine3.21 AS builder

RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make go;

Expand Down
7 changes: 6 additions & 1 deletion modules/rate-limiting/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,13 @@ clean:
gosec:
gosec -exclude-dir=deps -severity=high ./...

golangci_lint_cmd=golangci-lint
golangci_version=v1.60.1

lint:
golangci-lint run
@echo "--> Running linter"
@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
@$(golangci_lint_cmd) run --timeout=10m

###############################################################################
### Tests ###
Expand Down
6 changes: 3 additions & 3 deletions modules/rate-limiting/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ To add the rate limit module, wire it up in `app.go` in line with the following

// Import the rate limit module
import (
"github.com/cosmos/ibc-apps/modules/rate-limiting/v8/ratelimit"
ratelimitkeeper "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/ratelimit/keeper"
ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/ratelimit/types"
"github.com/cosmos/ibc-apps/modules/rate-limiting/v9/ratelimit"
ratelimitkeeper "github.com/cosmos/ibc-apps/modules/rate-limiting/v9/ratelimit/keeper"
ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v9/ratelimit/types"
)

...
Expand Down

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

2 changes: 1 addition & 1 deletion modules/rate-limiting/api/ratelimit/v1/genesis.pulsar.go

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

2 changes: 1 addition & 1 deletion modules/rate-limiting/api/ratelimit/v1/params.pulsar.go

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

2 changes: 1 addition & 1 deletion modules/rate-limiting/api/ratelimit/v1/query.pulsar.go

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

2 changes: 1 addition & 1 deletion modules/rate-limiting/api/ratelimit/v1/ratelimit.pulsar.go

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

2 changes: 1 addition & 1 deletion modules/rate-limiting/api/ratelimit/v1/tx.pulsar.go

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

2 changes: 1 addition & 1 deletion modules/rate-limiting/client/cli/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

"github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
"github.com/cosmos/ibc-apps/modules/rate-limiting/v9/types"
"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/client"
Expand Down
6 changes: 3 additions & 3 deletions modules/rate-limiting/depinject.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ratelimit

import (
modulev1 "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/api/ratelimit/module/v1"
"github.com/cosmos/ibc-apps/modules/rate-limiting/v8/keeper"
"github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
modulev1 "github.com/cosmos/ibc-apps/modules/rate-limiting/v9/api/ratelimit/module/v1"
"github.com/cosmos/ibc-apps/modules/rate-limiting/v9/keeper"
"github.com/cosmos/ibc-apps/modules/rate-limiting/v9/types"

"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/store"
Expand Down
2 changes: 1 addition & 1 deletion modules/rate-limiting/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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/modules/rate-limiting/v8 => ../
github.com/cosmos/ibc-apps/modules/rate-limiting/v9 => ../
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
)
Expand Down
Loading
Loading