Merge branch 'master' of https://gitlab.33.cn/link33/sidecar

model/pb/ibtp.go

@@ -3,6 +3,8 @@ package pb
 import (
 	"crypto/sha256"
 	"fmt"
+	"strconv"
+	"strings"
 
 	"github.com/meshplus/bitxhub-kit/types"
 )
@@ -40,3 +42,68 @@ func (m *IBTP) Category() IBTP_Category {
 	}
 	return IBTP_UNKNOWN
 }
+
+
+func (m *IBTP) ServicePair() string {
+	return fmt.Sprintf("%s-%s", m.From, m.To)
+}
+
+// ParseFrom should be called after CheckServiceID is called
+func (m *IBTP) ParseFrom() (string, string, string) {
+	bxhID, chainID, serviceID, _ := ParseFullServiceID(m.From)
+	return bxhID, chainID, serviceID
+}
+
+// ParseTo should be called after CheckServiceID is called
+func (m *IBTP) ParseTo() (string, string, string) {
+	bxhID, chainID, serviceID, _ := ParseFullServiceID(m.To)
+	return bxhID, chainID, serviceID
+}
+
+func (m *IBTP) CheckServiceID() error {
+	_, _, _, err := ParseFullServiceID(m.From)
+	if err != nil {
+		return err
+	}
+	_, _, _, err = ParseFullServiceID(m.To)
+	return err
+}
+
+func ParseFullServiceID(id string) (string, string, string, error) {
+	splits := strings.Split(id, ":")
+	if len(splits) != 3 {
+		return "", "", "", fmt.Errorf("invalid full service ID: %s", id)
+	}
+	return splits[0], splits[1], splits[2], nil
+}
+
+func ParseServicePair(servicePair string) (string, string, error) {
+	splits := strings.Split(servicePair, "-")
+	if len(splits) != 2 {
+		return "", "", fmt.Errorf("invalid service pair: %s", servicePair)
+	}
+	return splits[0], splits[1], nil
+}
+
+func ParseIBTPID(id string) (string, string, uint64, error) {
+	splits := strings.Split(id, "-")
+	if len(splits) != 3 {
+		return "", "", 0, fmt.Errorf("invalid IBTP ID: %s", id)
+	}
+
+	index, err := strconv.Atoi(splits[2])
+	if err != nil {
+		return "", "", 0, fmt.Errorf("invalid  IBTP ID: %s", id)
+	}
+
+	return splits[0], splits[1], uint64(index), nil
+}
+
+func GenServicePair(from, to string) string {
+	return fmt.Sprintf("%s-%s", from, to)
+}
+
+
+
+
+

model/pb/ibtp.proto

@@ -61,3 +61,7 @@ message content {
 message IBTPs {
     repeated IBTP ibtps = 1;
 }
+
+message result {
+        repeated bytes data = 1;
+}

model/pb/ibtpx.pb.go

@@ -5,18 +5,15 @@ package pb
 
 import (
 	fmt "fmt"
+	proto "github.com/gogo/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
-
-	proto "github.com/gogo/protobuf/proto"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
-
 var _ = fmt.Errorf
-
 var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
@@ -37,20 +34,15 @@ type IBTPX struct {
 	Count          int32    `protobuf:"varint,7,opt,name=count,proto3" json:"count,omitempty"`
 }
 
-func (m *IBTPX) Reset() { *m = IBTPX{} }
-
+func (m *IBTPX) Reset()         { *m = IBTPX{} }
 func (m *IBTPX) String() string { return proto.CompactTextString(m) }
-
-func (*IBTPX) ProtoMessage() {}
-
+func (*IBTPX) ProtoMessage()    {}
 func (*IBTPX) Descriptor() ([]byte, []int) {
 	return fileDescriptor_8402d80e061d514a, []int{0}
 }
-
 func (m *IBTPX) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-
 func (m *IBTPX) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
 		return xxx_messageInfo_IBTPX.Marshal(b, m, deterministic)
@@ -63,15 +55,12 @@ func (m *IBTPX) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return b[:n], nil
 	}
 }
-
 func (m *IBTPX) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_IBTPX.Merge(m, src)
 }
-
 func (m *IBTPX) XXX_Size() int {
 	return m.Size()
 }
-
 func (m *IBTPX) XXX_DiscardUnknown() {
 	xxx_messageInfo_IBTPX.DiscardUnknown(m)
 }
@@ -244,7 +233,6 @@ func encodeVarintIbtpx(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-
 func (m *IBTPX) Size() (n int) {
 	if m == nil {
 		return 0
@@ -287,11 +275,9 @@ func (m *IBTPX) Size() (n int) {
 func sovIbtpx(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
-
 func sozIbtpx(x uint64) (n int) {
 	return sovIbtpx(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-
 func (m *IBTPX) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -545,7 +531,6 @@ func (m *IBTPX) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-
 func skipIbtpx(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

model/pb/message.pb.go

@@ -5,18 +5,15 @@ package pb
 
 import (
 	fmt "fmt"
+	proto "github.com/gogo/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
-
-	proto "github.com/gogo/protobuf/proto"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
-
 var _ = fmt.Errorf
-
 var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
@@ -35,7 +32,7 @@ const (
 	Message_APPCHAIN_GET        Message_Type = 4
 	Message_INTERCHAIN_META_GET Message_Type = 5
 	Message_RULE_DEPLOY         Message_Type = 6
-	// 异步完成
+	//异步完成
 	Message_IBTP_GET          Message_Type = 7
 	Message_IBTP_SEND         Message_Type = 8
 	Message_IBTP_RECEIPT_SEND Message_Type = 9
@@ -87,20 +84,15 @@ type Message struct {
 	Version string       `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
 }
 
-func (m *Message) Reset() { *m = Message{} }
-
+func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
-
-func (*Message) ProtoMessage() {}
-
+func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
 	return fileDescriptor_33c57e4bae7b9afd, []int{0}
 }
-
 func (m *Message) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-
 func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
 		return xxx_messageInfo_Message.Marshal(b, m, deterministic)
@@ -113,15 +105,12 @@ func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return b[:n], nil
 	}
 }
-
 func (m *Message) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Message.Merge(m, src)
 }
-
 func (m *Message) XXX_Size() int {
 	return m.Size()
 }
-
 func (m *Message) XXX_DiscardUnknown() {
 	xxx_messageInfo_Message.DiscardUnknown(m)
 }
@@ -154,20 +143,15 @@ type Pack struct {
 	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
 }
 
-func (m *Pack) Reset() { *m = Pack{} }
-
+func (m *Pack) Reset()         { *m = Pack{} }
 func (m *Pack) String() string { return proto.CompactTextString(m) }
-
-func (*Pack) ProtoMessage() {}
-
+func (*Pack) ProtoMessage()    {}
 func (*Pack) Descriptor() ([]byte, []int) {
 	return fileDescriptor_33c57e4bae7b9afd, []int{1}
 }
-
 func (m *Pack) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-
 func (m *Pack) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
 		return xxx_messageInfo_Pack.Marshal(b, m, deterministic)
@@ -180,15 +164,12 @@ func (m *Pack) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return b[:n], nil
 	}
 }
-
 func (m *Pack) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Pack.Merge(m, src)
 }
-
 func (m *Pack) XXX_Size() int {
 	return m.Size()
 }
-
 func (m *Pack) XXX_DiscardUnknown() {
 	xxx_messageInfo_Pack.DiscardUnknown(m)
 }
@@ -214,20 +195,15 @@ type PeerInfo struct {
 	Tag string `protobuf:"bytes,2,opt,name=Tag,proto3" json:"Tag,omitempty"`
 }
 
-func (m *PeerInfo) Reset() { *m = PeerInfo{} }
-
+func (m *PeerInfo) Reset()         { *m = PeerInfo{} }
 func (m *PeerInfo) String() string { return proto.CompactTextString(m) }
-
-func (*PeerInfo) ProtoMessage() {}
-
+func (*PeerInfo) ProtoMessage()    {}
 func (*PeerInfo) Descriptor() ([]byte, []int) {
 	return fileDescriptor_33c57e4bae7b9afd, []int{2}
 }
-
 func (m *PeerInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-
 func (m *PeerInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
 		return xxx_messageInfo_PeerInfo.Marshal(b, m, deterministic)
@@ -240,15 +216,12 @@ func (m *PeerInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return b[:n], nil
 	}
 }
-
 func (m *PeerInfo) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_PeerInfo.Merge(m, src)
 }
-
 func (m *PeerInfo) XXX_Size() int {
 	return m.Size()
 }
-
 func (m *PeerInfo) XXX_DiscardUnknown() {
 	xxx_messageInfo_PeerInfo.DiscardUnknown(m)
 }
@@ -441,7 +414,6 @@ func encodeVarintMessage(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-
 func (m *Message) Size() (n int) {
 	if m == nil {
 		return 0
@@ -498,11 +470,9 @@ func (m *PeerInfo) Size() (n int) {
 func sovMessage(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
-
 func sozMessage(x uint64) (n int) {
 	return sovMessage(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-
 func (m *Message) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -640,7 +610,6 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-
 func (m *Pack) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -745,7 +714,6 @@ func (m *Pack) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-
 func (m *PeerInfo) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -860,7 +828,6 @@ func (m *PeerInfo) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-
 func skipMessage(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0