Skip to content

Commit

Permalink
Merge pull request #4273 from notional-labs/refresh-sdk-50
Browse files Browse the repository at this point in the history
deps: merge changes from main into sdk 50 branch
  • Loading branch information
colin-axner authored Aug 7, 2023
2 parents 72bf690 + 1f0e922 commit 4e1d13e
Show file tree
Hide file tree
Showing 170 changed files with 1,330 additions and 689 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
Expand Down
4 changes: 3 additions & 1 deletion .github/compatibility-test-matrices/main/ica-chain-a.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
4 changes: 3 additions & 1 deletion .github/compatibility-test-matrices/main/ica-chain-b.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
],
"test": [
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour"
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
4 changes: 3 additions & 1 deletion .github/compatibility-test-matrices/unreleased/client.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"TestClientTestSuite"
],
"test": [
"TestClientUpdateProposal_Succeeds"
"TestClientUpdateProposal_Succeeds",
"TestClient_Update_Misbehaviour",
"TestAllowedClientsParam"
],
"relayer-type": [
"rly"
Expand Down
4 changes: 3 additions & 1 deletion .github/compatibility-test-matrices/unreleased/ica.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
"test": [
"TestMsgSendTx_SuccessfulTransfer",
"TestMsgSendTx_FailedTransfer_InsufficientFunds",
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA"
"TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
"TestControllerEnabledParam",
"TestHostEnabledParam"
],
"relayer-type": [
"rly"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
- name: golangci-lint
uses: golangci/[email protected]
with:
version: v1.53.1
version: v1.53.3
args: --timeout 5m
77 changes: 54 additions & 23 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ run:
linters:
disable-all: true
enable:
- dogsled
- exportloopref
- errcheck
- gci
Expand All @@ -20,32 +19,24 @@ linters:
- nakedret
- staticcheck
- thelper
- typecheck
- stylecheck
- revive
- typecheck
- tenv
- unconvert
- unused
- misspell

issues:
exclude-rules:
- text: 'unused-parameter'
- text: 'differs only by capitalization to method'
linters:
- revive
- text: 'SA1019:'
linters:
- staticcheck
- text: 'Use of weak random number generator'
linters:
- gosec
- text: 'ST1003:'
linters:
- stylecheck
# FIXME: Disabled until golangci-lint updates stylecheck with this fix:
# https://github.com/dominikh/go-tools/issues/389
- text: 'ST1016:'
linters:
- stylecheck

max-issues-per-linter: 10000
max-same-issues: 10000

Expand All @@ -61,17 +52,57 @@ linters-settings:
- prefix(github.com/cometbft/cometbft)
- prefix(github.com/cosmos/ibc-go)
custom-order: true
dogsled:
max-blank-identifiers: 3
maligned:
# print struct with more effective memory layout or not, false by default
suggest-new: true
nolintlint:
allow-unused: false
allow-leading-space: true
require-explanation: false
require-specific: false
revive:
enable-all-rules: true
# Do NOT whine about the following, full explanation found in:
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#description-of-available-rules
rules:
- name: use-any
disabled: true
- name: if-return
disabled: true
- name: max-public-structs
disabled: true
- name: cognitive-complexity
disabled: true
- name: argument-limit
disabled: true
- name: cyclomatic
disabled: true
- name: file-header
disabled: true
- name: function-length
disabled: true
- name: function-result-limit
disabled: true
- name: line-length-limit
disabled: true
- name: flag-parameter
disabled: true
- name: add-constant
disabled: true
- name: empty-lines
disabled: true
- name: banned-characters
disabled: true
- name: deep-exit
disabled: true
- name: confusing-results
disabled: true
- name: unused-parameter
disabled: true
- name: modifies-value-receiver
disabled: true
- name: early-return
disabled: true
- name: confusing-naming
disabled: true
- name: defer
disabled: true
- name: unhandled-error
disabled: false
arguments:
- 'fmt.Printf'
- 'fmt.Print'
- 'fmt.Println'
- 'myFunction'
9 changes: 7 additions & 2 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,11 @@ module.exports = {
directory: false,
path: "/apps/interchain-accounts/parameters.html",
},
{
title: "Tx Encoding",
directory: false,
path: "/apps/interchain-accounts/tx-encoding.html",
},
{
title: "Client",
directory: false,
Expand Down Expand Up @@ -314,7 +319,7 @@ module.exports = {
directory: false,
path: "/apps/interchain-accounts/legacy/keeper-api.html",
},
]
],
},
],
},
Expand Down Expand Up @@ -425,7 +430,7 @@ module.exports = {
directory: false,
path: "/ibc/light-clients/setup.html",
},
]
],
},
{
title: "Localhost",
Expand Down
2 changes: 1 addition & 1 deletion docs/apps/interchain-accounts/active-channels.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
order: 8
order: 9
-->

# Understanding Active Channels
Expand Down
Loading

0 comments on commit 4e1d13e

Please sign in to comment.