fix: allow from flag to accept key-name (#599)

* fix: allow from flag to accept key-name * bump: go version in github actions * fix: fix test
regen-network · Oct 27, 2021 · b4d3a2a · b4d3a2a
1 parent ab9ebdd
commit b4d3a2a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Display go version

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -32,7 +32,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.17
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - run: make build
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - name: Install runsim
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -82,7 +82,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -112,7 +112,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -142,7 +142,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -174,7 +174,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -202,7 +202,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -232,7 +232,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -262,7 +262,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Checkout code
         uses: actions/checkout@v2
       - name: run tests
@@ -35,7 +35,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Checkout code
         uses: actions/checkout@v2
       - name: run experimental test cover

diff --git a/x/ecocredit/client/testsuite/tx.go b/x/ecocredit/client/testsuite/tx.go
@@ -1196,6 +1196,11 @@ func (s *IntegrationTestSuite) TestTxUpdateAdmin() {
 			args:   append([]string{classId, a1.String(), makeFlagFrom(val0.Address.String())}, s.commonTxFlags()...),
 			expErr: false,
 		},
+		{
+			name:   "valid test: from key-name",
+			args:   append([]string{classId, a1.String(), makeFlagFrom("node0")}, s.commonTxFlags()...),
+			expErr: false,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -1265,6 +1270,11 @@ func (s *IntegrationTestSuite) TestTxUpdateMetadata() {
 			args:   append([]string{classId, newMetaData, makeFlagFrom(val0.Address.String())}, s.commonTxFlags()...),
 			expErr: false,
 		},
+		{
+			name:   "valid test: from key-name",
+			args:   append([]string{classId, newMetaData, makeFlagFrom("node0")}, s.commonTxFlags()...),
+			expErr: false,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -1329,6 +1339,11 @@ func (s *IntegrationTestSuite) TestTxUpdateIssuers() {
 			args:   append([]string{classId, fmt.Sprintf("%s,%s", newIssuers[0], newIssuers[1]), makeFlagFrom(val0.Address.String())}, s.commonTxFlags()...),
 			expErr: false,
 		},
+		{
+			name:   "valid test: from key-name",
+			args:   append([]string{classId, fmt.Sprintf("%s,%s", newIssuers[0], newIssuers[1]), makeFlagFrom("node0")}, s.commonTxFlags()...),
+			expErr: false,
+		},
 	}
 
 	for _, tc := range testCases {

diff --git a/x/ecocredit/client/tx.go b/x/ecocredit/client/tx.go
@@ -415,7 +415,7 @@ Parameters:
 			}
 
 			msg := ecocredit.MsgUpdateClassMetadata{
-				Admin:    clientCtx.From,
+				Admin:    clientCtx.GetFromAddress().String(),
 				ClassId:  classID,
 				Metadata: b,
 			}
@@ -455,7 +455,7 @@ Parameters:
 			}
 
 			msg := ecocredit.MsgUpdateClassAdmin{
-				Admin:    clientCtx.From,
+				Admin:    clientCtx.GetFromAddress().String(),
 				ClassId:  classID,
 				NewAdmin: newAdmin,
 			}
@@ -495,7 +495,7 @@ Parameters:
 			}
 
 			msg := ecocredit.MsgUpdateClassIssuers{
-				Admin:   clientCtx.From,
+				Admin:   clientCtx.GetFromAddress().String(),
 				ClassId: classID,
 				Issuers: issuers,
 			}