Merge branch 'master' of https://github.com/jpeng-go/plugin

plugin/dapp/collateralize/executor/collateralize_test.go

@@ -586,7 +586,6 @@ func TestCollateralize(t *testing.T) {
 		types.Encode(&pkt.ReqCollateralizeRecordByStatus{CollateralizeId: common.ToHex(collateralizeID), Status: 4}))
 	assert.Nil(t, res)
 
-
 	// expire liquidate
 	p10 := &pkt.CollateralizeBorrowTx{
 		CollateralizeID: common.ToHex(collateralizeID),

plugin/dapp/collateralize/executor/collateralizedb.go

@@ -548,7 +548,7 @@ func (action *Action) CollateralizeBorrow(borrow *pty.CollateralizeBorrow) (*typ
 
 	// 借贷金额不超过个人限额
 	userBalance, _ := queryCollateralizeUserBalance(action.db, action.localDB, action.fromaddr)
-	if borrow.GetValue() + userBalance > coll.DebtCeiling {
+	if borrow.GetValue()+userBalance > coll.DebtCeiling {
 		clog.Error("CollateralizeBorrow", "CollID", coll.CollateralizeId, "addr", action.fromaddr, "execaddr", action.execaddr,
 			"borrow value", borrow.GetValue(), "current balance", userBalance, "error", pty.ErrCollateralizeExceedDebtCeiling)
 		return nil, pty.ErrCollateralizeExceedDebtCeiling

plugin/dapp/issuance/executor/issuancedb.go

@@ -515,7 +515,7 @@ func (action *Action) IssuanceDebt(debt *pty.IssuanceDebt) (*types.Receipt, erro
 
 	// 借贷金额不超过个人限额
 	userBalance, _ := queryIssuanceUserBalance(action.db, action.localDB, action.fromaddr)
-	if debt.GetValue() + userBalance > issu.DebtCeiling {
+	if debt.GetValue()+userBalance > issu.DebtCeiling {
 		clog.Error("IssuanceDebt", "CollID", issu.IssuanceId, "addr", action.fromaddr, "execaddr", action.execaddr,
 			"debt value", debt.GetValue(), "current balance", userBalance, "error", pty.ErrIssuanceExceedDebtCeiling)
 		return nil, pty.ErrIssuanceExceedDebtCeiling