Commit c9646540 authored by liuyuhang's avatar liuyuhang

modify linter

parent 0acec943
package main package main
import ( import (
"fmt"
"os"
"sort"
"strings"
_ "github.com/33cn/chain33/system" _ "github.com/33cn/chain33/system"
_ "github.com/33cn/plugin/plugin" _ "github.com/33cn/plugin/plugin"
) )
...@@ -35,46 +30,46 @@ func main() { ...@@ -35,46 +30,46 @@ func main() {
[fork.sub.store-kvmvccmavl] [fork.sub.store-kvmvccmavl]
ForkKvmvccmavl=2270000 # store-kvmvccmavl.ForkKvmvccmavl=1870000 ForkKvmvccmavl=2270000 # store-kvmvccmavl.ForkKvmvccmavl=1870000
*/ */
func fmtForks(forks map[string]int64) { //func fmtForks(forks map[string]int64) {
systemFork := make(map[string]int64) // systemFork := make(map[string]int64)
subFork := make(map[string]map[string]int64) // subFork := make(map[string]map[string]int64)
for k, v := range forks { // for k, v := range forks {
if strings.Contains(k, ".") { // if strings.Contains(k, ".") {
str2 := strings.SplitN(k, ".", 2) // str2 := strings.SplitN(k, ".", 2)
if len(str2) != 2 { // if len(str2) != 2 {
fmt.Fprintf(os.Stderr, "can't deal key=%s ", k) // fmt.Fprintf(os.Stderr, "can't deal key=%s ", k)
continue // continue
} // }
_, ok := subFork[str2[0]] // _, ok := subFork[str2[0]]
if !ok { // if !ok {
subFork[str2[0]] = make(map[string]int64) // subFork[str2[0]] = make(map[string]int64)
} // }
subFork[str2[0]][str2[1]] = v // subFork[str2[0]][str2[1]] = v
} else { // } else {
systemFork[k] = v // systemFork[k] = v
} // }
//
} // }
//
fmt.Println("[fork.system]") // fmt.Println("[fork.system]")
for k, v := range systemFork { // for k, v := range systemFork {
fmt.Printf("%s=%d\n", k, v) // fmt.Printf("%s=%d\n", k, v)
} // }
fmt.Println("") // fmt.Println("")
//
plugins := make([]string, 0) // plugins := make([]string, 0)
for plugin := range subFork { // for plugin := range subFork {
plugins = append(plugins, plugin) // plugins = append(plugins, plugin)
} // }
sort.Strings(plugins) // sort.Strings(plugins)
//
for _, plugin := range plugins { // for _, plugin := range plugins {
fmt.Printf("[fork.sub.%s]\n", plugin) // fmt.Printf("[fork.sub.%s]\n", plugin)
forks := subFork[plugin] // forks := subFork[plugin]
for k, v := range forks { // for k, v := range forks {
fmt.Printf("%s=%d\n", k, v) // fmt.Printf("%s=%d\n", k, v)
} // }
fmt.Println("") // fmt.Println("")
} // }
//
} //}
...@@ -119,9 +119,9 @@ type RoundState struct { ...@@ -119,9 +119,9 @@ type RoundState struct {
// RoundStateMessage ... // RoundStateMessage ...
func (rs *RoundState) RoundStateMessage() *tmtypes.NewRoundStepMsg { func (rs *RoundState) RoundStateMessage() *tmtypes.NewRoundStepMsg {
return &tmtypes.NewRoundStepMsg{ return &tmtypes.NewRoundStepMsg{
Height: rs.Height, Height: rs.Height,
Round: int32(rs.Round), Round: int32(rs.Round),
Step: int32(rs.Step), Step: int32(rs.Step),
SecondsSinceStartTime: int32(time.Since(rs.StartTime).Seconds()), SecondsSinceStartTime: int32(time.Since(rs.StartTime).Seconds()),
LastCommitRound: int32(rs.LastCommit.Round()), LastCommitRound: int32(rs.LastCommit.Round()),
} }
......
...@@ -73,9 +73,9 @@ func ParseX509CertificateToSm2(x509Cert *x509.Certificate) *sm2.Certificate { ...@@ -73,9 +73,9 @@ func ParseX509CertificateToSm2(x509Cert *x509.Certificate) *sm2.Certificate {
UnknownExtKeyUsage: x509Cert.UnknownExtKeyUsage, UnknownExtKeyUsage: x509Cert.UnknownExtKeyUsage,
BasicConstraintsValid: x509Cert.BasicConstraintsValid, BasicConstraintsValid: x509Cert.BasicConstraintsValid,
IsCA: x509Cert.IsCA, IsCA: x509Cert.IsCA,
MaxPathLen: x509Cert.MaxPathLen, MaxPathLen: x509Cert.MaxPathLen,
MaxPathLenZero: x509Cert.MaxPathLenZero, MaxPathLenZero: x509Cert.MaxPathLenZero,
SubjectKeyId: x509Cert.SubjectKeyId, SubjectKeyId: x509Cert.SubjectKeyId,
AuthorityKeyId: x509Cert.AuthorityKeyId, AuthorityKeyId: x509Cert.AuthorityKeyId,
...@@ -136,9 +136,9 @@ func ParseSm2CertificateToX509(sm2Cert *sm2.Certificate) *x509.Certificate { ...@@ -136,9 +136,9 @@ func ParseSm2CertificateToX509(sm2Cert *sm2.Certificate) *x509.Certificate {
UnknownExtKeyUsage: sm2Cert.UnknownExtKeyUsage, UnknownExtKeyUsage: sm2Cert.UnknownExtKeyUsage,
BasicConstraintsValid: sm2Cert.BasicConstraintsValid, BasicConstraintsValid: sm2Cert.BasicConstraintsValid,
IsCA: sm2Cert.IsCA, IsCA: sm2Cert.IsCA,
MaxPathLen: sm2Cert.MaxPathLen, MaxPathLen: sm2Cert.MaxPathLen,
MaxPathLenZero: sm2Cert.MaxPathLenZero, MaxPathLenZero: sm2Cert.MaxPathLenZero,
SubjectKeyId: sm2Cert.SubjectKeyId, SubjectKeyId: sm2Cert.SubjectKeyId,
AuthorityKeyId: sm2Cert.AuthorityKeyId, AuthorityKeyId: sm2Cert.AuthorityKeyId,
......
...@@ -55,7 +55,6 @@ var ( ...@@ -55,7 +55,6 @@ var (
TokenSymbol = "X" TokenSymbol = "X"
MainBlockHeightForTransfer = int64(9) MainBlockHeightForTransfer = int64(9)
tempTitle = ""
chain33TestCfg = types.NewChain33Config(testnode.DefaultConfig) chain33TestCfg = types.NewChain33Config(testnode.DefaultConfig)
chain33TestMainCfg = types.NewChain33Config(strings.Replace(types.GetDefaultCfgstring(), "Title=\"local\"", "Title=\"test\"", 1)) chain33TestMainCfg = types.NewChain33Config(strings.Replace(types.GetDefaultCfgstring(), "Title=\"local\"", "Title=\"test\"", 1))
) )
......
...@@ -18,7 +18,6 @@ import ( ...@@ -18,7 +18,6 @@ import (
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
wcom "github.com/33cn/chain33/wallet/common" wcom "github.com/33cn/chain33/wallet/common"
"github.com/33cn/plugin/plugin/dapp/privacy/crypto" "github.com/33cn/plugin/plugin/dapp/privacy/crypto"
privacy "github.com/33cn/plugin/plugin/dapp/privacy/crypto"
ty "github.com/33cn/plugin/plugin/dapp/privacy/types" ty "github.com/33cn/plugin/plugin/dapp/privacy/types"
) )
......
...@@ -36,15 +36,15 @@ var ( ...@@ -36,15 +36,15 @@ var (
} }
) )
func (t *tradeType) GetName() string { func (t *TradeType) GetName() string {
return TradeX return TradeX
} }
func (t *tradeType) GetTypeMap() map[string]int32 { func (t *TradeType) GetTypeMap() map[string]int32 {
return actionName return actionName
} }
func (t *tradeType) GetLogMap() map[int64]*types.LogInfo { func (t *TradeType) GetLogMap() map[int64]*types.LogInfo {
return logInfo return logInfo
} }
...@@ -67,23 +67,23 @@ func InitExecutor(cfg *types.Chain33Config) { ...@@ -67,23 +67,23 @@ func InitExecutor(cfg *types.Chain33Config) {
types.RegistorExecutor(TradeX, NewType(cfg)) types.RegistorExecutor(TradeX, NewType(cfg))
} }
type tradeType struct { type TradeType struct {
types.ExecTypeBase types.ExecTypeBase
} }
func NewType(cfg *types.Chain33Config) *tradeType { func NewType(cfg *types.Chain33Config) *TradeType {
c := &tradeType{} c := &TradeType{}
c.SetChild(c) c.SetChild(c)
c.SetConfig(cfg) c.SetConfig(cfg)
return c return c
} }
func (t *tradeType) GetPayload() types.Message { func (t *TradeType) GetPayload() types.Message {
return &Trade{} return &Trade{}
} }
//ActionName : //ActionName :
func (t *tradeType) ActionName(tx *types.Transaction) string { func (t *TradeType) ActionName(tx *types.Transaction) string {
var action Trade var action Trade
err := types.Decode(tx.Payload, &action) err := types.Decode(tx.Payload, &action)
if err != nil { if err != nil {
...@@ -105,7 +105,7 @@ func (t *tradeType) ActionName(tx *types.Transaction) string { ...@@ -105,7 +105,7 @@ func (t *tradeType) ActionName(tx *types.Transaction) string {
return "unknown" return "unknown"
} }
func (t *tradeType) Amount(tx *types.Transaction) (int64, error) { func (t *TradeType) Amount(tx *types.Transaction) (int64, error) {
//TODO: 补充和完善token和trade分支的amount的计算, added by hzj //TODO: 补充和完善token和trade分支的amount的计算, added by hzj
var trade Trade var trade Trade
err := types.Decode(tx.GetPayload(), &trade) err := types.Decode(tx.GetPayload(), &trade)
...@@ -123,7 +123,7 @@ func (t *tradeType) Amount(tx *types.Transaction) (int64, error) { ...@@ -123,7 +123,7 @@ func (t *tradeType) Amount(tx *types.Transaction) (int64, error) {
return 0, nil return 0, nil
} }
func (t *tradeType) CreateTx(action string, message json.RawMessage) (*types.Transaction, error) { func (t *TradeType) CreateTx(action string, message json.RawMessage) (*types.Transaction, error) {
//var tx *types.Transaction //var tx *types.Transaction
cfg := t.GetConfig() cfg := t.GetConfig()
if action == "TradeSellLimit" { if action == "TradeSellLimit" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment