Skip to content

Commit

Permalink
Merge branch 'refactor_genesis_types' into charly/2052_sendtx_rpc_msgs
Browse files Browse the repository at this point in the history
  • Loading branch information
charleenfei committed Aug 26, 2022
2 parents aa6ce16 + bd25b55 commit 6e6fe62
Show file tree
Hide file tree
Showing 43 changed files with 1,360 additions and 1,185 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e-fork.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- id: set-matrix
run: echo "::set-output name=matrix::$(go run cmd/build_test_matrix/main.go)"
env:
TEST_EXCLUSIONS: "TestInterchainAccountsTestSuite"
TEST_EXCLUSIONS: "TestInterchainAccountsTestSuite,TestIncentivizedInterchainAccountsTestSuite"

e2e:
env:
Expand All @@ -51,4 +51,4 @@ jobs:
RLY_TAG: "v2.0.0-rc2"
run: |
cd e2e
make e2e-test suite=${{ matrix.suite }} test=${{ matrix.test }}
make e2e-test entrypoint=${{ matrix.entrypoint }} test=${{ matrix.test }}
1 change: 1 addition & 0 deletions .github/workflows/e2e-manual-icad.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
type: choice
options:
- TestInterchainAccountsTestSuite
- TestIncentivizedInterchainAccountsTestSuite
chain-image:
description: 'The image to use for chain A'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-manual-simd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
type: choice
options:
- TestTransferTestSuite
- TestFeeMiddlewareTestSuite
- TestIncentivizedTransferTestSuite
chain-image:
description: 'The image to use for chain A'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test-workflow-call.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@ jobs:
- name: Run e2e Test
run: |
cd e2e
make e2e-test suite=${{ matrix.suite }} test=${{ matrix.test }}
make e2e-test entrypoint=${{ matrix.entrypoint }} test=${{ matrix.test }}
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
relayer-tag: "v2.0.0-rc2"
chain-binary: "simd"
# on regular PRs we won't run interchain account tests.
test-exclusions: "TestInterchainAccountsTestSuite"
test-exclusions: "TestInterchainAccountsTestSuite,TestIncentivizedInterchainAccountsTestSuite"
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Dependencies

* [\#1653](https://github.com/cosmos/ibc-go/pull/1653) Bump SDK version to v0.46
* [\#2124](https://github.com/cosmos/ibc-go/pull/2124) Bump SDK version to v0.46.1

### API Breaking

Expand Down Expand Up @@ -87,6 +88,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (client) [\#724](https://github.com/cosmos/ibc-go/pull/724) `IsRevisionFormat` and `IsClientIDFormat` have been updated to disallow newlines before the dash used to separate the chainID and revision number, and the client type and client sequence.
* (02-client/cli) [\#897](https://github.com/cosmos/ibc-go/pull/897) Remove `GetClientID()` from `Misbehaviour` interface. Submit client misbehaviour cli command requires an explicit client id now.
* (06-solomachine) [\#1972](https://github.com/cosmos/ibc-go/pull/1972) Solo machine implementation of `ZeroCustomFields` fn now panics as the fn is only used for upgrades which solo machine does not support.
* (apps/27-interchain-accounts) [\#2102](https://github.com/cosmos/ibc-go/pull/2102) ICS27 controller middleware now supports a nil underlying application. This allows chains to make use of interchain accounts with existing auth mechanisms such as x/group and x/gov.

### Features

Expand Down
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,25 @@ The Inter-Blockchain Communication protocol (IBC) allows blockchains to talk to

For an overview of upcoming changes to ibc-go take a look at the [roadmap](./docs/roadmap/roadmap.md).

## Ecosystem

Discover the applications, middleware and light clients developed by other awesome teams in the ecosystem:

In the table below
`app` refers to IBC application modules for custom use cases and
`middleware` refers to modules that wrap an IBC application enabling custom logic to be executed.


|Description|Repository|Type|
|----------|----------|----|
|An application that enables on chain querying of another IBC enabled chain utilizing `baseapp.Query`. Both chains must have implemented the query application and ICA (for queries requiring consensus).|[ICQ](https://github.com/strangelove-ventures/ibc-go/tree/feature/icq_implementation/modules/apps/icq)|`app`|
|An application that enables on chain querying of another IBC enabled chains state without the need for the chain being queried to implement the application.|[interchain-queries](https://github.com/ingenuity-build/interchain-queries)|`app`|
|An application that enables on chain querying of another IBC enabled chains state without the need for the chain being queried to implement the application. Similar to the interchain-queries application in the row above but without callbacks.|[query](https://github.com/defund-labs/defund/tree/main/x/query)|`app`|
|An application that enables cross chain NFT transfer.|[NFT Transfer (ICS 721)](https://github.com/bianjieai/ibc-go/tree/ics-721-nft-transfer)|`app`|
|Middleware enabling a packet to be sent to a destination chain via an intermediate chain, e.g. going from Juno to Osmosis via the Hub.|[packet-forward-middleware](https://github.com/strangelove-ventures/packet-forward-middleware)|`middleware`|
|Middleware enabling the recovery of tokens sent to unsupported addresses.|[recovery](https://github.com/evmos/evmos/tree/main/x/recovery)|`middleware`|
|Middleware that limits the in or out flow of an asset in a certain time period to minimise the risks of cross chain token transfers.|[IBC-rate-limiting](https://github.com/osmosis-labs/osmosis/pull/2339)|`middleware`|

## Support

We have active, helpful communities on Discord and Telegram.
Expand Down
8 changes: 4 additions & 4 deletions cmd/build_test_matrix/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ type GithubActionTestMatrix struct {
}

type TestSuitePair struct {
Test string `json:"test"`
Suite string `json:"suite"`
Test string `json:"test"`
EntryPoint string `json:"entrypoint"`
}

func main() {
Expand Down Expand Up @@ -123,8 +123,8 @@ func getGithubActionMatrixForTests(e2eRootDirectory, suite string, exlcudedItems
for testSuiteName, testCases := range testSuiteMapping {
for _, testCaseName := range testCases {
gh.Include = append(gh.Include, TestSuitePair{
Test: testCaseName,
Suite: testSuiteName,
Test: testCaseName,
EntryPoint: testSuiteName,
})
}
}
Expand Down
32 changes: 16 additions & 16 deletions cmd/build_test_matrix/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ func TestGetGithubActionMatrixForTests(t *testing.T) {
expected := GithubActionTestMatrix{
Include: []TestSuitePair{
{
Suite: "TestFeeMiddlewareTestSuite",
Test: "TestA",
EntryPoint: "TestFeeMiddlewareTestSuite",
Test: "TestA",
},
{
Suite: "TestFeeMiddlewareTestSuite",
Test: "TestB",
EntryPoint: "TestFeeMiddlewareTestSuite",
Test: "TestB",
},
},
}
Expand All @@ -56,20 +56,20 @@ func TestGetGithubActionMatrixForTests(t *testing.T) {
expected := GithubActionTestMatrix{
Include: []TestSuitePair{
{
Suite: "TestTransferTestSuite",
Test: "TestC",
EntryPoint: "TestTransferTestSuite",
Test: "TestC",
},
{
Suite: "TestFeeMiddlewareTestSuite",
Test: "TestA",
EntryPoint: "TestFeeMiddlewareTestSuite",
Test: "TestA",
},
{
Suite: "TestFeeMiddlewareTestSuite",
Test: "TestB",
EntryPoint: "TestFeeMiddlewareTestSuite",
Test: "TestB",
},
{
Suite: "TestTransferTestSuite",
Test: "TestD",
EntryPoint: "TestTransferTestSuite",
Test: "TestD",
},
},
}
Expand Down Expand Up @@ -116,19 +116,19 @@ func assertGithubActionTestMatricesEqual(t *testing.T, expected, actual GithubAc
sort.SliceStable(expected.Include, func(i, j int) bool {
memberI := expected.Include[i]
memberJ := expected.Include[j]
if memberI.Suite == memberJ.Suite {
if memberI.EntryPoint == memberJ.EntryPoint {
return memberI.Test < memberJ.Test
}
return memberI.Suite < memberJ.Suite
return memberI.EntryPoint < memberJ.EntryPoint
})

sort.SliceStable(actual.Include, func(i, j int) bool {
memberI := actual.Include[i]
memberJ := actual.Include[j]
if memberI.Suite == memberJ.Suite {
if memberI.EntryPoint == memberJ.EntryPoint {
return memberI.Test < memberJ.Test
}
return memberI.Suite < memberJ.Suite
return memberI.EntryPoint < memberJ.EntryPoint
})
assert.Equal(t, expected.Include, actual.Include)
}
Expand Down
Loading

0 comments on commit 6e6fe62

Please sign in to comment.