diff --git a/XDCxlending/lendingstate/lendingcontract.go b/XDCxlending/lendingstate/lendingcontract.go index bb3287933f4d..fa2df7dc8491 100644 --- a/XDCxlending/lendingstate/lendingcontract.go +++ b/XDCxlending/lendingstate/lendingcontract.go @@ -2,12 +2,13 @@ package lendingstate import ( "fmt" + "math/big" + "github.com/XinFinOrg/XDPoSChain/XDCx/tradingstate" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/core/state" "github.com/XinFinOrg/XDPoSChain/crypto" "github.com/XinFinOrg/XDPoSChain/log" - "math/big" ) var ( @@ -142,12 +143,11 @@ func IsValidPair(statedb *state.StateDB, coinbase common.Address, baseToken comm // @param baseToken: address of baseToken // @param terms: term // @return: -// - 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, isSpecialCollateral bool) { +// - collaterals []common.Address : list of addresses of collateral +func GetCollaterals(statedb *state.StateDB, coinbase common.Address, baseToken common.Address, term uint64) (collaterals []common.Address) { validPair, _ := IsValidPair(statedb, coinbase, baseToken, term) if !validPair { - return []common.Address{}, false + return []common.Address{} } //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) } } - return collaterals, false + return collaterals } // @function GetCollateralDetail diff --git a/XDCxlending/lendingstate/lendingitem.go b/XDCxlending/lendingstate/lendingitem.go index 09006738ebc4..40ace76ba9e0 100644 --- a/XDCxlending/lendingstate/lendingitem.go +++ b/XDCxlending/lendingstate/lendingitem.go @@ -248,7 +248,7 @@ func (l *LendingItem) VerifyCollateral(state *state.StateDB) error { return fmt.Errorf("invalid collateral %s", l.CollateralToken.Hex()) } validCollateral := false - collateralList, _ := GetCollaterals(state, l.Relayer, l.LendingToken, l.Term) + collateralList := GetCollaterals(state, l.Relayer, l.LendingToken, l.Term) for _, collateral := range collateralList { if l.CollateralToken.String() == collateral.String() { validCollateral = true diff --git a/core/lending_pool.go b/core/lending_pool.go index 292faeb10b33..6d5125d3a927 100644 --- a/core/lending_pool.go +++ b/core/lending_pool.go @@ -435,7 +435,7 @@ func (pool *LendingPool) validateNewLending(cloneStateDb *state.StateDB, cloneLe return ErrInvalidLendingCollateral } 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 { if tx.CollateralToken().String() == collateral.String() { validCollateral = true