Use io address in ioctl output (#2527)

* use io address for output in ioctl * modify unit test Co-authored-by: CoderZhi <thecoderzhi@gmail.com>
iotexproject · Nov 30, 2020 · 66cb15f · 66cb15f
1 parent 366588a
commit 66cb15f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ioctl/cmd/contract/contract_test.go b/ioctl/cmd/contract/contract_test.go
@@ -92,7 +92,7 @@ func TestParseOutput(t *testing.T) {
 			"0000000000000000000000000000000000000000000000000000000000000000",
 		},
 		{
-			"0xc7F43FaB2ca353d29cE0DA04851aB74f45B09593",
+			"io1cl6rl2ev5dfa988qmgzg2x4hfazmp9vn2g66ng",
 			"owner",
 			"000000000000000000000000c7f43fab2ca353d29ce0da04851ab74f45b09593",
 		},
@@ -102,7 +102,7 @@ func TestParseOutput(t *testing.T) {
 			"0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000b48656c6c6f20576f726c64000000000000000000000000000000000000000000",
 		},
 		{
-			"{i:17 abc:[0x0000000000000000000000000000000000000000 0xc7F43FaB2ca353d29cE0DA04851aB74f45B09593]}",
+			"{i:17 abc:[io1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqd39ym7 io1cl6rl2ev5dfa988qmgzg2x4hfazmp9vn2g66ng]}",
 			"testTuple",
 			"00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c7f43fab2ca353d29ce0da04851ab74f45b09593",
 		},
@@ -152,7 +152,7 @@ func TestParseOutputArgument(t *testing.T) {
 			common.HexToAddress("c7F43FaB2ca353d29cE0DA04851aB74f45B09593"),
 			"address",
 			nil,
-			"0xc7F43FaB2ca353d29cE0DA04851aB74f45B09593",
+			"io1cl6rl2ev5dfa988qmgzg2x4hfazmp9vn2g66ng",
 		},
 		{
 			[]byte("test bytes"),

diff --git a/ioctl/cmd/contract/parse.go b/ioctl/cmd/contract/parse.go
@@ -19,6 +19,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 
+	"github.com/iotexproject/iotex-address/address"
+
 	"github.com/iotexproject/iotex-core/ioctl/output"
 	"github.com/iotexproject/iotex-core/ioctl/util"
 )
@@ -372,7 +374,10 @@ func parseOutputArgument(v interface{}, t *abi.Type) (string, bool) {
 			var ethAddr common.Address
 			ethAddr, ok = v.(common.Address)
 			if ok {
-				str = ethAddr.String()
+				ioAddress, err := address.FromBytes(ethAddr.Bytes())
+				if err == nil {
+					str = ioAddress.String()
+				}
 			}
 		}