Commit 71978d8d authored by suyanlong's avatar suyanlong

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

parents 3c662c5f 04eb4a2e
Pipeline #8626 canceled with stages
......@@ -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
......@@ -30,19 +27,14 @@ type Uint64Slice struct {
}
func (m *Uint64Slice) Reset() { *m = Uint64Slice{} }
func (m *Uint64Slice) String() string { return proto.CompactTextString(m) }
func (*Uint64Slice) ProtoMessage() {}
func (*Uint64Slice) Descriptor() ([]byte, []int) {
return fileDescriptor_0cc45f6ac745dd88, []int{0}
}
func (m *Uint64Slice) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *Uint64Slice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_Uint64Slice.Marshal(b, m, deterministic)
......@@ -55,15 +47,12 @@ func (m *Uint64Slice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
return b[:n], nil
}
}
func (m *Uint64Slice) XXX_Merge(src proto.Message) {
xxx_messageInfo_Uint64Slice.Merge(m, src)
}
func (m *Uint64Slice) XXX_Size() int {
return m.Size()
}
func (m *Uint64Slice) XXX_DiscardUnknown() {
xxx_messageInfo_Uint64Slice.DiscardUnknown(m)
}
......@@ -83,19 +72,14 @@ type StringUint64Map struct {
}
func (m *StringUint64Map) Reset() { *m = StringUint64Map{} }
func (m *StringUint64Map) String() string { return proto.CompactTextString(m) }
func (*StringUint64Map) ProtoMessage() {}
func (*StringUint64Map) Descriptor() ([]byte, []int) {
return fileDescriptor_0cc45f6ac745dd88, []int{1}
}
func (m *StringUint64Map) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *StringUint64Map) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_StringUint64Map.Marshal(b, m, deterministic)
......@@ -108,15 +92,12 @@ func (m *StringUint64Map) XXX_Marshal(b []byte, deterministic bool) ([]byte, err
return b[:n], nil
}
}
func (m *StringUint64Map) XXX_Merge(src proto.Message) {
xxx_messageInfo_StringUint64Map.Merge(m, src)
}
func (m *StringUint64Map) XXX_Size() int {
return m.Size()
}
func (m *StringUint64Map) XXX_DiscardUnknown() {
xxx_messageInfo_StringUint64Map.DiscardUnknown(m)
}
......@@ -143,19 +124,14 @@ type StringUint64SliceMap struct {
}
func (m *StringUint64SliceMap) Reset() { *m = StringUint64SliceMap{} }
func (m *StringUint64SliceMap) String() string { return proto.CompactTextString(m) }
func (*StringUint64SliceMap) ProtoMessage() {}
func (*StringUint64SliceMap) Descriptor() ([]byte, []int) {
return fileDescriptor_0cc45f6ac745dd88, []int{2}
}
func (m *StringUint64SliceMap) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *StringUint64SliceMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_StringUint64SliceMap.Marshal(b, m, deterministic)
......@@ -168,15 +144,12 @@ func (m *StringUint64SliceMap) XXX_Marshal(b []byte, deterministic bool) ([]byte
return b[:n], nil
}
}
func (m *StringUint64SliceMap) XXX_Merge(src proto.Message) {
xxx_messageInfo_StringUint64SliceMap.Merge(m, src)
}
func (m *StringUint64SliceMap) XXX_Size() int {
return m.Size()
}
func (m *StringUint64SliceMap) XXX_DiscardUnknown() {
xxx_messageInfo_StringUint64SliceMap.DiscardUnknown(m)
}
......@@ -203,19 +176,14 @@ type VerifiedIndex struct {
}
func (m *VerifiedIndex) Reset() { *m = VerifiedIndex{} }
func (m *VerifiedIndex) String() string { return proto.CompactTextString(m) }
func (*VerifiedIndex) ProtoMessage() {}
func (*VerifiedIndex) Descriptor() ([]byte, []int) {
return fileDescriptor_0cc45f6ac745dd88, []int{3}
}
func (m *VerifiedIndex) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *VerifiedIndex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_VerifiedIndex.Marshal(b, m, deterministic)
......@@ -228,15 +196,12 @@ func (m *VerifiedIndex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error
return b[:n], nil
}
}
func (m *VerifiedIndex) XXX_Merge(src proto.Message) {
xxx_messageInfo_VerifiedIndex.Merge(m, src)
}
func (m *VerifiedIndex) XXX_Size() int {
return m.Size()
}
func (m *VerifiedIndex) XXX_DiscardUnknown() {
xxx_messageInfo_VerifiedIndex.DiscardUnknown(m)
}
......@@ -262,19 +227,14 @@ type VerifiedIndexSlice struct {
}
func (m *VerifiedIndexSlice) Reset() { *m = VerifiedIndexSlice{} }
func (m *VerifiedIndexSlice) String() string { return proto.CompactTextString(m) }
func (*VerifiedIndexSlice) ProtoMessage() {}
func (*VerifiedIndexSlice) Descriptor() ([]byte, []int) {
return fileDescriptor_0cc45f6ac745dd88, []int{4}
}
func (m *VerifiedIndexSlice) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *VerifiedIndexSlice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_VerifiedIndexSlice.Marshal(b, m, deterministic)
......@@ -287,15 +247,12 @@ func (m *VerifiedIndexSlice) XXX_Marshal(b []byte, deterministic bool) ([]byte,
return b[:n], nil
}
}
func (m *VerifiedIndexSlice) XXX_Merge(src proto.Message) {
xxx_messageInfo_VerifiedIndexSlice.Merge(m, src)
}
func (m *VerifiedIndexSlice) XXX_Size() int {
return m.Size()
}
func (m *VerifiedIndexSlice) XXX_DiscardUnknown() {
xxx_messageInfo_VerifiedIndexSlice.DiscardUnknown(m)
}
......@@ -315,19 +272,14 @@ type StringVerifiedIndexMap struct {
}
func (m *StringVerifiedIndexMap) Reset() { *m = StringVerifiedIndexMap{} }
func (m *StringVerifiedIndexMap) String() string { return proto.CompactTextString(m) }
func (*StringVerifiedIndexMap) ProtoMessage() {}
func (*StringVerifiedIndexMap) Descriptor() ([]byte, []int) {
return fileDescriptor_0cc45f6ac745dd88, []int{5}
}
func (m *StringVerifiedIndexMap) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *StringVerifiedIndexMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_StringVerifiedIndexMap.Marshal(b, m, deterministic)
......@@ -340,15 +292,12 @@ func (m *StringVerifiedIndexMap) XXX_Marshal(b []byte, deterministic bool) ([]by
return b[:n], nil
}
}
func (m *StringVerifiedIndexMap) XXX_Merge(src proto.Message) {
xxx_messageInfo_StringVerifiedIndexMap.Merge(m, src)
}
func (m *StringVerifiedIndexMap) XXX_Size() int {
return m.Size()
}
func (m *StringVerifiedIndexMap) XXX_DiscardUnknown() {
xxx_messageInfo_StringVerifiedIndexMap.DiscardUnknown(m)
}
......@@ -375,19 +324,14 @@ type StringVerifiedIndexSliceMap struct {
}
func (m *StringVerifiedIndexSliceMap) Reset() { *m = StringVerifiedIndexSliceMap{} }
func (m *StringVerifiedIndexSliceMap) String() string { return proto.CompactTextString(m) }
func (*StringVerifiedIndexSliceMap) ProtoMessage() {}
func (*StringVerifiedIndexSliceMap) Descriptor() ([]byte, []int) {
return fileDescriptor_0cc45f6ac745dd88, []int{6}
}
func (m *StringVerifiedIndexSliceMap) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *StringVerifiedIndexSliceMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_StringVerifiedIndexSliceMap.Marshal(b, m, deterministic)
......@@ -400,15 +344,12 @@ func (m *StringVerifiedIndexSliceMap) XXX_Marshal(b []byte, deterministic bool)
return b[:n], nil
}
}
func (m *StringVerifiedIndexSliceMap) XXX_Merge(src proto.Message) {
xxx_messageInfo_StringVerifiedIndexSliceMap.Merge(m, src)
}
func (m *StringVerifiedIndexSliceMap) XXX_Size() int {
return m.Size()
}
func (m *StringVerifiedIndexSliceMap) XXX_DiscardUnknown() {
xxx_messageInfo_StringVerifiedIndexSliceMap.DiscardUnknown(m)
}
......@@ -777,7 +718,6 @@ func encodeVarintBasic(dAtA []byte, offset int, v uint64) int {
dAtA[offset] = uint8(v)
return base
}
func (m *Uint64Slice) Size() (n int) {
if m == nil {
return 0
......@@ -912,11 +852,9 @@ func (m *StringVerifiedIndexSliceMap) Size() (n int) {
func sovBasic(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozBasic(x uint64) (n int) {
return sovBasic(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *Uint64Slice) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
......@@ -1043,7 +981,6 @@ func (m *Uint64Slice) Unmarshal(dAtA []byte) error {
}
return nil
}
func (m *StringUint64Map) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
......@@ -1202,7 +1139,6 @@ func (m *StringUint64Map) Unmarshal(dAtA []byte) error {
}
return nil
}
func (m *StringUint64SliceMap) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
......@@ -1319,7 +1255,6 @@ func (m *StringUint64SliceMap) Unmarshal(dAtA []byte) error {
}
return nil
}
func (m *VerifiedIndex) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
......@@ -1409,7 +1344,6 @@ func (m *VerifiedIndex) Unmarshal(dAtA []byte) error {
}
return nil
}
func (m *VerifiedIndexSlice) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
......@@ -1494,7 +1428,6 @@ func (m *VerifiedIndexSlice) Unmarshal(dAtA []byte) error {
}
return nil
}
func (m *StringVerifiedIndexMap) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
......@@ -1611,7 +1544,6 @@ func (m *StringVerifiedIndexMap) Unmarshal(dAtA []byte) error {
}
return nil
}
func (m *StringVerifiedIndexSliceMap) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
......@@ -1728,7 +1660,6 @@ func (m *StringVerifiedIndexSliceMap) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipBasic(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
......
......@@ -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)
}
This diff is collapsed.
......@@ -61,3 +61,7 @@ message content {
message IBTPs {
repeated IBTP ibtps = 1;
}
message result {
repeated bytes data = 1;
}
......@@ -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
......@@ -38,19 +35,14 @@ type IBTPX struct {
}
func (m *IBTPX) Reset() { *m = IBTPX{} }
func (m *IBTPX) String() string { return proto.CompactTextString(m) }
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
......
......@@ -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
......@@ -88,19 +85,14 @@ type Message struct {
}
func (m *Message) Reset() { *m = Message{} }
func (m *Message) String() string { return proto.CompactTextString(m) }
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)
}
......@@ -155,19 +144,14 @@ type Pack struct {
}
func (m *Pack) Reset() { *m = Pack{} }
func (m *Pack) String() string { return proto.CompactTextString(m) }
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)
}
......@@ -215,19 +196,14 @@ type PeerInfo struct {
}
func (m *PeerInfo) Reset() { *m = PeerInfo{} }
func (m *PeerInfo) String() string { return proto.CompactTextString(m) }
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
......
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