all: use 0x-prefix string for type Address in error message (#1835)

XDCx/XDCx.go

@@ -187,11 +187,11 @@ func (XDCx *XDCX) GetAveragePriceLastEpoch(chain consensus.ChainContext, statedb
 		if inversePrice != nil && inversePrice.Sign() > 0 {
 			quoteTokenDecimal, err := XDCx.GetTokenDecimal(chain, statedb, quoteToken)
 			if err != nil || quoteTokenDecimal.Sign() == 0 {
-				return nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", quoteToken.String(), err)
+				return nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", quoteToken, err)
 			}
 			baseTokenDecimal, err := XDCx.GetTokenDecimal(chain, statedb, baseToken)
 			if err != nil || baseTokenDecimal.Sign() == 0 {
-				return nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", baseToken.String(), err)
+				return nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", baseToken, err)
 			}
 			price = new(big.Int).Mul(baseTokenDecimal, quoteTokenDecimal)
 			price = new(big.Int).Div(price, inversePrice)
@@ -214,7 +214,7 @@ func (XDCx *XDCX) ConvertXDCToToken(chain consensus.ChainContext, statedb *state
 
 	tokenDecimal, err := XDCx.GetTokenDecimal(chain, statedb, token)
 	if err != nil || tokenDecimal.Sign() == 0 {
-		return common.Big0, common.Big0, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", token.String(), err)
+		return common.Big0, common.Big0, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", token, err)
 	}
 	tokenQuantity := new(big.Int).Mul(quantity, tokenDecimal)
 	tokenQuantity = new(big.Int).Div(tokenQuantity, tokenPriceInXDC)

XDCx/order_processor.go

@@ -244,7 +244,7 @@ func (XDCx *XDCX) processOrderList(coinbase common.Address, chain consensus.Chai
 				inversePrice := tradingStateDB.GetLastPrice(tradingstate.GetTradingOrderBookHash(common.XDCNativeAddressBinary, oldestOrder.QuoteToken))
 				quoteTokenDecimal, err := XDCx.GetTokenDecimal(chain, statedb, oldestOrder.QuoteToken)
 				if err != nil || quoteTokenDecimal.Sign() == 0 {
-					return nil, nil, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", oldestOrder.QuoteToken.String(), err)
+					return nil, nil, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", oldestOrder.QuoteToken, err)
 				}
 				log.Debug("TryGet inversePrice XDC/QuoteToken", "inversePrice", inversePrice)
 				if inversePrice != nil && inversePrice.Sign() > 0 {
@@ -369,11 +369,11 @@ func (XDCx *XDCX) processOrderList(coinbase common.Address, chain consensus.Chai
 func (XDCx *XDCX) getTradeQuantity(quotePrice *big.Int, coinbase common.Address, chain consensus.ChainContext, statedb *state.StateDB, takerOrder *tradingstate.OrderItem, makerOrder *tradingstate.OrderItem, quantityToTrade *big.Int) (*big.Int, bool, *tradingstate.SettleBalance, error) {
 	baseTokenDecimal, err := XDCx.GetTokenDecimal(chain, statedb, makerOrder.BaseToken)
 	if err != nil || baseTokenDecimal.Sign() == 0 {
-		return tradingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", makerOrder.BaseToken.String(), err)
+		return tradingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", makerOrder.BaseToken, err)
 	}
 	quoteTokenDecimal, err := XDCx.GetTokenDecimal(chain, statedb, makerOrder.QuoteToken)
 	if err != nil || quoteTokenDecimal.Sign() == 0 {
-		return tradingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", makerOrder.QuoteToken.String(), err)
+		return tradingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", makerOrder.QuoteToken, err)
 	}
 	if makerOrder.QuoteToken == common.XDCNativeAddressBinary {
 		quotePrice = quoteTokenDecimal

XDCx/tradingstate/orderitem.go

@@ -370,7 +370,7 @@ func VerifyBalance(statedb *state.StateDB, XDCxStateDb *TradingStateDB, order *t
 	expectedBalance := balanceResult.Taker.OutTotal
 	actualBalance := GetTokenBalance(order.UserAddress(), balanceResult.Taker.OutToken, statedb)
 	if actualBalance.Cmp(expectedBalance) < 0 {
-		return fmt.Errorf("token: %s . ExpectedBalance: %s . ActualBalance: %s", balanceResult.Taker.OutToken.Hex(), expectedBalance.String(), actualBalance.String())
+		return fmt.Errorf("token: %s . ExpectedBalance: %s . ActualBalance: %s", balanceResult.Taker.OutToken.Hex(), expectedBalance, actualBalance)
 	}
 	return nil
 }

XDCx/tradingstate/relayer_state.go

@@ -136,7 +136,7 @@ func SubRelayerFee(relayer common.Address, fee *big.Int, statedb *state.StateDB)
 	balance := statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big()
 	log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee BEFORE", "relayer", relayer, "balance", balance)
 	if balance.Cmp(fee) < 0 {
-		return errors.Errorf("relayer %s isn't enough XDC fee", relayer.String())
+		return errors.Errorf("relayer %s isn't enough XDC fee", relayer)
 	} else {
 		balance = new(big.Int).Sub(balance, fee)
 		statedb.SetState(common.RelayerRegistrationSMC, locHashDeposit, common.BigToHash(balance))
@@ -181,7 +181,7 @@ func AddTokenBalance(addr common.Address, value *big.Int, token common.Address,
 		log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value)
 		return nil
 	} else {
-		return errors.Errorf("token %s isn't exist", token.String())
+		return errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -213,7 +213,7 @@ func SubTokenBalance(addr common.Address, value *big.Int, token common.Address,
 		log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value)
 		return nil
 	} else {
-		return errors.Errorf("token %s isn't exist", token.String())
+		return errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -227,7 +227,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr
 			balance = statedb.GetBalance(addr)
 		}
 		if balance.Cmp(value) < 0 {
-			return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr.String(), token.String(), balance, value)
+			return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr, token, balance, value)
 		}
 		newBalance := new(big.Int).Sub(balance, value)
 		log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance)
@@ -250,7 +250,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr
 		log.Debug("CheckSubTokenBalance settle balance: SUB TOKEN BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance)
 		return newBalance, nil
 	} else {
-		return nil, errors.Errorf("token %s isn't exist", token.String())
+		return nil, errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -285,7 +285,7 @@ func CheckAddTokenBalance(addr common.Address, value *big.Int, token common.Addr
 			return newBalance, nil
 		}
 	} else {
-		return nil, errors.Errorf("token %s isn't exist", token.String())
+		return nil, errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -335,7 +335,7 @@ func SetTokenBalance(addr common.Address, balance *big.Int, token common.Address
 		statedb.SetState(token, locHash, common.BigToHash(balance))
 		return nil
 	} else {
-		return errors.Errorf("token %s isn't exist", token.String())
+		return errors.Errorf("token %s isn't exist", token)
 	}
 }
 

XDCxlending/lendingstate/relayer.go

@@ -88,7 +88,7 @@ func SubRelayerFee(relayer common.Address, fee *big.Int, statedb *state.StateDB)
 	balance := statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big()
 	log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee BEFORE", "relayer", relayer, "balance", balance)
 	if balance.Cmp(fee) < 0 {
-		return errors.Errorf("relayer %s isn't enough XDC fee", relayer.String())
+		return errors.Errorf("relayer %s isn't enough XDC fee", relayer)
 	} else {
 		balance = new(big.Int).Sub(balance, fee)
 		statedb.SetState(common.RelayerRegistrationSMC, locHashDeposit, common.BigToHash(balance))
@@ -133,7 +133,7 @@ func AddTokenBalance(addr common.Address, value *big.Int, token common.Address,
 		log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value)
 		return nil
 	} else {
-		return errors.Errorf("token %s isn't exist", token.String())
+		return errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -143,7 +143,7 @@ func SubTokenBalance(addr common.Address, value *big.Int, token common.Address,
 		balance := statedb.GetBalance(addr)
 		log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE BEFORE", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "orderValue", value)
 		if balance.Cmp(value) < 0 {
-			return errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr.String(), common.XDCNativeAddressBinary, balance, value)
+			return errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr, common.XDCNativeAddressBinary, balance, value)
 		}
 		statedb.SubBalance(addr, value, tracing.BalanceChangeUnspecified)
 		balance = statedb.GetBalance(addr)
@@ -159,14 +159,14 @@ func SubTokenBalance(addr common.Address, value *big.Int, token common.Address,
 		balance := statedb.GetState(token, locHash).Big()
 		log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE BEFORE", "token", token, "address", addr, "balance", balance, "orderValue", value)
 		if balance.Cmp(value) < 0 {
-			return errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr.String(), token.String(), balance, value)
+			return errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr, token, balance, value)
 		}
 		balance = new(big.Int).Sub(balance, value)
 		statedb.SetState(token, locHash, common.BigToHash(balance))
 		log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value)
 		return nil
 	} else {
-		return errors.Errorf("token %s isn't exist", token.String())
+		return errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -180,7 +180,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr
 			balance = statedb.GetBalance(addr)
 		}
 		if balance.Cmp(value) < 0 {
-			return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr.String(), common.XDCNativeAddressBinary, balance, value)
+			return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s  ", addr, common.XDCNativeAddressBinary, balance, value)
 		}
 		newBalance := new(big.Int).Sub(balance, value)
 		log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "value", value, "newBalance", newBalance)
@@ -203,7 +203,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr
 		log.Debug("CheckSubTokenBalance settle balance: SUB TOKEN BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance)
 		return newBalance, nil
 	} else {
-		return nil, errors.Errorf("token %s isn't exist", token.String())
+		return nil, errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -238,7 +238,7 @@ func CheckAddTokenBalance(addr common.Address, value *big.Int, token common.Addr
 			return newBalance, nil
 		}
 	} else {
-		return nil, errors.Errorf("token %s isn't exist", token.String())
+		return nil, errors.Errorf("token %s isn't exist", token)
 	}
 }
 
@@ -253,7 +253,7 @@ func CheckSubRelayerFee(relayer common.Address, fee *big.Int, statedb *state.Sta
 	}
 	log.Debug("CheckSubRelayerFee settle balance: SubRelayerFee ", "relayer", relayer, "balance", balance, "fee", fee)
 	if balance.Cmp(fee) < 0 {
-		return nil, errors.Errorf("relayer %s isn't enough XDC fee", relayer.String())
+		return nil, errors.Errorf("relayer %s isn't enough XDC fee", relayer)
 	} else {
 		return new(big.Int).Sub(balance, fee), nil
 	}
@@ -288,7 +288,7 @@ func SetTokenBalance(addr common.Address, balance *big.Int, token common.Address
 		statedb.SetState(token, locHash, common.BigToHash(balance))
 		return nil
 	} else {
-		return errors.Errorf("token %s isn't exist", token.String())
+		return errors.Errorf("token %s isn't exist", token)
 	}
 }
 

XDCxlending/order_processor.go

@@ -439,7 +439,7 @@ func (l *Lending) getLendQuantity(
 	}
 	LendingTokenDecimal, err := l.XDCx.GetTokenDecimal(chain, statedb, makerOrder.LendingToken)
 	if err != nil || LendingTokenDecimal.Sign() == 0 {
-		return lendingstate.Zero, lendingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", makerOrder.LendingToken.String(), err)
+		return lendingstate.Zero, lendingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", makerOrder.LendingToken, err)
 	}
 	collateralToken := makerOrder.CollateralToken
 	if takerOrder.Side == lendingstate.Borrowing {
@@ -447,7 +447,7 @@ func (l *Lending) getLendQuantity(
 	}
 	collateralTokenDecimal, err := l.XDCx.GetTokenDecimal(chain, statedb, collateralToken)
 	if err != nil || collateralTokenDecimal.Sign() == 0 {
-		return lendingstate.Zero, lendingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", collateralToken.String(), err)
+		return lendingstate.Zero, lendingstate.Zero, false, nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", collateralToken, err)
 	}
 	if takerOrder.Relayer == makerOrder.Relayer {
 		if err := lendingstate.CheckRelayerFee(takerOrder.Relayer, new(big.Int).Mul(common.RelayerLendingFee, big.NewInt(2)), statedb); err != nil {
@@ -973,7 +973,7 @@ func (l *Lending) GetMediumTradePriceBeforeEpoch(chain consensus.ChainContext, s
 		if inversePrice != nil && inversePrice.Sign() > 0 {
 			quoteTokenDecimal, err := l.XDCx.GetTokenDecimal(chain, statedb, quoteToken)
 			if err != nil || quoteTokenDecimal.Sign() == 0 {
-				return nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", quoteToken.String(), err)
+				return nil, fmt.Errorf("fail to get tokenDecimal: Token: %v . Err: %v", quoteToken, err)
 			}
 			baseTokenDecimal, err := l.XDCx.GetTokenDecimal(chain, statedb, baseToken)
 			if err != nil || baseTokenDecimal.Sign() == 0 {

cmd/XDC/config.go

@@ -77,7 +77,7 @@ var tomlSettings = toml.Config{
 		if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" {
 			link = fmt.Sprintf(", see https://godoc.org/%s#%s for available fields", rt.PkgPath(), rt.Name())
 		}
-		return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link)
+		return fmt.Errorf("field '%s' is not defined in %s%s", field, rt, link)
 	},
 }
 

contracts/utils_test.go

@@ -106,7 +106,7 @@ func TestSendTxSign(t *testing.T) {
 		}
 
 		if signers[0] != oldBlocks[blockHash] {
-			t.Errorf("Tx sign for block signer not match %v - %v", signers[0].String(), oldBlocks[blockHash].String())
+			t.Errorf("Tx sign for block signer not match %v - %v", signers[0], oldBlocks[blockHash])
 		}
 
 		if len(signers) != len(keys) {

core/vm/instructions_test.go

@@ -701,7 +701,7 @@ func TestCreate2Addreses(t *testing.T) {
 		*/
 		expected := common.BytesToAddress(common.FromHex(tt.expected))
 		if !bytes.Equal(expected.Bytes(), address.Bytes()) {
-			t.Errorf("test %d: expected %s, got %s", i, expected.String(), address.String())
+			t.Errorf("test %d: expected %s, got %s", i, expected, address)
 		}
 	}
 }