Skip to content

Commit bdb7adf

Browse files
committed
fix test
1 parent 91ece34 commit bdb7adf

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

api/grpcserver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ func TestGrpcServer_GetAccount(t *testing.T) {
7070
request := &iotexapi.GetAccountRequest{
7171
Address: "9254d943485d0fb859ff63c5581acc44f00fc2110343ac0445b99dfe39a6f1a5",
7272
}
73-
73+
core.EXPECT().Account(gomock.Any()).Return(nil, nil, expectedErr)
7474
_, err := grpcSvr.GetAccount(context.Background(), request)
75-
require.Contains(err.Error(), expectedErr.Error())
75+
require.ErrorContains(err, expectedErr.Error())
7676
})
7777
}
7878

api/web3server.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,11 @@ func (svr *web3Handler) getBalance(in *gjson.Result) (interface{}, error) {
408408
if !addr.Exists() {
409409
return nil, errInvalidFormat
410410
}
411-
accountMeta, _, err := svr.coreService.Account(addr.String())
411+
ioAddr, err := ethAddrToIoAddr(addr.String())
412+
if err != nil {
413+
return nil, err
414+
}
415+
accountMeta, _, err := svr.coreService.Account(ioAddr.String())
412416
if err != nil {
413417
return nil, err
414418
}
@@ -603,7 +607,11 @@ func (svr *web3Handler) getCode(in *gjson.Result) (interface{}, error) {
603607
if !addr.Exists() {
604608
return nil, errInvalidFormat
605609
}
606-
accountMeta, _, err := svr.coreService.Account(addr.String())
610+
ioAddr, err := ethAddrToIoAddr(addr.String())
611+
if err != nil {
612+
return nil, err
613+
}
614+
accountMeta, _, err := svr.coreService.Account(ioAddr.String())
607615
if err != nil {
608616
return nil, err
609617
}

api/web3server_integrity_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,9 @@ func getBlockByNumber(t *testing.T, handler *hTTPHandler) {
252252
func getBalance(t *testing.T, handler *hTTPHandler) {
253253
require := require.New(t)
254254
result := serveTestHTTP(require, handler, "eth_getBalance", `["0xDa7e12Ef57c236a06117c5e0d04a228e7181CF36"]`)
255-
ans, ok := new(big.Int).SetString("9999999999999999999999999991", 10)
256-
require.True(ok)
257255
actual, ok := result.(string)
258256
require.True(ok)
259-
ans, ok = new(big.Int).SetString("9999999999999999999999999991", 10)
257+
ans, ok := new(big.Int).SetString("9999999999999999999999999991", 10)
260258
require.True(ok)
261259
require.Equal("0x"+fmt.Sprintf("%x", ans), actual)
262260
}

0 commit comments

Comments
 (0)