#627 fix linter error

chain33.para.toml

@@ -309,6 +309,12 @@ Enable=0
 [fork.sub.jsvm]
 Enable=0
 
+[fork.sub.issuance]
+Enable=0
+
+[fork.sub.collateralize]
+Enable=0
+
 #对已有的平行链如果不是从0开始同步数据，需要设置这个kvmvccmavl的对应平行链高度的fork，如果从0开始同步，statehash会跟以前mavl的不同
 [fork.sub.store-kvmvccmavl]
 ForkKvmvccmavl=0

plugin/dapp/collateralize/executor/collateralize.go

@@ -19,12 +19,6 @@ func InitExecType() {
 	ety.InitFuncList(types.ListMethod(&Collateralize{}))
 }
 
-type subConfig struct {
-	ParaRemoteGrpcClient string `json:"paraRemoteGrpcClient"`
-}
-
-var cfg subConfig
-
 // Init collateralize
 func Init(name string, cfg *types.Chain33Config, sub []byte) {
 	driverName := GetName()

plugin/dapp/collateralize/executor/collateralizedb.go

@@ -703,7 +703,7 @@ func (action *Action) CollateralizeRepay(repay *pty.CollateralizeRepay) (*types.
 	}
 
 	// 借贷金额+利息
-	fee := (float64(borrowRecord.DebtValue) / 1e8) * float64(coll.StabilityFeeRatio)
+	fee := (float64(borrowRecord.DebtValue) / 1e8) * coll.StabilityFeeRatio
 	realRepay := borrowRecord.DebtValue + int64(math.Trunc((fee+0.0000001)*1e4))*1e4
 
 	// 检查

plugin/dapp/collateralize/executor/exec_del_local.go

@@ -26,11 +26,9 @@ func (c *Collateralize) execDelLocal(tx *types.Transaction, receiptData *types.R
 				set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId, collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
-				break
 			case pty.TyLogCollateralizeBorrow:
 				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
-				break
 			case pty.TyLogCollateralizeAppend:
 				if collateralizeLog.Status == pty.CollateralizeUserStatusWarning {
 					set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId,
@@ -40,14 +38,12 @@ func (c *Collateralize) execDelLocal(tx *types.Transaction, receiptData *types.R
 					//	collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 					//set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
 				}
-				break
 			case pty.TyLogCollateralizeRepay:
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
 				//set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 				//	collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
-				break
 			case pty.TyLogCollateralizeFeed:
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
@@ -58,13 +54,11 @@ func (c *Collateralize) execDelLocal(tx *types.Transaction, receiptData *types.R
 				//if collateralizeLog.Status == pty.CollateralizeUserStatusWarning || collateralizeLog.Status == pty.CollateralizeUserStatusExpire {
 				//	set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
 				//}
-				break
 			case pty.TyLogCollateralizeRetrieve:
 				set.KV = append(set.KV, c.deleteCollateralizeStatus(collateralizeLog.Status, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId, collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
-				break
 			}
 		}
 	}

plugin/dapp/collateralize/executor/exec_local.go

@@ -27,13 +27,11 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
 				set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.addCollateralizeStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId, collateralizeLog.Status, collateralizeLog.Index)...)
-				break
 			case pty.TyLogCollateralizeBorrow:
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.Index)...)
-				break
 			case pty.TyLogCollateralizeAppend:
 				if collateralizeLog.Status == pty.CollateralizeUserStatusWarning {
 					set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
@@ -43,13 +41,11 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
 					//set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 					//	collateralizeLog.RecordId, collateralizeLog.Index)...)
 				}
-				break
 			case pty.TyLogCollateralizeRepay:
 				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.Index)...)
 				//set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.PreIndex)...)
-				break
 			case pty.TyLogCollateralizeFeed:
 				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
@@ -60,7 +56,6 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
 				//	set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 				//		collateralizeLog.RecordId, collateralizeLog.Index)...)
 				//}
-				break
 			case pty.TyLogCollateralizeRetrieve:
 				set.KV = append(set.KV, c.deleteCollateralizeStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.PreIndex)...)

plugin/dapp/collateralize/executor/keys.go

@@ -31,11 +31,6 @@ func calcCollateralizeAddrKey(addr string, index int64) []byte {
 	return []byte(key)
 }
 
-func calcCollateralizePriceKey(time string) []byte {
-	key := fmt.Sprintf("LODB-collateralize-price:%s", time)
-	return []byte(key)
-}
-
 func calcCollateralizeRecordAddrPrefix(addr string) []byte {
 	key := fmt.Sprintf("LODB-collateralize-record-addr:%s", addr)
 	return []byte(key)

plugin/dapp/issuance/executor/exec_del_local.go

@@ -23,18 +23,15 @@ func (c *Issuance) execDelLocal(tx *types.Transaction, receiptData *types.Receip
 			switch item.Ty {
 			case pty.TyLogIssuanceCreate:
 				set.KV = append(set.KV, c.deleteIssuanceStatus(issuanceLog.Status, issuanceLog.Index)...)
-				break
 			case pty.TyLogIssuanceDebt:
 				set.KV = append(set.KV, c.deleteIssuanceRecordStatus(issuanceLog.Status, issuanceLog.Index)...)
 				set.KV = append(set.KV, c.deleteIssuanceRecordAddr(issuanceLog.AccountAddr, issuanceLog.Index)...)
-				break
 			case pty.TyLogIssuanceRepay:
 				set.KV = append(set.KV, c.addIssuanceRecordStatus(issuanceLog.PreStatus, issuanceLog.AccountAddr, issuanceLog.PreIndex,
 					issuanceLog.DebtId, issuanceLog.IssuanceId)...)
 				set.KV = append(set.KV, c.deleteIssuanceRecordStatus(issuanceLog.Status, issuanceLog.Index)...)
 				//set.KV = append(set.KV, c.addIssuanceRecordAddr(issuanceLog.AccountAddr, issuanceLog.PreIndex, issuanceLog.DebtId,
 				//	issuanceLog.IssuanceId)...)
-				break
 			case pty.TyLogIssuanceFeed:
 				set.KV = append(set.KV, c.addIssuanceRecordStatus(issuanceLog.Status, issuanceLog.AccountAddr, issuanceLog.PreIndex,
 					issuanceLog.DebtId, issuanceLog.IssuanceId)...)
@@ -46,11 +43,9 @@ func (c *Issuance) execDelLocal(tx *types.Transaction, receiptData *types.Receip
 				//	set.KV = append(set.KV, c.deleteIssuanceRecordAddr(issuanceLog.AccountAddr, issuanceLog.Index)...)
 				//}
 				set.KV = append(set.KV, c.deleteIssuancePriceRecord(issuanceLog.RecordTime)...)
-				break
 			case pty.TyLogIssuanceClose:
 				set.KV = append(set.KV, c.deleteIssuanceStatus(issuanceLog.Status, issuanceLog.Index)...)
 				set.KV = append(set.KV, c.addIssuanceStatus(issuanceLog.PreStatus, issuanceLog.PreIndex, issuanceLog.IssuanceId)...)
-				break
 			}
 		}
 	}

plugin/dapp/issuance/executor/exec_local.go

@@ -24,19 +24,16 @@ func (c *Issuance) execLocal(tx *types.Transaction, receipt *types.ReceiptData)
 			switch item.Ty {
 			case pty.TyLogIssuanceCreate:
 				set.KV = append(set.KV, c.addIssuanceStatus(issuanceLog.Status, issuanceLog.Index, issuanceLog.IssuanceId)...)
-				break
 			case pty.TyLogIssuanceDebt:
 				set.KV = append(set.KV, c.addIssuanceRecordStatus(issuanceLog.Status, issuanceLog.AccountAddr, issuanceLog.Index,
 					issuanceLog.DebtId, issuanceLog.IssuanceId)...)
 				set.KV = append(set.KV, c.addIssuanceRecordAddr(issuanceLog.AccountAddr, issuanceLog.Index, issuanceLog.DebtId,
 					issuanceLog.IssuanceId)...)
-				break
 			case pty.TyLogIssuanceRepay:
 				set.KV = append(set.KV, c.deleteIssuanceRecordStatus(issuanceLog.PreStatus, issuanceLog.PreIndex)...)
 				set.KV = append(set.KV, c.addIssuanceRecordStatus(issuanceLog.Status, issuanceLog.AccountAddr, issuanceLog.Index,
 					issuanceLog.DebtId, issuanceLog.IssuanceId)...)
 				//set.KV = append(set.KV, c.deleteIssuanceRecordAddr(issuanceLog.AccountAddr, issuanceLog.PreIndex)...)
-				break
 			case pty.TyLogIssuanceFeed:
 				set.KV = append(set.KV, c.deleteIssuanceRecordStatus(issuanceLog.PreStatus, issuanceLog.PreIndex)...)
 				set.KV = append(set.KV, c.addIssuanceRecordStatus(issuanceLog.Status, issuanceLog.AccountAddr, issuanceLog.Index,
@@ -48,11 +45,9 @@ func (c *Issuance) execLocal(tx *types.Transaction, receipt *types.ReceiptData)
 				//		issuanceLog.IssuanceId)...)
 				//}
 				set.KV = append(set.KV, c.addIssuancePriceRecord(issuanceLog.RecordTime, issuanceLog.BtyPrice)...)
-				break
 			case pty.TyLogIssuanceClose:
 				set.KV = append(set.KV, c.addIssuanceStatus(issuanceLog.Status, issuanceLog.Index, issuanceLog.IssuanceId)...)
 				set.KV = append(set.KV, c.deleteIssuanceStatus(issuanceLog.PreStatus, issuanceLog.PreIndex)...)
-				break
 			}
 		}
 	}

plugin/dapp/issuance/executor/issuance.go

@@ -19,12 +19,6 @@ func InitExecType() {
 	ety.InitFuncList(types.ListMethod(&Issuance{}))
 }
 
-type subConfig struct {
-	ParaRemoteGrpcClient string `json:"paraRemoteGrpcClient"`
-}
-
-var cfg subConfig
-
 // Init issuance
 func Init(name string, cfg *types.Chain33Config, sub []byte) {
 	driverName := GetName()
@@ -60,10 +54,10 @@ func (c *Issuance) GetDriverName() string {
 	return pty.IssuanceX
 }
 
-func (c *Issuance) addIssuanceID(index int64, issuanceId string) (kvs []*types.KeyValue) {
-	key := calcIssuanceKey(issuanceId, index)
+func (c *Issuance) addIssuanceID(index int64, issuanceID string) (kvs []*types.KeyValue) {
+	key := calcIssuanceKey(issuanceID, index)
 	record := &pty.IssuanceRecord{
-		IssuanceId: issuanceId,
+		IssuanceId: issuanceID,
 		Index:      index,
 	}
 	kv := &types.KeyValue{Key: key, Value: types.Encode(record)}
@@ -72,18 +66,18 @@ func (c *Issuance) addIssuanceID(index int64, issuanceId string) (kvs []*types.K
 	return kvs
 }
 
-func (c *Issuance) deleteIssuanceID(index int64, issuanceId string) (kvs []*types.KeyValue) {
-	key := calcIssuanceKey(issuanceId, index)
+func (c *Issuance) deleteIssuanceID(index int64, issuanceID string) (kvs []*types.KeyValue) {
+	key := calcIssuanceKey(issuanceID, index)
 	kv := &types.KeyValue{Key: key, Value: nil}
 
 	kvs = append(kvs, kv)
 	return kvs
 }
 
-func (c *Issuance) addIssuanceStatus(status int32, index int64, issuanceId string) (kvs []*types.KeyValue) {
+func (c *Issuance) addIssuanceStatus(status int32, index int64, issuanceID string) (kvs []*types.KeyValue) {
 	key := calcIssuanceStatusKey(status, index)
 	record := &pty.IssuanceRecord{
-		IssuanceId: issuanceId,
+		IssuanceId: issuanceID,
 		Index:      index,
 	}
 	kv := &types.KeyValue{Key: key, Value: types.Encode(record)}
@@ -100,11 +94,11 @@ func (c *Issuance) deleteIssuanceStatus(status int32, index int64) (kvs []*types
 	return kvs
 }
 
-func (c *Issuance) addIssuanceRecordAddr(accountAddr string, index int64, debtId string, issuanceId string) (kvs []*types.KeyValue) {
+func (c *Issuance) addIssuanceRecordAddr(accountAddr string, index int64, debtID string, issuanceID string) (kvs []*types.KeyValue) {
 	key := calcIssuanceRecordAddrKey(accountAddr, index)
 	record := &pty.IssuanceRecord{
-		IssuanceId: issuanceId,
-		DebtId:     debtId,
+		IssuanceId: issuanceID,
+		DebtId:     debtID,
 		Index:      index,
 	}
 	kv := &types.KeyValue{Key: key, Value: types.Encode(record)}
@@ -121,12 +115,12 @@ func (c *Issuance) deleteIssuanceRecordAddr(accountAddr string, index int64) (kv
 	return kvs
 }
 
-func (c *Issuance) addIssuanceRecordStatus(recordStatus int32, accountAddr string, index int64, debtId string, issuanceId string) (kvs []*types.KeyValue) {
+func (c *Issuance) addIssuanceRecordStatus(recordStatus int32, accountAddr string, index int64, debtID string, issuanceID string) (kvs []*types.KeyValue) {
 	key := calcIssuanceRecordStatusKey(recordStatus, index)
 
 	record := &pty.IssuanceRecord{
-		IssuanceId: issuanceId,
-		DebtId:     debtId,
+		IssuanceId: issuanceID,
+		DebtId:     debtID,
 		Addr:       accountAddr,
 		Index:      index,
 	}