forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-10 15:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: remove the unused false return value from GetCollaterals method (#410)

Browse source
This commit is contained in:
Banana-J 2024-01-29 11:31:10 +11:00 committed by GitHub
parent d70c15667b
commit 0664e9fc47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
XDCxlending/lendingstate/lendingcontract.go
View file

@ -2,12 +2,13 @@ package lendingstate
import ( import (
"fmt" "fmt"
"math/big"
"github.com/XinFinOrg/XDPoSChain/XDCx/tradingstate" "github.com/XinFinOrg/XDPoSChain/XDCx/tradingstate"
"github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/common"
"github.com/XinFinOrg/XDPoSChain/core/state" "github.com/XinFinOrg/XDPoSChain/core/state"
"github.com/XinFinOrg/XDPoSChain/crypto" "github.com/XinFinOrg/XDPoSChain/crypto"
"github.com/XinFinOrg/XDPoSChain/log" "github.com/XinFinOrg/XDPoSChain/log"
"math/big"
) )
var ( var (
@ -142,12 +143,11 @@ func IsValidPair(statedb *state.StateDB, coinbase common.Address, baseToken comm
// @param baseToken: address of baseToken // @param baseToken: address of baseToken
// @param terms: term // @param terms: term
// @return: // @return:
// - collaterals []common.Address : list of addresses of collateral // - collaterals []common.Address : list of addresses of collateral
// - isSpecialCollateral : TRUE if collateral is a token which is NOT available for trading in XDCX, otherwise FALSE func GetCollaterals(statedb *state.StateDB, coinbase common.Address, baseToken common.Address, term uint64) (collaterals []common.Address) {
func GetCollaterals(statedb *state.StateDB, coinbase common.Address, baseToken common.Address, term uint64) (collaterals []common.Address, isSpecialCollateral bool) {
validPair, _ := IsValidPair(statedb, coinbase, baseToken, term) validPair, _ := IsValidPair(statedb, coinbase, baseToken, term)
if !validPair { if !validPair {
return []common.Address{}, false return []common.Address{}
} }
//TODO: ILO Collateral is not supported in release 2.2.0 //TODO: ILO Collateral is not supported in release 2.2.0
@ -171,7 +171,7 @@ func GetCollaterals(statedb *state.StateDB, coinbase common.Address, baseToken c
collaterals = append(collaterals, addr) collaterals = append(collaterals, addr)
} }
} }
return collaterals, false return collaterals
} }
// @function GetCollateralDetail // @function GetCollateralDetail

2
XDCxlending/lendingstate/lendingitem.go
View file

@ -248,7 +248,7 @@ func (l *LendingItem) VerifyCollateral(state *state.StateDB) error {
return fmt.Errorf("invalid collateral %s", l.CollateralToken.Hex()) return fmt.Errorf("invalid collateral %s", l.CollateralToken.Hex())
} }
validCollateral := false validCollateral := false
collateralList, _ := GetCollaterals(state, l.Relayer, l.LendingToken, l.Term) collateralList := GetCollaterals(state, l.Relayer, l.LendingToken, l.Term)
for _, collateral := range collateralList { for _, collateral := range collateralList {
if l.CollateralToken.String() == collateral.String() { if l.CollateralToken.String() == collateral.String() {
validCollateral = true validCollateral = true

2
core/lending_pool.go
View file

@ -435,7 +435,7 @@ func (pool *LendingPool) validateNewLending(cloneStateDb *state.StateDB, cloneLe
return ErrInvalidLendingCollateral return ErrInvalidLendingCollateral
} }
validCollateral := false validCollateral := false
collateralList, _ := lendingstate.GetCollaterals(cloneStateDb, tx.RelayerAddress(), tx.LendingToken(), tx.Term()) collateralList := lendingstate.GetCollaterals(cloneStateDb, tx.RelayerAddress(), tx.LendingToken(), tx.Term())
for _, collateral := range collateralList { for _, collateral := range collateralList {
if tx.CollateralToken().String() == collateral.String() { if tx.CollateralToken().String() == collateral.String() {
validCollateral = true validCollateral = true