fix: tidy up x/foundation (#597)

* chore: use handy functions on errors * refactor: call string implicitly * lint: lint * fix: remove legacy amino * docs: fix format of the example * test: add a begin blocker test * fix: change some errors to panic * docs: update CHANGELOG.md
Finschia · Jul 19, 2022 · aef879d · aef879d
1 parent 6331b66
commit aef879d
Show file tree

Hide file tree

Showing 31 changed files with 642 additions and 652 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (refactor) [\#493](https://github.com/line/lbm-sdk/pull/493) restructure x/consortium
 * (server/grpc) [\#526](https://github.com/line/lbm-sdk/pull/526) add index field into TxResponse
 * (cli) [\#535](https://github.com/line/lbm-sdk/pull/536) updated ostracon to v1.0.5; `unsafe-reset-all` command has been moved to the `ostracon` sub-command.
+* (x/foundation) [\#597](https://github.com/line/lbm-sdk/pull/597) tidy up x/foundation
 
 ### Bug Fixes
 * (x/wasm) [\#453](https://github.com/line/lbm-sdk/pull/453) modify wasm grpc query api path

diff --git a/x/foundation/authz_test.go b/x/foundation/authz_test.go
@@ -9,14 +9,14 @@ import (
 )
 
 func TestReceiveFromTreasuryAuthorization(t *testing.T) {
-	testCases := map[string]struct{
-		msg sdk.Msg
-		valid bool
+	testCases := map[string]struct {
+		msg    sdk.Msg
+		valid  bool
 		accept bool
 	}{
 		"valid": {
-			msg: &foundation.MsgWithdrawFromTreasury{},
-			valid: true,
+			msg:    &foundation.MsgWithdrawFromTreasury{},
+			valid:  true,
 			accept: true,
 		},
 		"msg mismatch": {

diff --git a/x/foundation/client/cli/tx.go b/x/foundation/client/cli/tx.go
@@ -461,7 +461,7 @@ Example of the content of policy-json:
   "threshold": "10",
   "windows": {
     "voting_period": "24h",
-    "min_execution_period": "0s",
+    "min_execution_period": "0s"
   }
 }
 `,

diff --git a/x/foundation/client/testutil/query.go b/x/foundation/client/testutil/query.go
@@ -57,7 +57,7 @@ func (s *IntegrationTestSuite) TestNewQueryCmdParams() {
 			s.Require().NoError(err)
 
 			var actual foundation.QueryParamsResponse
-			s.Require().NoError(val.ClientCtx.LegacyAmino.UnmarshalJSON(out.Bytes(), &actual), out.String())
+			s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &actual), out.String())
 			s.Require().Equal(tc.expected, &actual)
 		})
 	}
@@ -525,7 +525,7 @@ func (s *IntegrationTestSuite) TestNewQueryCmdGrants() {
 			s.Require().NoError(err)
 
 			var actual foundation.QueryGrantsResponse
-			s.Require().NoError(val.ClientCtx.LegacyAmino.UnmarshalJSON(out.Bytes(), &actual), out.String())
+			s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &actual), out.String())
 			s.Require().Equal(tc.expected, len(actual.Authorizations))
 		})
 	}

diff --git a/x/foundation/client/testutil/suite.go b/x/foundation/client/testutil/suite.go
@@ -36,7 +36,7 @@ type IntegrationTestSuite struct {
 var commonArgs = []string{
 	fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
 	fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
-	fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))).String()),
+	fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100)))),
 }
 
 func NewIntegrationTestSuite(cfg network.Config) *IntegrationTestSuite {
@@ -185,7 +185,7 @@ func (s *IntegrationTestSuite) submitProposal(msg sdk.Msg, try bool) uint64 {
 	for _, e := range events {
 		if e.Type == proposalEvent.Type {
 			var proposal foundation.Proposal
-			err := s.cfg.Codec.UnmarshalJSON([]byte(e.Attributes[0].Value), &proposal)
+			err := val.ClientCtx.Codec.UnmarshalJSON([]byte(e.Attributes[0].Value), &proposal)
 			s.Require().NoError(err)
 
 			return proposal.Id