Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/google.golang.org/grpc…
Browse files Browse the repository at this point in the history
…-1.66.0
  • Loading branch information
gsk967 authored Sep 24, 2024
2 parents 8b9817f + c94c01d commit ee3d38f
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
files: "**/*.md"
separator: ","
- uses: DavidAnson/markdownlint-cli2-action@v16
- uses: DavidAnson/markdownlint-cli2-action@v17
if: steps.changed-files.outputs.any_changed == 'true'
with:
globs: ${{ steps.changed-files.outputs.all_changed_files }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-umee-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

concurrency:
group: ci-${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true
cancel-in-progress: false

jobs:
umeed-docker:
Expand Down Expand Up @@ -46,8 +46,8 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Generate swagger docs

- name: Generate swagger docs
run: |
make proto-swagger-gen
make proto-update-swagger-docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/simulations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

concurrency:
group: ci-${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true
cancel-in-progress: false

jobs:
install-dependencies:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

concurrency:
group: ci-${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true
cancel-in-progress: false

jobs:
install-tparse:
Expand Down
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ issues:
max-same-issues: 50

linters-settings:
gosec:
excludes:
- G115 # FIXME temporarily suppress 'G115: integer overflow conversion': it produces many hits, some of which may be false positives, and need to be looked at;
dogsled:
max-blank-identifiers: 3
misspell:
Expand Down
10 changes: 4 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ require (
cosmossdk.io/math v1.3.0
cosmossdk.io/tools/rosetta v0.2.1
github.com/CosmWasm/wasmd v0.45.0
github.com/CosmWasm/wasmvm v1.5.4
github.com/CosmWasm/wasmvm v1.5.5
github.com/cometbft/cometbft v0.37.10
github.com/cometbft/cometbft-db v0.12.0
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.47.13
github.com/cosmos/cosmos-sdk v0.47.14
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/gogoproto v1.4.10 // NOTE: v1.4.11+ is not compatible with sdk v0.47
github.com/cosmos/gogoproto v1.7.0 // NOTE: v1.4.11+ is not compatible with sdk v0.47
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3
github.com/cosmos/ibc-go/v7 v7.7.0
github.com/golang/mock v1.6.0
Expand Down Expand Up @@ -46,7 +46,7 @@ require (
cloud.google.com/go/storage v1.38.0 // indirect
cosmossdk.io/core v0.5.1 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/log v1.3.1 // indirect
cosmossdk.io/log v1.4.1 // indirect
dario.cat/mergo v1.0.0 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
Expand Down Expand Up @@ -230,6 +230,4 @@ replace (
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
// stick with compatible version or x/exp in v0.47.x line for gogoproto v1.4.10
golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
)
52 changes: 38 additions & 14 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/e2e/e2e_ibc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ func (s *E2ETest) TestIBCTokenTransfer() {
// compute the amout of UMEE sent to gaia which would meet umee's token quota
umeePrice, err := s.QueryHistAvgPrice(umeeAPIEndpoint, umeeSymbol)
s.Require().NoError(err)
s.Require().True(umeePrice.GT(sdk.MustNewDecFromStr("0.001")),
"umee price should be non zero, and expecting higher than 0.001, got: %s", umeePrice)
s.Require().True(umeePrice.GT(sdk.MustNewDecFromStr("0")),
"umee price should be non zero, and expecting higher than 0, got: %s", umeePrice)
umeeQuota := sdk.NewCoin(appparams.BondDenom,
sdk.NewDecFromInt(tokenQuota).Quo(umeePrice).Mul(powerReduction).RoundInt(),
)
Expand Down

0 comments on commit ee3d38f

Please sign in to comment.