fix duplicate proto

plugin/dapp/exchange/proto/exchange.proto

@@ -15,9 +15,9 @@ message ExchangeAction {
 //限价订单
 message LimitOrder {
     //交易对
-    Asset leftAsset  = 1;
+    asset leftAsset  = 1;
     //交易对
-    Asset rightAsset  = 2;
+    asset rightAsset  = 2;
     //价格
     float price  = 3;
     //总量
@@ -29,9 +29,9 @@ message LimitOrder {
 //市价委托
 message MarketOrder {
     //资产1
-    Asset leftAsset  = 1;
+    asset leftAsset  = 1;
     //资产2
-    Asset rightAsset = 2;
+    asset rightAsset = 2;
     //总量
     int64 amount = 3;
     //操作， 1为买，2为卖
@@ -44,7 +44,7 @@ message RevokeOrder {
     string orderID   = 1;
 }
 //资产类型
-message Asset {
+message asset {
     string execer = 1;
     string symbol = 2;
 }
@@ -85,9 +85,9 @@ message OrderID {
 //查询接口
 message QueryMarketDepth {
     //资产1
-    Asset leftAsset  = 1;
+    asset leftAsset  = 1;
     //资产2
-    Asset rightAsset = 2;
+    asset rightAsset = 2;
     //操作， 1为买，2为卖
     int32 op = 3;
     // 这里用价格作为索引值
@@ -98,9 +98,9 @@ message QueryMarketDepth {
 //市场深度
 message MarketDepth {
     //资产1
-    Asset leftAsset  = 1;
+    asset leftAsset  = 1;
     //资产2
-    Asset rightAsset = 2;
+    asset rightAsset = 2;
     //价格
     float price  = 3;
     //总量
@@ -116,9 +116,9 @@ message MarketDepthList {
 //查询最新得成交信息,外部接口
 message QueryCompletedOrderList {
     //资产1
-    Asset leftAsset  = 1;
+    asset leftAsset  = 1;
     //资产2
-    Asset rightAsset = 2;
+    asset rightAsset = 2;
     // 索引值
     int64 index = 3;
     //单页返回多少条记录，默认返回10条,为了系统安全最多单次只能返回20条

plugin/dapp/exchange/types/exchange.pb.go

@@ -28,15 +28,12 @@ It has these top-level messages:
 */
 package types
 
-import (
-	fmt "fmt"
-
-	proto "github.com/golang/protobuf/proto"
-
-	math "math"
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
 
+import (
 	context "golang.org/x/net/context"
-
 	grpc "google.golang.org/grpc"
 )
 
@@ -910,7 +907,7 @@ func init() {
 	proto.RegisterType((*LimitOrder)(nil), "types.LimitOrder")
 	proto.RegisterType((*MarketOrder)(nil), "types.MarketOrder")
 	proto.RegisterType((*RevokeOrder)(nil), "types.RevokeOrder")
-	proto.RegisterType((*Asset)(nil), "types.Asset")
+	proto.RegisterType((*Asset)(nil), "types.asset")
 	proto.RegisterType((*Order)(nil), "types.Order")
 	proto.RegisterType((*OrderPrice)(nil), "types.OrderPrice")
 	proto.RegisterType((*OrderID)(nil), "types.OrderID")
@@ -965,7 +962,7 @@ var _Exchange_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("exchange.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 658 bytes of a gzipped FileDescriptorProto
+	// 659 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xed, 0x6a, 0xd4, 0x4c,
 	0x14, 0x6e, 0xbe, 0xba, 0xcd, 0xd9, 0x97, 0xed, 0xeb, 0x20, 0x1a, 0x44, 0x64, 0xc9, 0x8f, 0x5a,
 	0x44, 0x57, 0x68, 0xc1, 0x8f, 0x9f, 0xd5, 0x0a, 0x2d, 0x54, 0xaa, 0x83, 0x37, 0x90, 0x26, 0xc7,
@@ -979,33 +976,33 @@ var fileDescriptor0 = []byte{
 	0x96, 0x83, 0x35, 0x6e, 0x3b, 0xca, 0xb8, 0x1a, 0xcf, 0xcb, 0x33, 0x54, 0x71, 0xde, 0x42, 0x1c,
 	0x37, 0x16, 0x19, 0x67, 0x39, 0xb2, 0x01, 0xb8, 0x62, 0x1e, 0xad, 0x0f, 0x9d, 0xed, 0x80, 0xbb,
 	0x62, 0xfe, 0xa2, 0x07, 0xc1, 0x79, 0x52, 0xcc, 0x30, 0xfe, 0xec, 0x00, 0x18, 0x96, 0xec, 0x01,
-	0x84, 0x05, 0xbe, 0x17, 0x7b, 0x4d, 0x83, 0x42, 0xd7, 0xf2, 0x9f, 0xce, 0x4e, 0x67, 0xdc, 0x98,
-	0xd9, 0x43, 0x80, 0x3a, 0x3f, 0x1d, 0x6b, 0x67, 0x77, 0x89, 0xb3, 0x65, 0x67, 0x37, 0x21, 0xa8,
-	0xea, 0x3c, 0x45, 0xe2, 0xec, 0x72, 0x05, 0xd8, 0x2d, 0x58, 0x4f, 0x26, 0xe5, 0x6c, 0x2a, 0x22,
-	0x7f, 0xe8, 0x6c, 0x7b, 0x5c, 0x23, 0xc9, 0xb7, 0xac, 0xa2, 0x40, 0xf1, 0x2d, 0xab, 0xf8, 0x93,
-	0x03, 0x7d, 0xab, 0x2d, 0x2b, 0xe4, 0x69, 0x18, 0x79, 0x4b, 0x18, 0xf9, 0x1d, 0xa3, 0xfb, 0xd0,
-	0xb7, 0xfa, 0xcd, 0x22, 0xe8, 0x95, 0xf2, 0xe3, 0x70, 0x9f, 0xe8, 0x84, 0xbc, 0x85, 0xf1, 0x53,
-	0x08, 0xba, 0xcc, 0x78, 0x81, 0xa9, 0x16, 0x49, 0xc8, 0x35, 0x92, 0xe7, 0xcd, 0x7c, 0x72, 0x52,
-	0x16, 0xc4, 0x2d, 0xe4, 0x1a, 0xc5, 0xdf, 0x5d, 0x08, 0xae, 0x49, 0x7e, 0x49, 0x7c, 0xee, 0x1f,
-	0x89, 0xcf, 0xfb, 0x5d, 0xf1, 0x29, 0x11, 0xf9, 0xad, 0x88, 0xd8, 0x1d, 0xd8, 0x90, 0x25, 0xcc,
-	0x04, 0x66, 0x34, 0x2a, 0x8f, 0x77, 0x58, 0x52, 0x3e, 0x49, 0x8a, 0x64, 0x9a, 0x22, 0xa9, 0xce,
-	0xe3, 0x2d, 0xa4, 0x72, 0x45, 0x22, 0x66, 0x4d, 0xd4, 0xa3, 0x4c, 0x1a, 0x31, 0x06, 0x7e, 0x92,
-	0x65, 0x75, 0xb4, 0x41, 0x15, 0xd2, 0x37, 0xbb, 0x07, 0x30, 0xab, 0xb2, 0x44, 0xe0, 0xbb, 0x7c,
-	0x82, 0x51, 0x48, 0x89, 0xac, 0x13, 0x29, 0xaa, 0x7c, 0x9a, 0xe1, 0x45, 0x04, 0x64, 0x52, 0xc0,
-	0x88, 0xfb, 0x19, 0x00, 0x31, 0x7f, 0x43, 0x5a, 0xeb, 0x14, 0xe8, 0xd8, 0x0a, 0xec, 0x52, 0xb8,
-	0x56, 0x8a, 0xf8, 0x31, 0xf4, 0x8e, 0x75, 0x8b, 0x07, 0xe0, 0x76, 0x7d, 0x77, 0x0f, 0xf7, 0x7f,
-	0x11, 0xf0, 0xd5, 0x81, 0xff, 0xdf, 0xce, 0xb0, 0x9e, 0xab, 0xfe, 0xed, 0x63, 0x25, 0xc6, 0x2b,
-	0x54, 0xa9, 0x52, 0xa3, 0xd7, 0xaa, 0xd1, 0xd4, 0xe6, 0x5f, 0xaa, 0x2d, 0x25, 0x29, 0xab, 0x45,
-	0x52, 0x20, 0xfe, 0xd2, 0xed, 0xd2, 0xaa, 0x59, 0xfe, 0xdd, 0xce, 0x3f, 0x87, 0x4d, 0x8b, 0xe6,
-	0x51, 0xde, 0x08, 0xb6, 0x05, 0x7e, 0x91, 0x37, 0x92, 0xa5, 0x77, 0x45, 0xb2, 0xe4, 0xc5, 0xc9,
-	0x1e, 0x7f, 0x73, 0xe0, 0x36, 0x4d, 0xe3, 0x65, 0x39, 0xa9, 0x0a, 0x14, 0x98, 0xd1, 0x34, 0x29,
-	0xc7, 0x4a, 0xcb, 0x55, 0xca, 0xf0, 0x2c, 0x65, 0x98, 0x21, 0xf8, 0xd6, 0x10, 0xd8, 0x5d, 0x08,
-	0xb3, 0xbc, 0x46, 0x7a, 0x42, 0x74, 0xcd, 0xe6, 0x20, 0xde, 0x02, 0x20, 0xfa, 0xd7, 0xdd, 0x2d,
-	0x1f, 0x1d, 0x18, 0x18, 0x47, 0x2a, 0xcf, 0xac, 0x97, 0xb3, 0xb0, 0x5e, 0x11, 0xf4, 0xe4, 0x4a,
-	0x61, 0xd3, 0xe8, 0x6b, 0xa6, 0x85, 0xff, 0x90, 0xf6, 0x23, 0x08, 0x0d, 0x91, 0xe1, 0xc2, 0xac,
-	0xda, 0xae, 0x91, 0x5d, 0x4f, 0xe9, 0x03, 0x6c, 0x72, 0x4c, 0x31, 0xaf, 0x44, 0xfb, 0xa4, 0xb2,
-	0x18, 0x82, 0xd2, 0x7a, 0x47, 0x17, 0xa3, 0x94, 0x89, 0x8d, 0xe4, 0xf5, 0x25, 0xd2, 0x31, 0x1d,
-	0xca, 0x6a, 0xae, 0xe6, 0xb7, 0x1d, 0x96, 0xd7, 0xb7, 0x03, 0xf2, 0xf2, 0x52, 0x7f, 0x3d, 0x59,
-	0xa7, 0xf7, 0x7e, 0xf7, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x7b, 0x52, 0x3b, 0x01, 0x08,
-	0x00, 0x00,
+	0x84, 0x05, 0xbe, 0x17, 0x7b, 0x4d, 0x83, 0x42, 0xd7, 0xf2, 0x9f, 0xce, 0x9e, 0xc8, 0x33, 0x6e,
+	0xcc, 0xec, 0x21, 0x40, 0x9d, 0x9f, 0x8e, 0xb5, 0xb3, 0xbb, 0xc4, 0xd9, 0xb2, 0xb3, 0x9b, 0x10,
+	0x54, 0x75, 0x9e, 0x22, 0x71, 0x76, 0xb9, 0x02, 0xec, 0x16, 0xac, 0x27, 0x93, 0x72, 0x36, 0x15,
+	0x91, 0x3f, 0x74, 0xb6, 0x3d, 0xae, 0x91, 0xe4, 0x5b, 0x56, 0x51, 0xa0, 0xf8, 0x96, 0x55, 0xfc,
+	0xc9, 0x81, 0xbe, 0xd5, 0x96, 0x15, 0xf2, 0x34, 0x8c, 0xbc, 0x25, 0x8c, 0xfc, 0x8e, 0xd1, 0x7d,
+	0xe8, 0x5b, 0xfd, 0x66, 0x11, 0xf4, 0x4a, 0xf9, 0x71, 0xb8, 0x4f, 0x74, 0x42, 0xde, 0xc2, 0xf8,
+	0x29, 0x04, 0x49, 0x9b, 0x19, 0x2f, 0x30, 0xd5, 0x22, 0x09, 0xb9, 0x46, 0xf2, 0xbc, 0x99, 0x4f,
+	0x4e, 0xca, 0x82, 0xb8, 0x85, 0x5c, 0xa3, 0xf8, 0xbb, 0x0b, 0xc1, 0x35, 0xc9, 0x2f, 0x89, 0xcf,
+	0xfd, 0x23, 0xf1, 0x79, 0xbf, 0x2b, 0x3e, 0x25, 0x22, 0xbf, 0x15, 0x11, 0xbb, 0x03, 0x1b, 0xb2,
+	0x84, 0x99, 0xc0, 0x8c, 0x46, 0xe5, 0xf1, 0x0e, 0x4b, 0xca, 0x27, 0x49, 0x91, 0x4c, 0x53, 0x24,
+	0xd5, 0x79, 0xbc, 0x85, 0x54, 0xae, 0x48, 0xc4, 0xac, 0x89, 0x7a, 0x94, 0x49, 0x23, 0xc6, 0xc0,
+	0x4f, 0xb2, 0xac, 0x8e, 0x36, 0xa8, 0x42, 0xfa, 0x66, 0xf7, 0x00, 0x66, 0x55, 0x96, 0x08, 0x7c,
+	0x97, 0x4f, 0x30, 0x0a, 0x29, 0x91, 0x75, 0x22, 0x45, 0x95, 0x4f, 0x33, 0xbc, 0x88, 0x80, 0x4c,
+	0x0a, 0x18, 0x71, 0x3f, 0x03, 0x20, 0xe6, 0x6f, 0x48, 0x6b, 0x9d, 0x02, 0x1d, 0x5b, 0x81, 0x5d,
+	0x0a, 0xd7, 0x4a, 0x11, 0x3f, 0x86, 0xde, 0xb1, 0x6e, 0xf1, 0x00, 0xdc, 0xae, 0xef, 0xee, 0xe1,
+	0xfe, 0x2f, 0x02, 0xbe, 0x3a, 0xf0, 0xff, 0xdb, 0x19, 0xd6, 0x73, 0xd5, 0xbf, 0x7d, 0xac, 0xc4,
+	0x78, 0x85, 0x2a, 0x55, 0x6a, 0xf4, 0x5a, 0x35, 0x9a, 0xda, 0xfc, 0x4b, 0xb5, 0xa5, 0x24, 0x65,
+	0xb5, 0x48, 0x0a, 0xc4, 0x5f, 0xba, 0x5d, 0x5a, 0x35, 0xcb, 0xbf, 0xdb, 0xf9, 0xe7, 0xb0, 0x69,
+	0xd1, 0x3c, 0xca, 0x1b, 0xc1, 0xb6, 0xc0, 0x2f, 0xf2, 0x46, 0xb2, 0xf4, 0xae, 0x48, 0x96, 0xbc,
+	0x38, 0xd9, 0xe3, 0x6f, 0x0e, 0xdc, 0xa6, 0x69, 0xbc, 0x2c, 0x27, 0x55, 0x81, 0x02, 0x33, 0x9a,
+	0x26, 0xe5, 0x58, 0x69, 0xb9, 0x4a, 0x19, 0x9e, 0xa5, 0x0c, 0x33, 0x04, 0xdf, 0x1a, 0x02, 0xbb,
+	0x0b, 0x61, 0x96, 0xd7, 0x48, 0x4f, 0x88, 0xae, 0xd9, 0x1c, 0xc4, 0x5b, 0x00, 0x44, 0xff, 0xba,
+	0xbb, 0xe5, 0xa3, 0x03, 0x03, 0xe3, 0x48, 0xe5, 0x99, 0xf5, 0x72, 0x16, 0xd6, 0x2b, 0x82, 0x9e,
+	0x5c, 0x29, 0x6c, 0x1a, 0x7d, 0xcd, 0xb4, 0xf0, 0x1f, 0xd2, 0x7e, 0x04, 0xa1, 0x21, 0x32, 0x5c,
+	0x98, 0x55, 0xdb, 0x35, 0xb2, 0xeb, 0x29, 0x7d, 0x80, 0x4d, 0x8e, 0x29, 0xe6, 0x95, 0x68, 0x9f,
+	0x54, 0x16, 0x43, 0x50, 0x5a, 0xef, 0xe8, 0x62, 0x94, 0x32, 0xb1, 0x91, 0xbc, 0xbe, 0x44, 0x3a,
+	0xa6, 0x43, 0x59, 0xcd, 0xd5, 0xfc, 0xb6, 0xc3, 0xf2, 0xfa, 0x76, 0x40, 0x5e, 0x5e, 0xea, 0xaf,
+	0x27, 0xeb, 0xf4, 0xde, 0xef, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x08, 0x34, 0x16, 0x15, 0x01,
+	0x08, 0x00, 0x00,
 }