faddat/re merge main #1274

faddat · 2023-03-19T12:04:22Z

When I did a second pass on main, I noticed that some things were not handled ideally while linting. This makes the sdk 47 branch more ideal and clearer.

lint main branch, autofixes
imported more than once
ica, keeper test, reflection test, types test
resolve ineffectual assignments
unused parameters
receiver naming
redefines-builtin-id
constants
remove unused functions
configure revive
all error return values checked
unexported returns
unecessary type conversions
deprecation notices
if-return
indent-error-flow
unused results
finish cleanup of lints

github-advanced-security · 2023-03-19T12:19:38Z

You have successfully added a new CodeQL configuration .github/workflows/codeql-analizer.yml:CodeQL-Build. As part of the setup process, we have scanned this repository and found 12 existing alerts. Please check the repository Security tab to see all alerts.

codecov · 2023-03-19T21:04:31Z

Codecov Report

❗ No coverage uploaded for pull request base (develop_sdk47@6ad6739). Click here to learn what that means.
The diff coverage is 87.87%.

@@               Coverage Diff                @@
##             develop_sdk47    #1274   +/-   ##
================================================
  Coverage                 ?   59.49%           
================================================
  Files                    ?       57           
  Lines                    ?     7320           
  Branches                 ?        0           
================================================
  Hits                     ?     4355           
  Misses                   ?     2652           
  Partials                 ?      313

Impacted Files	Coverage Δ
x/wasm/client/cli/new_tx.go	`0.00% <ø> (ø)`
x/wasm/module.go	`39.02% <40.00%> (ø)`
x/wasm/keeper/handler_plugin_encoders.go	`80.30% <66.66%> (ø)`
x/wasm/keeper/ibc.go	`77.77% <100.00%> (ø)`
x/wasm/keeper/keeper.go	`86.73% <100.00%> (ø)`
x/wasm/keeper/proposal_handler.go	`64.82% <100.00%> (ø)`
x/wasm/keeper/querier.go	`72.07% <100.00%> (ø)`
x/wasm/keeper/snapshotter.go	`65.07% <100.00%> (ø)`
x/wasm/types/authz.go	`83.39% <100.00%> (ø)`
x/wasm/types/types.go	`57.70% <100.00%> (ø)`

alpe

Some minor nits if you want to follow up on them later. Not blocking the PR, thanks! 💐

alpe · 2023-03-20T08:00:04Z

.golangci.yml

-    # print struct with more effective memory layout or not, false by default
-    suggest-new: true
+  revive:
+    # When set to false, ignores files with "GENERATED" header, similar to golint


This comment is very confusing for me. Shouldn't it be When set to true ? I saw this in the original doc as well. 🤷

alpe · 2023-03-20T08:02:56Z

x/wasm/ibctesting/chain.go

@@ -550,11 +550,11 @@ func (chain *TestChain) CreatePortCapability(scopedKeeper capabilitykeeper.Scope
 	_, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), host.PortPath(portID))
 	if !ok {
 		// create capability using the IBC capability keeper
-		cap, err := chain.App.ScopedIBCKeeper.NewCapability(chain.GetContext(), host.PortPath(portID))
+		portCap, err := chain.App.ScopedIBCKeeper.NewCapability(chain.GetContext(), host.PortPath(portID))


This and others: the chain.go originates from the ibc-go project. While the var names are more readable and verbose, we will have more conflicts when comparing the file to the original source for updates. Please consider also contributing this to ibc-go.

alpe · 2023-03-20T08:04:19Z

x/wasm/ibctesting/coordinator.go

-	if err := path.EndpointB.UpdateClient(); err != nil {
-		return err
-	}
+	err := path.EndpointB.UpdateClient()


This and others: no need to keep an var:

Suggested change

err := path.EndpointB.UpdateClient()

return path.EndpointB.UpdateClient()

alpe · 2023-03-20T08:05:03Z

x/wasm/keeper/querier.go

@@ -18,21 +18,21 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 )

-var _ types.QueryServer = &grpcQuerier{}
+var _ types.QueryServer = &GrpcQuerier{}


* Start cosmos-sdk v0.47 integration (#1136) * Upgrade to sdk v0.47 branch * More integration work * SDK version upgrade; fixes * More fixes * Fixes * Deactivate failing tests * SDK + ibc-go version upgrades * limix gas fix (cherry picked from commit f7f8417) * with valset in bench (cherry picked from commit 35b2a8f) * Revert staking query handler; fix tests * Minor cleanup * Rebased * Address linter issues * Set legacy router proper * Deactivate failing test. Race condition needs to handled in SDK * Address some code smells * Bump sdk version * Use gov v1 internally for votes * Activate test after sdk fix * Add group test * Add config template for wasm fields * Add Rust backtrace flag for more debug output on simulations * Set unique node folder for tests * Revert "Add Rust backtrace flag for more debug output on simulations" This reverts commit 218c3c6. * Simulations * Run also im/export + deterministic sims * Add package prefix to interfaces * Add signer annotation (cosmos/cosmos-sdk#10933), minor cleanup * Bump sdk version * Review comments Co-authored-by: vuong <nguyenvuong1122000@gmail.com> * Bump bufbuild/buf-setup-action from 1.11.0 to 1.12.0 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.11.0...v1.12.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit f490595) * Remove intertx for vanilla ICA * fix msg format in EVENTS.md (cherry picked from commit 38d466a) * Better to sdk coin convertion (#1164) * Better to sdk coin convertion * Review feedback (cherry picked from commit a925a9e) * Disallow only address permission (#1163) * Remove AccessTypeOnlyAddress for store msg * Remove AccessTypeOnlyAddress for update config msg * Review feedback Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com> Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com> (cherry picked from commit 8991633) * Integrate wasmvm v1.2.0 (backport #1161) (#1175) * Integrate wasmvm v1.2.0 (#1161) * Bump wasmvm version * Bump wasm test contracts * Encode weighted votes * Encode instantiate2 * Handle code info query; better wasmvm errors * Fix readme * Make linter happy * add non cgo build * Review comments * Bump wasmvm to release version Co-authored-by: jhernandezb <contact@jhernandez.me> (cherry picked from commit 957b38e) # Conflicts: # x/wasm/keeper/handler_plugin_encoders.go # x/wasm/keeper/handler_plugin_encoders_test.go # x/wasm/keeper/keeper.go # x/wasm/keeper/keeper_test.go * Adress merge conflicts Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Bump bufbuild/buf-setup-action from 1.12.0 to 1.13.0 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit ffa0e5e) * Emit events for setContractAdmin + setAccessConfig (#1179) (cherry picked from commit c9e7830) * Dependency upgrades (#1172) * Bump sdk version to lastest * Bump ibc-go version to lastest * Remove channel hack * Update to ibc-go v7 + protoVer=0.11.5 * Bump bufbuild/buf-setup-action from 1.13.0 to 1.13.1 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.13.0 to 1.13.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.13.0...v1.13.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit de27e7f) * Fix typos (backport #1185) (#1194) * Fix typos (cherry picked from commit c88b819) # Conflicts: # proto/cosmwasm/wasm/v1/tx.proto * Fix merge conflict --------- Co-authored-by: Alex Peters <alpe@users.noreply.github.com> * Bump bufbuild/buf-setup-action from 1.13.1 to 1.14.0 (#1200) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.13.1 to 1.14.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.13.1...v1.14.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit f3fc31c) * list-contract-by-code bugfix (cherry picked from commit 2ccffed) * fix: stargate querier does not reset the state (cherry picked from commit fd03235) * test: add unit test (cherry picked from commit 6d8018a) * Add Windows client support (#1197) * Add Windows client support * Separate server and windows client --------- Co-authored-by: Alex Peters <alpe@users.noreply.github.com> (cherry picked from commit 8a20779) * Bump bufbuild/buf-setup-action from 1.14.0 to 1.15.0 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit e5fab3d) * Rename windows client binary (cherry picked from commit de09c7f) * Return IBC packet sequence number (backport #1225) (#1233) * Return IBC packet sequence number (#1225) * Return IBC packet sequence number * Fix review feedbacks * Remove names to return values in DispatchMsg method * Fix comments (cherry picked from commit 4f1c57f) # Conflicts: # x/wasm/keeper/handler_plugin.go * Fix merge conflict --------- Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: Alex Peters <alpe@users.noreply.github.com> * Test rust panic for regression (cherry picked from commit a52e604) * Fix client checksum verification (#1234) * Fix client checksum verification * Review comments (cherry picked from commit 1a8019b) # Conflicts: # x/wasm/client/cli/gov_tx.go * Fix merge conflict * Fix linters * Configure sonarcloud analysis (cherry picked from commit 85cf161) * Bump bufbuild/buf-setup-action from 1.15.0 to 1.15.1 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.15.0 to 1.15.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.15.0...v1.15.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit 730ea5a) * Make `CaptureIbcEvents` in ibctesting public. Before this change, it wasn't possible to implement the `chain.SendMsgs` method without [copying](https://github.com/public-awesome/ics721/blob/main/e2e/suite_helpers.go#L81-L98) them over. (cherry picked from commit b64fa07) * Upgrade to wasmvm 1.2.1 (backport #1245) (#1254) * Upgrade to wasmvm 1.2.1 (#1245) * Use wasmvm store adapter * Bump wasmvm to v1.2.1 (cherry picked from commit 850f901) # Conflicts: # go.mod # go.sum # x/wasm/keeper/keeper.go * Resolve conflicts --------- Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * WIP All cometbft (#1244) * Dep upgrade; use CometBft * Remove duplicte message events * Add changelog for v0.31.0 (#1188) * Start changelog for v0.31.0 * Add ICA upgrade * Add proto version link to buf.build * Update changelog (#1239) * Update changelog * Update changelog with latest changes * Set release date --------- Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> (cherry picked from commit bc0e817) * Remove new message type event * Support msg update params gov proposal (#1247) * Add MsgUpdateParams support * Implement UpdateParams msg * Fix test UpdateParams * Add migration test * Fix * Fix lint issues * Revert changes according to review feedback * Remove more x/params dependencies * Remove x/params from genesis test * Formatting * Restore old changes * fix lint * Fix tests and restructure migrations * Rename alias for convention --------- Co-authored-by: Alex Peters <alpe@users.noreply.github.com> * Fix test data generator (#1263) * linting 47 pr (#1261) * lint cosmwasm for sdk 47 * fix * remove setGenesis * remove additional unused functions * pass tests * use SDK's errors module * unecessary conversions * unnecessary conversions * remove unneeded event manager * complete linting of tests for 47 * add test for reimportation * check errors * Update x/wasm/keeper/proposal_integration_test.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * apply suggestion * suggestions * lints * don't return error in when making new transactions * no todo's in the code * Fix test data generator * Update x/wasm/types/genesis_test.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * use the full string invalid address (2 words) always --------- Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Regenerate from proto; remove dead code; polish code * Set SDK version to v0.47x.0 (#1262) * Set SDK version to v0.47x.0 * Set chainID * Minor updates * Set chainID for simulations * Buf mod update * Use sdk tag instead of hash in buf * Bump ibc-go to v7.0.0 * faddat/re merge main (#1274) undefined --------- Co-authored-by: vuong <nguyenvuong1122000@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: llllllluc <58892938+llllllluc@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Gjermund Garaba <gjermund@garaba.net> Co-authored-by: Nikhil Suri <nikhilsuri@comcast.net> Co-authored-by: Paul <p22626262@gmail.com> Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: ekez <zekemedley@gmail.com> Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>

faddat added 19 commits March 18, 2023 01:30

lint main branch, autofixes

b559ff5

imported more than once

d8526f4

ica, keeper test, reflection test, types test

f86e119

resolve ineffectual assignments

830095b

unused parameters

e14a5a6

receiver naming

d0495f9

redefines-builtin-id

3174135

constants

4d91b31

remove unused functions

c2695a9

configure revive

ef051fd

all error return values checked

2e7038a

unexported returns

265cd2f

unecessary type conversions

ccd6037

deprecation notices

bc40665

if-return

4e57195

indent-error-flow

3bed659

unused results

58c1e1a

finish cleanup of lints

1a91d7b

Merge branch 'lint-main' into develop_sdk47

b8acd40

faddat requested a review from alpe as a code owner March 19, 2023 12:04

ignore possible nil pointer dereference

2dcfc91

alpe approved these changes Mar 20, 2023

View reviewed changes

alpe merged commit 49ed6f0 into CosmWasm:develop_sdk47 Mar 20, 2023

faddat mentioned this pull request Mar 20, 2023

lint main branch #1272

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

faddat/re merge main #1274

faddat/re merge main #1274

faddat commented Mar 19, 2023 •

edited

Loading

github-advanced-security bot commented Mar 19, 2023

codecov bot commented Mar 19, 2023 •

edited

Loading

alpe left a comment •

edited

Loading

alpe Mar 20, 2023

alpe Mar 20, 2023

alpe Mar 20, 2023

alpe Mar 20, 2023

	err := path.EndpointB.UpdateClient()
	return path.EndpointB.UpdateClient()

faddat/re merge main #1274

faddat/re merge main #1274

Conversation

faddat commented Mar 19, 2023 • edited Loading

github-advanced-security bot commented Mar 19, 2023

codecov bot commented Mar 19, 2023 • edited Loading

Codecov Report

alpe left a comment • edited Loading

Choose a reason for hiding this comment

alpe Mar 20, 2023

Choose a reason for hiding this comment

alpe Mar 20, 2023

Choose a reason for hiding this comment

alpe Mar 20, 2023

Choose a reason for hiding this comment

alpe Mar 20, 2023

Choose a reason for hiding this comment

faddat commented Mar 19, 2023 •

edited

Loading

codecov bot commented Mar 19, 2023 •

edited

Loading

alpe left a comment •

edited

Loading