auto ci

main.go

@@ -12,7 +12,7 @@
 package main
 
 import (
-        	_ "github.com/33cn/chain33/system"
+	_ "github.com/33cn/chain33/system"
 	"github.com/33cn/chain33/util/cli"
 	_ "github.com/33cn/plugin/plugin"
 )

plugin/consensus/tendermint/types/round_state.go

@@ -117,9 +117,9 @@ type RoundState struct {
 // RoundStateMessage ...
 func (rs *RoundState) RoundStateMessage() *tmtypes.NewRoundStepMsg {
 	return &tmtypes.NewRoundStepMsg{
-		Height: rs.Height,
-		Round:  int32(rs.Round),
-		Step:   int32(rs.Step),
+		Height:                rs.Height,
+		Round:                 int32(rs.Round),
+		Step:                  int32(rs.Step),
 		SecondsSinceStartTime: int32(time.Since(rs.StartTime).Seconds()),
 		LastCommitRound:       int32(rs.LastCommit.Round()),
 	}

plugin/dapp/cert/authority/tools/cryptogen/generator/utils/certutils.go

@@ -78,9 +78,9 @@ func ParseX509CertificateToSm2(x509Cert *x509.Certificate) *sm2.Certificate {
 		UnknownExtKeyUsage: x509Cert.UnknownExtKeyUsage,
 
 		BasicConstraintsValid: x509Cert.BasicConstraintsValid,
-		IsCA:           x509Cert.IsCA,
-		MaxPathLen:     x509Cert.MaxPathLen,
-		MaxPathLenZero: x509Cert.MaxPathLenZero,
+		IsCA:                  x509Cert.IsCA,
+		MaxPathLen:            x509Cert.MaxPathLen,
+		MaxPathLenZero:        x509Cert.MaxPathLenZero,
 
 		SubjectKeyId:   x509Cert.SubjectKeyId,
 		AuthorityKeyId: x509Cert.AuthorityKeyId,
@@ -141,9 +141,9 @@ func ParseSm2CertificateToX509(sm2Cert *sm2.Certificate) *x509.Certificate {
 		UnknownExtKeyUsage: sm2Cert.UnknownExtKeyUsage,
 
 		BasicConstraintsValid: sm2Cert.BasicConstraintsValid,
-		IsCA:           sm2Cert.IsCA,
-		MaxPathLen:     sm2Cert.MaxPathLen,
-		MaxPathLenZero: sm2Cert.MaxPathLenZero,
+		IsCA:                  sm2Cert.IsCA,
+		MaxPathLen:            sm2Cert.MaxPathLen,
+		MaxPathLenZero:        sm2Cert.MaxPathLenZero,
 
 		SubjectKeyId:   sm2Cert.SubjectKeyId,
 		AuthorityKeyId: sm2Cert.AuthorityKeyId,

plugin/dapp/norm/types/norm.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: norm.proto
 
-/*
-Package types is a generated protocol buffer package.
-
-It is generated from these files:
-	norm.proto
-
-It has these top-level messages:
-	Norm
-	NormAction
-	NormPut
-	NormGetKey
-*/
 package types
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -31,16 +22,39 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Norm struct {
-	NormId     []byte `protobuf:"bytes,1,opt,name=normId,proto3" json:"normId,omitempty"`
-	CreateTime int64  `protobuf:"varint,2,opt,name=createTime" json:"createTime,omitempty"`
-	Key        string `protobuf:"bytes,3,opt,name=key" json:"key,omitempty"`
-	Value      []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	NormId               []byte   `protobuf:"bytes,1,opt,name=normId,proto3" json:"normId,omitempty"`
+	CreateTime           int64    `protobuf:"varint,2,opt,name=createTime,proto3" json:"createTime,omitempty"`
+	Key                  string   `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
+	Value                []byte   `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Norm) Reset()         { *m = Norm{} }
+func (m *Norm) String() string { return proto.CompactTextString(m) }
+func (*Norm) ProtoMessage()    {}
+func (*Norm) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4c505000707f0293, []int{0}
+}
+
+func (m *Norm) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Norm.Unmarshal(m, b)
+}
+func (m *Norm) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Norm.Marshal(b, m, deterministic)
+}
+func (m *Norm) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Norm.Merge(m, src)
+}
+func (m *Norm) XXX_Size() int {
+	return xxx_messageInfo_Norm.Size(m)
+}
+func (m *Norm) XXX_DiscardUnknown() {
+	xxx_messageInfo_Norm.DiscardUnknown(m)
 }
 
-func (m *Norm) Reset()                    { *m = Norm{} }
-func (m *Norm) String() string            { return proto.CompactTextString(m) }
-func (*Norm) ProtoMessage()               {}
-func (*Norm) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Norm proto.InternalMessageInfo
 
 func (m *Norm) GetNormId() []byte {
 	if m != nil {
@@ -73,21 +87,44 @@ func (m *Norm) GetValue() []byte {
 type NormAction struct {
 	// Types that are valid to be assigned to Value:
 	//	*NormAction_Nput
-	Value isNormAction_Value `protobuf_oneof:"value"`
-	Ty    int32              `protobuf:"varint,5,opt,name=ty" json:"ty,omitempty"`
+	Value                isNormAction_Value `protobuf_oneof:"value"`
+	Ty                   int32              `protobuf:"varint,5,opt,name=ty,proto3" json:"ty,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *NormAction) Reset()         { *m = NormAction{} }
+func (m *NormAction) String() string { return proto.CompactTextString(m) }
+func (*NormAction) ProtoMessage()    {}
+func (*NormAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4c505000707f0293, []int{1}
+}
+
+func (m *NormAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormAction.Unmarshal(m, b)
+}
+func (m *NormAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormAction.Marshal(b, m, deterministic)
+}
+func (m *NormAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormAction.Merge(m, src)
+}
+func (m *NormAction) XXX_Size() int {
+	return xxx_messageInfo_NormAction.Size(m)
+}
+func (m *NormAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormAction.DiscardUnknown(m)
 }
 
-func (m *NormAction) Reset()                    { *m = NormAction{} }
-func (m *NormAction) String() string            { return proto.CompactTextString(m) }
-func (*NormAction) ProtoMessage()               {}
-func (*NormAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_NormAction proto.InternalMessageInfo
 
 type isNormAction_Value interface {
 	isNormAction_Value()
 }
 
 type NormAction_Nput struct {
-	Nput *NormPut `protobuf:"bytes,1,opt,name=nput,oneof"`
+	Nput *NormPut `protobuf:"bytes,1,opt,name=nput,proto3,oneof"`
 }
 
 func (*NormAction_Nput) isNormAction_Value() {}
@@ -158,7 +195,7 @@ func _NormAction_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Value.(type) {
 	case *NormAction_Nput:
 		s := proto.Size(x.Nput)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -169,14 +206,37 @@ func _NormAction_OneofSizer(msg proto.Message) (n int) {
 }
 
 type NormPut struct {
-	Key   string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	Key                  string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Value                []byte   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NormPut) Reset()                    { *m = NormPut{} }
-func (m *NormPut) String() string            { return proto.CompactTextString(m) }
-func (*NormPut) ProtoMessage()               {}
-func (*NormPut) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *NormPut) Reset()         { *m = NormPut{} }
+func (m *NormPut) String() string { return proto.CompactTextString(m) }
+func (*NormPut) ProtoMessage()    {}
+func (*NormPut) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4c505000707f0293, []int{2}
+}
+
+func (m *NormPut) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormPut.Unmarshal(m, b)
+}
+func (m *NormPut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormPut.Marshal(b, m, deterministic)
+}
+func (m *NormPut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormPut.Merge(m, src)
+}
+func (m *NormPut) XXX_Size() int {
+	return xxx_messageInfo_NormPut.Size(m)
+}
+func (m *NormPut) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormPut.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NormPut proto.InternalMessageInfo
 
 func (m *NormPut) GetKey() string {
 	if m != nil {
@@ -193,13 +253,36 @@ func (m *NormPut) GetValue() []byte {
 }
 
 type NormGetKey struct {
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key                  string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NormGetKey) Reset()         { *m = NormGetKey{} }
+func (m *NormGetKey) String() string { return proto.CompactTextString(m) }
+func (*NormGetKey) ProtoMessage()    {}
+func (*NormGetKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4c505000707f0293, []int{3}
+}
+
+func (m *NormGetKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormGetKey.Unmarshal(m, b)
+}
+func (m *NormGetKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormGetKey.Marshal(b, m, deterministic)
+}
+func (m *NormGetKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormGetKey.Merge(m, src)
+}
+func (m *NormGetKey) XXX_Size() int {
+	return xxx_messageInfo_NormGetKey.Size(m)
+}
+func (m *NormGetKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormGetKey.DiscardUnknown(m)
 }
 
-func (m *NormGetKey) Reset()                    { *m = NormGetKey{} }
-func (m *NormGetKey) String() string            { return proto.CompactTextString(m) }
-func (*NormGetKey) ProtoMessage()               {}
-func (*NormGetKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_NormGetKey proto.InternalMessageInfo
 
 func (m *NormGetKey) GetKey() string {
 	if m != nil {
@@ -215,9 +298,9 @@ func init() {
 	proto.RegisterType((*NormGetKey)(nil), "types.NormGetKey")
 }
 
-func init() { proto.RegisterFile("norm.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("norm.proto", fileDescriptor_4c505000707f0293) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_4c505000707f0293 = []byte{
 	// 211 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x4a, 0xc6, 0x30,
 	0x10, 0x84, 0x4d, 0xda, 0xfc, 0xc5, 0x55, 0x8a, 0x04, 0x91, 0x9c, 0x4a, 0x28, 0x1e, 0x72, 0x2a,