Skip to content

Commit

Permalink
Merge branch 'main' into chores/addtional_workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
hoangdv2429 committed Mar 22, 2024
2 parents 3390cb6 + 3c6ace8 commit 915d50e
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
# codeowner specified below. For this reason, the global codeowners
# are often repeated in package-level definitions.
* @dymensionxyz/core-dev
* @dymensionxyz/decentrio

50 changes: 50 additions & 0 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: E2E Tests

on:
workflow_dispatch:
pull_request:
types:
# trigger workflow if PR is opened directly as R4R.
- opened
# trigger workflow if changes are pushed to the branch.
- synchronize
# trigger workflow if PR is marked ready for review.
- ready_for_review
paths-ignore:
- 'docs/**'
- '**.md'
- 'LICENSE'

permissions:
contents: read
packages: write

jobs:
build-image:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build and export
uses: docker/build-push-action@v5
with:
file: Dockerfile
context: .
outputs: type=docker,dest=/tmp/e2e.tar
platforms: linux/amd64
tags: |
ghcr.io/dymensionxyz/rollapp-wasm:e2e
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: e2e
path: /tmp/e2e.tar
e2e-tests:
needs: build-image
uses: dymensionxyz/e2e-tests/.github/workflows/e2e-test-workflow-call.yml@main
with:
rollapp_wasm_ci: "e2e"
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ ENV GOROOT=/usr/local/go
ENV GOPATH=$HOME/go
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH

RUN apt-get update -y
RUN apt-get install build-essential -y
# Set the working directory
WORKDIR /app

Expand Down
9 changes: 5 additions & 4 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"

errorsmod "cosmossdk.io/errors"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
)
Expand Down Expand Up @@ -58,19 +59,19 @@ func GetAnteDecorators(options HandlerOptions) []sdk.AnteDecorator {
func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
//From x/auth/ante.go
if options.AccountKeeper == nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
}

if options.BankKeeper == nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
}

if options.SignModeHandler == nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
}

if options.WasmConfig == nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
}

return sdk.ChainAnteDecorators(GetAnteDecorators(options)...), nil
Expand Down

0 comments on commit 915d50e

Please sign in to comment.