return correct networkId at method cfxaddress tocommon (#157)

Co-authored-by: dayong <[email protected]>
Conflux-Chain · Feb 16, 2022 · a8dd121 · a8dd121
1 parent 611ec5a
commit a8dd121
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/types/cfxaddress/address.go b/types/cfxaddress/address.go
@@ -242,6 +242,7 @@ func (a *Address) ToCommon() (address common.Address, networkID uint32, err erro
 		return
 	}
 	address = common.BytesToAddress(validAddr.hex)
+	networkID = validAddr.networkID
 	return
 }
 

diff --git a/types/cfxaddress/address_test.go b/types/cfxaddress/address_test.go
@@ -237,3 +237,19 @@ func TestShorten(t *testing.T) {
 	shorten = addr.GetShortenAddress(true)
 	assert.Equal(t, "net333:acb...sa4w", shorten)
 }
+
+func TestToCommon(t *testing.T) {
+	cfxaddrStr := "net8889:aakn82yd3x6m4594pt57y29r2jnwfdpdxj4btr9fvw"
+	cfxaddr, err := NewFromBase32(cfxaddrStr)
+	if err != nil {
+		t.Fatal(err)
+	}
+	commonAddr, chainId, err := cfxaddr.ToCommon()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, cfxaddr.String(), cfxaddrStr)
+	assert.Equal(t, commonAddr.String(), "0x12Bf6283CcF8Ad6ffA63f7Da63EDc217228d839A")
+	assert.Equal(t, chainId, uint32(8889))
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
     	address = common.BytesToAddress(validAddr.hex)
+    	networkID = validAddr.networkID
     	return
     }
@@ Expand Down @@