fix a bug for contentstorage

plugin/dapp/storage/proto/storage.proto

@@ -24,12 +24,12 @@ message StorageAction {
 }
 // 内容存证模型
 message ContentOnlyNotaryStorage {
-    // Op 0表示创建 1表示追加add
-    int32  op = 1;
     //长度需要小于512k
-    bytes content = 2;
+    bytes content = 1;
     //自定义的主键，可以为空，如果没传，则用txhash为key
-    string key = 3;
+    string key = 2;
+    // Op 0表示创建 1表示追加add
+    int32  op = 3;
     //字符串值
     string value = 4;
 }

plugin/dapp/storage/types/storage.pb.go

@@ -292,12 +292,12 @@ func (*StorageAction) XXX_OneofWrappers() []interface{} {
 
 // 内容存证模型
 type ContentOnlyNotaryStorage struct {
-	// Op 0表示创建 1表示追加add
-	Op int32 `protobuf:"varint,1,opt,name=op,proto3" json:"op,omitempty"`
 	//长度需要小于512k
-	Content []byte `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"`
+	Content []byte `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
 	//自定义的主键，可以为空，如果没传，则用txhash为key
-	Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
+	Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
+	// Op 0表示创建 1表示追加add
+	Op int32 `protobuf:"varint,3,opt,name=op,proto3" json:"op,omitempty"`
 	//字符串值
 	Value                string   `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -330,13 +330,6 @@ func (m *ContentOnlyNotaryStorage) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ContentOnlyNotaryStorage proto.InternalMessageInfo
 
-func (m *ContentOnlyNotaryStorage) GetOp() int32 {
-	if m != nil {
-		return m.Op
-	}
-	return 0
-}
-
 func (m *ContentOnlyNotaryStorage) GetContent() []byte {
 	if m != nil {
 		return m.Content
@@ -351,6 +344,13 @@ func (m *ContentOnlyNotaryStorage) GetKey() string {
 	return ""
 }
 
+func (m *ContentOnlyNotaryStorage) GetOp() int32 {
+	if m != nil {
+		return m.Op
+	}
+	return 0
+}
+
 func (m *ContentOnlyNotaryStorage) GetValue() string {
 	if m != nil {
 		return m.Value
@@ -808,38 +808,38 @@ func init() {
 }
 
 var fileDescriptor_0d2c4ccf1453ffdb = []byte{
-	// 487 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0xcd, 0x8e, 0x94, 0x40,
-	0x10, 0xc7, 0x05, 0x86, 0x41, 0x0a, 0x96, 0xec, 0xb6, 0xeb, 0x06, 0xa3, 0x89, 0x84, 0xc3, 0x66,
-	0x62, 0xe2, 0x1c, 0xc6, 0xab, 0x89, 0xba, 0x9b, 0x4d, 0xc6, 0x68, 0x34, 0xf6, 0xfa, 0x02, 0x2c,
-	0xe9, 0xc8, 0x64, 0x48, 0x37, 0x81, 0x1e, 0x23, 0xaf, 0xe0, 0xc9, 0x27, 0xf0, 0xe6, 0x7b, 0x1a,
-	0x9a, 0x6a, 0x16, 0x06, 0x26, 0x7a, 0x30, 0xf1, 0xb2, 0xb7, 0xae, 0xae, 0x7f, 0xfd, 0xea, 0x0b,
-	0xd2, 0x70, 0x54, 0x49, 0x51, 0x26, 0x5f, 0xd8, 0xb2, 0x28, 0x85, 0x14, 0xc4, 0x96, 0x75, 0xc1,
-	0xaa, 0xf8, 0xbb, 0x05, 0xce, 0x75, 0xeb, 0x20, 0x6f, 0x21, 0x48, 0x05, 0x97, 0x8c, 0x4b, 0xbc,
-	0x09, 0x8d, 0xc8, 0x58, 0x78, 0xab, 0xa7, 0x4b, 0xa5, 0x5d, 0x5e, 0xb6, 0xce, 0x8f, 0x3c, 0xaf,
-	0x3f, 0x08, 0x99, 0x94, 0x35, 0xca, 0xd6, 0xf7, 0xe8, 0x5e, 0x20, 0x79, 0x0d, 0x5e, 0x96, 0x54,
-	0x99, 0xe6, 0x98, 0x8a, 0xf3, 0x04, 0x39, 0xeb, 0xa4, 0xca, 0xa6, 0x20, 0xfd, 0x10, 0xf2, 0x12,
-	0xbc, 0x7c, 0xc3, 0xb7, 0x9a, 0x60, 0x29, 0x42, 0x88, 0x84, 0xf7, 0x1b, 0xbe, 0x1d, 0x45, 0xf7,
-	0xe4, 0xe4, 0x0a, 0x02, 0xc6, 0xd3, 0xb2, 0x2e, 0xba, 0x56, 0x66, 0x0a, 0xf0, 0x18, 0x01, 0x57,
-	0xad, 0x73, 0xd4, 0xc6, 0x30, 0x88, 0x7c, 0x86, 0x07, 0xfa, 0x26, 0x4b, 0x4a, 0xa6, 0x59, 0xb6,
-	0x62, 0x45, 0x43, 0x96, 0x52, 0xec, 0x03, 0xa7, 0xc2, 0x49, 0x00, 0xa6, 0xac, 0xc3, 0x79, 0x64,
-	0x2c, 0x6c, 0x6a, 0xca, 0xfa, 0xc2, 0x01, 0xfb, 0x6b, 0x92, 0xef, 0x58, 0xfc, 0xc3, 0x82, 0x23,
-	0x14, 0xbd, 0x49, 0xe5, 0x46, 0xf0, 0xbb, 0x95, 0xfc, 0xef, 0x95, 0xe4, 0x10, 0x1e, 0x9a, 0x71,
-	0x13, 0x24, 0x0a, 0xb5, 0x10, 0x9b, 0x9a, 0xa2, 0x20, 0x21, 0x38, 0x38, 0x73, 0x35, 0x5d, 0x9f,
-	0x6a, 0x93, 0x1c, 0x83, 0xb5, 0x65, 0xb5, 0x9a, 0x98, 0x4b, 0x9b, 0x23, 0x39, 0xc5, 0x04, 0x6a,
-	0x08, 0x2e, 0xc5, 0x6c, 0xd7, 0xf0, 0x70, 0x72, 0x13, 0x84, 0xc0, 0xac, 0xd9, 0x84, 0x4a, 0xe6,
-	0x53, 0x75, 0xd6, 0x50, 0x73, 0x02, 0x6a, 0xf5, 0xa1, 0x29, 0x9c, 0x8c, 0x96, 0xd3, 0x00, 0x9b,
-	0xe5, 0x68, 0x60, 0x73, 0xee, 0x92, 0x98, 0xe3, 0x24, 0x7f, 0xac, 0xfc, 0xa7, 0x01, 0xa7, 0x53,
-	0x1b, 0x24, 0x11, 0x78, 0x38, 0x85, 0xf5, 0x6d, 0x03, 0xfd, 0x2b, 0x72, 0xde, 0x7d, 0x18, 0x97,
-	0x83, 0xe9, 0xed, 0xdd, 0x36, 0x89, 0xb9, 0xe0, 0x69, 0xdb, 0x9d, 0x4f, 0x5b, 0x43, 0x17, 0x38,
-	0x9b, 0x28, 0xd0, 0xee, 0x17, 0xf8, 0xcb, 0x80, 0x47, 0x07, 0x3f, 0x8b, 0x7f, 0x58, 0xe5, 0x19,
-	0xcc, 0x8b, 0xdd, 0xcd, 0x3b, 0x9c, 0x99, 0x4f, 0xd1, 0xfa, 0xeb, 0x3a, 0xcf, 0xc1, 0xff, 0xb4,
-	0x63, 0xb7, 0x95, 0x9d, 0xc1, 0x5c, 0x7e, 0xeb, 0x8a, 0x72, 0x29, 0x5a, 0xf1, 0x73, 0x38, 0xb9,
-	0x48, 0x64, 0x9a, 0x0d, 0xc4, 0x21, 0x38, 0xad, 0xbb, 0x0a, 0x8d, 0xc8, 0x5a, 0xb8, 0x54, 0x9b,
-	0xf1, 0x2b, 0x94, 0x53, 0x56, 0xe4, 0x9d, 0xfc, 0x19, 0xdc, 0xc7, 0x47, 0xa1, 0xd5, 0x7b, 0xab,
-	0x00, 0x7f, 0x20, 0x54, 0xd0, 0xce, 0x1f, 0x1f, 0x43, 0x40, 0x59, 0xca, 0x36, 0xdd, 0x9f, 0xb8,
-	0x72, 0xc1, 0x41, 0xef, 0xcd, 0x5c, 0xbd, 0x29, 0x2f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x4a,
-	0xd4, 0x84, 0x62, 0x64, 0x06, 0x00, 0x00,
+	// 488 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0xc1, 0x8a, 0xd4, 0x40,
+	0x10, 0x35, 0xc9, 0x64, 0x62, 0x2a, 0xb3, 0x61, 0xb7, 0x5d, 0x97, 0x88, 0x82, 0x21, 0x87, 0x65,
+	0x10, 0x9c, 0xc3, 0x78, 0x15, 0xd4, 0x95, 0x85, 0x11, 0x45, 0xb1, 0xd7, 0x1f, 0xc8, 0x86, 0xc6,
+	0x0c, 0x13, 0xba, 0x43, 0xd2, 0x23, 0xe6, 0x17, 0x3c, 0xf9, 0x05, 0xde, 0xfc, 0x4f, 0x49, 0xa7,
+	0xba, 0x37, 0x99, 0x64, 0xc1, 0x83, 0xe0, 0x65, 0x6f, 0x5d, 0x5d, 0xaf, 0xde, 0x7b, 0x55, 0x95,
+	0xd0, 0x70, 0x54, 0x4b, 0x51, 0xa5, 0x5f, 0xd9, 0xaa, 0xac, 0x84, 0x14, 0xc4, 0x95, 0x4d, 0xc9,
+	0xea, 0xe4, 0x87, 0x03, 0xde, 0x55, 0x97, 0x20, 0xef, 0x20, 0xcc, 0x04, 0x97, 0x8c, 0x4b, 0xbc,
+	0x89, 0xac, 0xd8, 0x5a, 0x06, 0xeb, 0xa7, 0x2b, 0x85, 0x5d, 0xbd, 0xed, 0x92, 0x9f, 0x78, 0xd1,
+	0x7c, 0x14, 0x32, 0xad, 0x1a, 0x84, 0x6d, 0xee, 0xd1, 0x83, 0x42, 0xf2, 0x1a, 0x82, 0x3c, 0xad,
+	0x73, 0xcd, 0x63, 0x2b, 0x9e, 0x27, 0xc8, 0xb3, 0x49, 0xeb, 0x7c, 0x8a, 0xa4, 0x5f, 0x42, 0x5e,
+	0x42, 0x50, 0x6c, 0xf9, 0x4e, 0x33, 0x38, 0x8a, 0x21, 0x42, 0x86, 0x0f, 0x5b, 0xbe, 0x1b, 0x55,
+	0xf7, 0xe0, 0xe4, 0x12, 0x42, 0xc6, 0xb3, 0xaa, 0x29, 0x4d, 0x2b, 0x33, 0x45, 0xf0, 0x18, 0x09,
+	0x2e, 0xbb, 0xe4, 0xa8, 0x8d, 0x61, 0x11, 0xf9, 0x02, 0x0f, 0xf4, 0x4d, 0x9e, 0x56, 0x4c, 0x73,
+	0xb9, 0x8a, 0x2b, 0x1e, 0x72, 0x29, 0xc4, 0x21, 0xe1, 0x54, 0x39, 0x09, 0xc1, 0x96, 0x4d, 0x34,
+	0x8f, 0xad, 0xa5, 0x4b, 0x6d, 0xd9, 0x5c, 0x78, 0xe0, 0x7e, 0x4b, 0x8b, 0x3d, 0x4b, 0x7e, 0x3a,
+	0x70, 0x84, 0xa0, 0x37, 0x99, 0xdc, 0x0a, 0x7e, 0xb7, 0x92, 0xff, 0xbd, 0x92, 0x02, 0xa2, 0xdb,
+	0x66, 0x4c, 0x22, 0xf0, 0x70, 0xc6, 0x6a, 0x2b, 0x0b, 0xaa, 0x43, 0x72, 0x0c, 0xce, 0x8e, 0x35,
+	0x6a, 0xc6, 0x3e, 0x6d, 0x8f, 0xad, 0x80, 0x28, 0xd5, 0xc8, 0x5c, 0x6a, 0x8b, 0x92, 0x9c, 0xa2,
+	0x80, 0x1a, 0x82, 0x4f, 0x51, 0xed, 0x0a, 0x1e, 0x4e, 0x6e, 0x82, 0x10, 0x98, 0xb5, 0x9b, 0x40,
+	0x1d, 0x75, 0x9e, 0x10, 0x31, 0xa4, 0x4e, 0x9f, 0x34, 0x83, 0x93, 0xd1, 0x72, 0x5a, 0xc2, 0x76,
+	0x39, 0x9a, 0xb0, 0x3d, 0x1b, 0x11, 0x7b, 0x2c, 0xe2, 0x4c, 0x88, 0x0c, 0x9c, 0xff, 0xb2, 0xe0,
+	0x74, 0x6a, 0x83, 0x24, 0x86, 0x00, 0xa7, 0xb2, 0xb9, 0x69, 0xa0, 0x7f, 0x45, 0xce, 0xcd, 0x87,
+	0x81, 0x93, 0x46, 0x03, 0x07, 0xb7, 0xad, 0x30, 0x17, 0x3c, 0xeb, 0xba, 0x5b, 0xd0, 0x2e, 0xd0,
+	0x06, 0x67, 0x13, 0x06, 0xdd, 0xbe, 0xc1, 0xdf, 0x16, 0x3c, 0xba, 0xf5, 0xb3, 0xf8, 0x87, 0x2e,
+	0xcf, 0x60, 0x5e, 0xee, 0xaf, 0xdf, 0xe3, 0xcc, 0x16, 0x14, 0xa3, 0xbf, 0xf6, 0x79, 0x0e, 0x8b,
+	0xcf, 0x7b, 0x76, 0xe3, 0xec, 0x0c, 0xe6, 0xf2, 0xbb, 0x31, 0xe5, 0x53, 0x8c, 0x92, 0xe7, 0x70,
+	0x72, 0x91, 0xca, 0x2c, 0x1f, 0x80, 0x23, 0xf0, 0xba, 0x74, 0x1d, 0x59, 0xb1, 0xb3, 0xf4, 0xa9,
+	0x0e, 0x93, 0x57, 0x08, 0xa7, 0xac, 0x2c, 0x0c, 0xfc, 0x19, 0xdc, 0xc7, 0x47, 0xa1, 0xc3, 0x07,
+	0xeb, 0x10, 0x7f, 0x20, 0x44, 0x50, 0x93, 0x4f, 0x8e, 0x21, 0xa4, 0x2c, 0x63, 0x5b, 0xf3, 0x27,
+	0xae, 0x7d, 0xf0, 0x30, 0x7b, 0x3d, 0x57, 0x6f, 0xca, 0x8b, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x38, 0xc7, 0xa7, 0x39, 0x64, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.