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

plugin/dapp/collateralize/executor/collateralizedb.go

@@ -5,9 +5,10 @@
 package executor
 
 import (
-	"github.com/33cn/chain33/common/db/table"
 	"math"
 
+	"github.com/33cn/chain33/common/db/table"
+
 	"github.com/33cn/chain33/account"
 	"github.com/33cn/chain33/common"
 	dbm "github.com/33cn/chain33/common/db"
@@ -478,7 +479,7 @@ func getBtyNumToFrozen(value int64, price float64, ratio float64) (int64, error)
 // value:借出ccny数量， colValue:抵押物数量， price:抵押物价格
 func calcLiquidationPrice(value int64, colValue int64) float64 {
 	liquidationRation := float64(value) / float64(colValue)
-	liquidationPrice := math.Trunc(liquidationRation * pty.CollateralizePreLiquidationRatio * 1e4)/1e4
+	liquidationPrice := math.Trunc(liquidationRation*pty.CollateralizePreLiquidationRatio*1e4) / 1e4
 
 	return liquidationPrice
 }
@@ -620,7 +621,7 @@ func (action *Action) CollateralizeBorrow(borrow *pty.CollateralizeBorrow) (*typ
 	borrowRecord.StartTime = action.blocktime
 	borrowRecord.CollateralPrice = lastPrice
 	borrowRecord.DebtValue = borrow.GetValue()
-	borrowRecord.LiquidationPrice = math.Trunc(coll.LiquidationRatio * lastPrice * pty.CollateralizePreLiquidationRatio * 1e4)/1e4
+	borrowRecord.LiquidationPrice = math.Trunc(coll.LiquidationRatio*lastPrice*pty.CollateralizePreLiquidationRatio*1e4) / 1e4
 	borrowRecord.Status = pty.CollateralizeUserStatusCreate
 	borrowRecord.ExpireTime = action.blocktime + coll.Period
 
@@ -1174,8 +1175,8 @@ func queryCollateralizeByStatus(localdb dbm.KVDB, status int32, collID string) (
 	}
 
 	var data = &pty.ReceiptCollateralize{
-		CollateralizeId:collID,
-		Status:status,
+		CollateralizeId: collID,
+		Status:          status,
 	}
 	rows, err := query.List("status", data, primary, DefultCount, ListDESC)
 	if err != nil {
@@ -1199,9 +1200,9 @@ func queryCollateralizeByAddr(localdb dbm.KVDB, addr string, status int32, collI
 	}
 
 	var data = &pty.ReceiptCollateralize{
-		CollateralizeId:collID,
-		Status:status,
-		AccountAddr:addr,
+		CollateralizeId: collID,
+		Status:          status,
+		AccountAddr:     addr,
 	}
 	var rows []*table.Row
 	var err error
@@ -1257,8 +1258,8 @@ func queryCollateralizeRecordByAddr(db dbm.KV, localdb dbm.KVDB, addr string, co
 	}
 
 	var data = &pty.ReceiptCollateralize{
-		AccountAddr:addr,
-		CollateralizeId:collID,
+		AccountAddr:     addr,
+		CollateralizeId: collID,
 	}
 
 	var rows []*table.Row
@@ -1298,8 +1299,8 @@ func queryCollateralizeRecordByStatus(db dbm.KV, localdb dbm.KVDB, status int32,
 	}
 
 	var data = &pty.ReceiptCollateralize{
-		Status:status,
-		CollateralizeId:collID,
+		Status:          status,
+		CollateralizeId: collID,
 	}
 
 	var rows []*table.Row
@@ -1329,4 +1330,4 @@ func queryCollateralizeRecordByStatus(db dbm.KV, localdb dbm.KVDB, status int32,
 	}
 
 	return records, nil
-}
\ No newline at end of file
+}

plugin/dapp/collateralize/executor/exec_local.go

@@ -13,7 +13,7 @@ import (
 func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptData) (*types.LocalDBSet, error) {
 	set := &types.LocalDBSet{}
 	for _, item := range receipt.Logs {
-		if item.Ty >= pty.TyLogCollateralizeCreate &&  item.Ty <= pty.TyLogCollateralizeRetrieve {
+		if item.Ty >= pty.TyLogCollateralizeCreate && item.Ty <= pty.TyLogCollateralizeRetrieve {
 			var collateralizeLog pty.ReceiptCollateralize
 			err := types.Decode(item.Log, &collateralizeLog)
 			if err != nil {
@@ -23,7 +23,7 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
 			if item.Ty == pty.TyLogCollateralizeCreate || item.Ty == pty.TyLogCollateralizeRetrieve {
 				collTable := pty.NewCollateralizeTable(c.GetLocalDB())
 				err = collTable.Replace(&pty.ReceiptCollateralize{CollateralizeId: collateralizeLog.CollateralizeId, Status: collateralizeLog.Status,
-					AccountAddr:collateralizeLog.AccountAddr})
+					AccountAddr: collateralizeLog.AccountAddr})
 				if err != nil {
 					return nil, err
 				}

plugin/dapp/collateralize/types/table.go

@@ -112,7 +112,7 @@ func (tx *CollateralizeRecordRow) Get(key string) ([]byte, error) {
 	} else if key == "status" {
 		return []byte(fmt.Sprintf("%2d", tx.Status)), nil
 	} else if key == "addr" {
-	    return []byte( tx.AccountAddr), nil
+		return []byte(tx.AccountAddr), nil
 	} else if key == "id_status" {
 		return []byte(fmt.Sprintf("%s:%2d", tx.CollateralizeId, tx.Status)), nil
 	} else if key == "id_addr" {

plugin/dapp/issuance/executor/issuancedb.go

@@ -584,7 +584,7 @@ func (action *Action) IssuanceDebt(debt *pty.IssuanceDebt) (*types.Receipt, erro
 	debtRecord.StartTime = action.blocktime
 	debtRecord.CollateralPrice = lastPrice
 	debtRecord.DebtValue = debt.Value
-	debtRecord.LiquidationPrice = math.Trunc(issu.LiquidationRatio * lastPrice * pty.IssuancePreLiquidationRatio * 1e4)/1e4
+	debtRecord.LiquidationPrice = math.Trunc(issu.LiquidationRatio*lastPrice*pty.IssuancePreLiquidationRatio*1e4) / 1e4
 	debtRecord.Status = pty.IssuanceUserStatusCreate
 	debtRecord.ExpireTime = action.blocktime + issu.Period
 
@@ -972,8 +972,8 @@ func queryIssuanceByStatus(localdb dbm.KVDB, status int32, issuanceID string) ([
 	}
 
 	var data = &pty.ReceiptIssuanceID{
-		IssuanceId:issuanceID,
-		Status:status,
+		IssuanceId: issuanceID,
+		Status:     status,
 	}
 	rows, err := query.List("status", data, primary, DefultCount, ListDESC)
 	if err != nil {
@@ -990,7 +990,7 @@ func queryIssuanceByStatus(localdb dbm.KVDB, status int32, issuanceID string) ([
 }
 
 // 精确查找发行记录
-func queryIssuanceRecordByID(db dbm.KV, issuanceID string, debtID string, ) (*pty.DebtRecord, error) {
+func queryIssuanceRecordByID(db dbm.KV, issuanceID string, debtID string) (*pty.DebtRecord, error) {
 	issu, err := queryIssuanceByID(db, issuanceID)
 	if err != nil {
 		clog.Error("queryIssuanceRecordByID", "error", err)
@@ -1021,7 +1021,7 @@ func queryIssuanceRecordsByStatus(db dbm.KV, localdb dbm.KVDB, status int32, deb
 	}
 
 	var data = &pty.ReceiptIssuance{
-		Status:status,
+		Status: status,
 	}
 	rows, err := query.List("status", data, primary, DefultCount, ListDESC)
 	if err != nil {

plugin/dapp/issuance/types/table.go

@@ -108,7 +108,7 @@ func (tx *IssuanceRecordRow) Get(key string) ([]byte, error) {
 	} else if key == "status" {
 		return []byte(fmt.Sprintf("%2d", tx.Status)), nil
 	} else if key == "addr" {
-	    return []byte(tx.AccountAddr), nil
+		return []byte(tx.AccountAddr), nil
 	}
 	return nil, types.ErrNotFound
 }