From 84c1270776d1c8612f4cd97cc837e4fbee4930d6 Mon Sep 17 00:00:00 2001 From: yacovm Date: Mon, 19 Jul 2021 19:07:19 +0300 Subject: [PATCH] [FABGW-25] Move chaincode interest to proposal response proto (#2763) This commit picks up the changes in pull request https://github.com/hyperledger/fabric-protos/pull/59 which entail: - Moving chaincode interest to proposal response - Adding a policy for state based endorsement in the chaincode call in preperation for FABGW-25 Change-Id: Ia0a0d57964daad9c773135d2e6c1d3a96e4df079 Signed-off-by: Yacov Manevich --- discovery/api.go | 5 +- discovery/client/api.go | 3 +- discovery/client/client.go | 16 +- discovery/client/client_test.go | 38 +- discovery/cmd/endorsers.go | 8 +- discovery/cmd/mocks/channel_response.go | 19 +- discovery/endorsement/collection.go | 3 +- discovery/endorsement/collection_test.go | 5 +- discovery/endorsement/endorsement.go | 12 +- discovery/endorsement/endorsement_test.go | 72 ++-- discovery/service_test.go | 32 +- discovery/test/integration_test.go | 25 +- go.mod | 2 +- go.sum | 4 +- internal/pkg/gateway/api_test.go | 4 +- internal/pkg/gateway/mocks/discovery.go | 21 +- internal/pkg/gateway/registry.go | 7 +- .../fabric-protos-go/discovery/protocol.pb.go | 395 ++++++++---------- .../peer/proposal_response.pb.go | 234 +++++++++-- vendor/modules.txt | 2 +- 20 files changed, 530 insertions(+), 377 deletions(-) diff --git a/discovery/api.go b/discovery/api.go index 1dd6dd814f8..214ef17711a 100644 --- a/discovery/api.go +++ b/discovery/api.go @@ -8,6 +8,7 @@ package discovery import ( discprotos "github.com/hyperledger/fabric-protos-go/discovery" + "github.com/hyperledger/fabric-protos-go/peer" "github.com/hyperledger/fabric/gossip/api" "github.com/hyperledger/fabric/gossip/common" "github.com/hyperledger/fabric/gossip/discovery" @@ -48,13 +49,13 @@ type GossipSupport interface { // for chaincodes type EndorsementSupport interface { // PeersForEndorsement returns an EndorsementDescriptor for a given set of peers, channel, and chaincode - PeersForEndorsement(channel common.ChannelID, interest *discprotos.ChaincodeInterest) (*discprotos.EndorsementDescriptor, error) + PeersForEndorsement(channel common.ChannelID, interest *peer.ChaincodeInterest) (*discprotos.EndorsementDescriptor, error) // PeersAuthorizedByCriteria returns the peers of the channel that are authorized by the given chaincode interest // That is - taking in account if the chaincode(s) in the interest are installed on the peers, and also // taking in account whether the peers are part of the collections of the chaincodes. // If a nil interest, or an empty interest is passed - no filtering is done. - PeersAuthorizedByCriteria(chainID common.ChannelID, interest *discprotos.ChaincodeInterest) (discovery.Members, error) + PeersAuthorizedByCriteria(chainID common.ChannelID, interest *peer.ChaincodeInterest) (discovery.Members, error) } // ConfigSupport provides access to channel configuration diff --git a/discovery/client/api.go b/discovery/client/api.go index d73be0b34c1..595a8c3578d 100644 --- a/discovery/client/api.go +++ b/discovery/client/api.go @@ -8,6 +8,7 @@ package discovery import ( "github.com/hyperledger/fabric-protos-go/discovery" + "github.com/hyperledger/fabric-protos-go/peer" "github.com/hyperledger/fabric/gossip/protoext" "github.com/pkg/errors" "google.golang.org/grpc" @@ -38,7 +39,7 @@ type ChannelResponse interface { Config() (*discovery.ConfigResult, error) // Peers returns a response for a peer membership query, or error if something went wrong - Peers(invocationChain ...*discovery.ChaincodeCall) ([]*Peer, error) + Peers(invocationChain ...*peer.ChaincodeCall) ([]*Peer, error) // Endorsers returns the response for an endorser query for a given // chaincode in a given channel context, or error if something went wrong. diff --git a/discovery/client/client.go b/discovery/client/client.go index 3afd681e91f..9702155cae3 100644 --- a/discovery/client/client.go +++ b/discovery/client/client.go @@ -13,6 +13,8 @@ import ( "math/rand" "time" + "github.com/hyperledger/fabric-protos-go/peer" + "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/msp" @@ -76,7 +78,7 @@ func (req *Request) AddConfigQuery() *Request { // AddEndorsersQuery adds to the request a query for given chaincodes // interests are the chaincode interests that the client wants to query for. // All interests for a given channel should be supplied in an aggregated slice -func (req *Request) AddEndorsersQuery(interests ...*discovery.ChaincodeInterest) (*Request, error) { +func (req *Request) AddEndorsersQuery(interests ...*peer.ChaincodeInterest) (*Request, error) { if err := validateInterests(interests...); err != nil { return nil, err } @@ -113,11 +115,11 @@ func (req *Request) AddLocalPeersQuery() *Request { } // AddPeersQuery adds to the request a peer query -func (req *Request) AddPeersQuery(invocationChain ...*discovery.ChaincodeCall) *Request { +func (req *Request) AddPeersQuery(invocationChain ...*peer.ChaincodeCall) *Request { ch := req.lastChannel q := &discovery.Query_PeerQuery{ PeerQuery: &discovery.PeerMembershipQuery{ - Filter: &discovery.ChaincodeInterest{ + Filter: &peer.ChaincodeInterest{ Chaincodes: invocationChain, }, }, @@ -221,7 +223,7 @@ func (cr *channelResponse) Config() (*discovery.ConfigResult, error) { return nil, res.(error) } -func parsePeers(queryType protoext.QueryType, r response, channel string, invocationChain ...*discovery.ChaincodeCall) ([]*Peer, error) { +func parsePeers(queryType protoext.QueryType, r response, channel string, invocationChain ...*peer.ChaincodeCall) ([]*Peer, error) { peerKeys := key{ queryType: queryType, k: fmt.Sprintf("%s %s", channel, InvocationChain(invocationChain).String()), @@ -239,7 +241,7 @@ func parsePeers(queryType protoext.QueryType, r response, channel string, invoca return nil, res.(error) } -func (cr *channelResponse) Peers(invocationChain ...*discovery.ChaincodeCall) ([]*Peer, error) { +func (cr *channelResponse) Peers(invocationChain ...*peer.ChaincodeCall) ([]*Peer, error) { return parsePeers(protoext.PeerMembershipQueryType, cr.response, cr.channel, invocationChain...) } @@ -596,7 +598,7 @@ func validateStateInfoMessage(message *gprotoext.SignedGossipMessage) error { return nil } -func validateInterests(interests ...*discovery.ChaincodeInterest) error { +func validateInterests(interests ...*peer.ChaincodeInterest) error { if len(interests) == 0 { return errors.New("no chaincode interests given") } @@ -612,7 +614,7 @@ func validateInterests(interests ...*discovery.ChaincodeInterest) error { } // InvocationChain aggregates ChaincodeCalls -type InvocationChain []*discovery.ChaincodeCall +type InvocationChain []*peer.ChaincodeCall // String returns a string representation of this invocation chain func (ic InvocationChain) String() string { diff --git a/discovery/client/client_test.go b/discovery/client/client_test.go index 56ab1f17d3b..5ea264eba5f 100644 --- a/discovery/client/client_test.go +++ b/discovery/client/client_test.go @@ -703,11 +703,11 @@ func TestAddEndorsersQueryInvalidInput(t *testing.T) { _, err = NewRequest().AddEndorsersQuery(nil) require.Contains(t, err.Error(), "chaincode interest is nil") - _, err = NewRequest().AddEndorsersQuery(&discovery.ChaincodeInterest{}) + _, err = NewRequest().AddEndorsersQuery(&peer.ChaincodeInterest{}) require.Contains(t, err.Error(), "invocation chain should not be empty") - _, err = NewRequest().AddEndorsersQuery(&discovery.ChaincodeInterest{ - Chaincodes: []*discovery.ChaincodeCall{{}}, + _, err = NewRequest().AddEndorsersQuery(&peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{{}}, }) require.Contains(t, err.Error(), "chaincode name should not be empty") } @@ -759,11 +759,11 @@ func TestValidateStateInfoMessage(t *testing.T) { func TestString(t *testing.T) { var ic InvocationChain - ic = append(ic, &discovery.ChaincodeCall{ + ic = append(ic, &peer.ChaincodeCall{ Name: "foo", CollectionNames: []string{"c1", "c2"}, }) - ic = append(ic, &discovery.ChaincodeCall{ + ic = append(ic, &peer.ChaincodeCall{ Name: "bar", CollectionNames: []string{"c3", "c4"}, }) @@ -824,9 +824,9 @@ func (pf *policyFetcher) PoliciesByChaincode(channel string, cc string, collecti } type endorsementAnalyzer interface { - PeersForEndorsement(chainID gossipcommon.ChannelID, interest *discovery.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) + PeersForEndorsement(chainID gossipcommon.ChannelID, interest *peer.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) - PeersAuthorizedByCriteria(chainID gossipcommon.ChannelID, interest *discovery.ChaincodeInterest) (gdisc.Members, error) + PeersAuthorizedByCriteria(chainID gossipcommon.ChannelID, interest *peer.ChaincodeInterest) (gdisc.Members, error) } type inquireablePolicy struct { @@ -957,11 +957,11 @@ func (ms *mockSupport) Peers() gdisc.Members { return ms.Called().Get(0).(gdisc.Members) } -func (ms *mockSupport) PeersForEndorsement(channel gossipcommon.ChannelID, interest *discovery.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { +func (ms *mockSupport) PeersForEndorsement(channel gossipcommon.ChannelID, interest *peer.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { return ms.endorsementAnalyzer.PeersForEndorsement(channel, interest) } -func (ms *mockSupport) PeersAuthorizedByCriteria(channel gossipcommon.ChannelID, interest *discovery.ChaincodeInterest) (gdisc.Members, error) { +func (ms *mockSupport) PeersAuthorizedByCriteria(channel gossipcommon.ChannelID, interest *peer.ChaincodeInterest) (gdisc.Members, error) { return ms.endorsementAnalyzer.PeersAuthorizedByCriteria(channel, interest) } @@ -1007,32 +1007,32 @@ func (ds *mockDiscoveryServer) Discover(context.Context, *discovery.SignedReques return args.Get(0).(*discovery.Response), nil } -func ccCall(ccNames ...string) []*discovery.ChaincodeCall { - var call []*discovery.ChaincodeCall +func ccCall(ccNames ...string) []*peer.ChaincodeCall { + var call []*peer.ChaincodeCall for _, ccName := range ccNames { - call = append(call, &discovery.ChaincodeCall{ + call = append(call, &peer.ChaincodeCall{ Name: ccName, }) } return call } -func cc2ccInterests(invocationsChains ...[]*discovery.ChaincodeCall) []*discovery.ChaincodeInterest { - var interests []*discovery.ChaincodeInterest +func cc2ccInterests(invocationsChains ...[]*peer.ChaincodeCall) []*peer.ChaincodeInterest { + var interests []*peer.ChaincodeInterest for _, invocationChain := range invocationsChains { - interests = append(interests, &discovery.ChaincodeInterest{ + interests = append(interests, &peer.ChaincodeInterest{ Chaincodes: invocationChain, }) } return interests } -func interest(ccNames ...string) *discovery.ChaincodeInterest { - interest := &discovery.ChaincodeInterest{ - Chaincodes: []*discovery.ChaincodeCall{}, +func interest(ccNames ...string) *peer.ChaincodeInterest { + interest := &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{}, } for _, cc := range ccNames { - interest.Chaincodes = append(interest.Chaincodes, &discovery.ChaincodeCall{ + interest.Chaincodes = append(interest.Chaincodes, &peer.ChaincodeCall{ Name: cc, }) } diff --git a/discovery/cmd/endorsers.go b/discovery/cmd/endorsers.go index 59e54e221b3..e47c838ce23 100644 --- a/discovery/cmd/endorsers.go +++ b/discovery/cmd/endorsers.go @@ -13,6 +13,8 @@ import ( "reflect" "strings" + "github.com/hyperledger/fabric-protos-go/peer" + "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/gossip" @@ -90,17 +92,17 @@ func (pc *EndorsersCmd) Execute(conf common.Config) error { return err } - var ccCalls []*discovery.ChaincodeCall + var ccCalls []*peer.ChaincodeCall for _, cc := range *ccAndCol.Chaincodes { - ccCalls = append(ccCalls, &discovery.ChaincodeCall{ + ccCalls = append(ccCalls, &peer.ChaincodeCall{ Name: cc, CollectionNames: cc2collections[cc], NoPrivateReads: ccAndCol.noPrivateReads(cc), }) } - req, err := discoveryclient.NewRequest().OfChannel(channel).AddEndorsersQuery(&discovery.ChaincodeInterest{Chaincodes: ccCalls}) + req, err := discoveryclient.NewRequest().OfChannel(channel).AddEndorsersQuery(&peer.ChaincodeInterest{Chaincodes: ccCalls}) if err != nil { return errors.Wrap(err, "failed creating request") } diff --git a/discovery/cmd/mocks/channel_response.go b/discovery/cmd/mocks/channel_response.go index de2778229c6..678fede0f84 100644 --- a/discovery/cmd/mocks/channel_response.go +++ b/discovery/cmd/mocks/channel_response.go @@ -1,11 +1,16 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.7.4. DO NOT EDIT. package mocks -import client "github.com/hyperledger/fabric/discovery/client" +import ( + client "github.com/hyperledger/fabric/discovery/client" -import discovery "github.com/hyperledger/fabric-protos-go/discovery" -import mock "github.com/stretchr/testify/mock" + discovery "github.com/hyperledger/fabric-protos-go/discovery" + + mock "github.com/stretchr/testify/mock" + + peer "github.com/hyperledger/fabric-protos-go/peer" +) // ChannelResponse is an autogenerated mock type for the ChannelResponse type type ChannelResponse struct { @@ -59,7 +64,7 @@ func (_m *ChannelResponse) Endorsers(invocationChain client.InvocationChain, f c } // Peers provides a mock function with given fields: invocationChain -func (_m *ChannelResponse) Peers(invocationChain ...*discovery.ChaincodeCall) ([]*client.Peer, error) { +func (_m *ChannelResponse) Peers(invocationChain ...*peer.ChaincodeCall) ([]*client.Peer, error) { _va := make([]interface{}, len(invocationChain)) for _i := range invocationChain { _va[_i] = invocationChain[_i] @@ -69,7 +74,7 @@ func (_m *ChannelResponse) Peers(invocationChain ...*discovery.ChaincodeCall) ([ ret := _m.Called(_ca...) var r0 []*client.Peer - if rf, ok := ret.Get(0).(func(...*discovery.ChaincodeCall) []*client.Peer); ok { + if rf, ok := ret.Get(0).(func(...*peer.ChaincodeCall) []*client.Peer); ok { r0 = rf(invocationChain...) } else { if ret.Get(0) != nil { @@ -78,7 +83,7 @@ func (_m *ChannelResponse) Peers(invocationChain ...*discovery.ChaincodeCall) ([ } var r1 error - if rf, ok := ret.Get(1).(func(...*discovery.ChaincodeCall) error); ok { + if rf, ok := ret.Get(1).(func(...*peer.ChaincodeCall) error); ok { r1 = rf(invocationChain...) } else { r1 = ret.Error(1) diff --git a/discovery/endorsement/collection.go b/discovery/endorsement/collection.go index dbb12522cb9..dad37e81c00 100644 --- a/discovery/endorsement/collection.go +++ b/discovery/endorsement/collection.go @@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0 package endorsement import ( - "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/peer" "github.com/hyperledger/fabric/common/policies" "github.com/hyperledger/fabric/gossip/api" @@ -47,7 +46,7 @@ type principalSetsByCollectionName map[string]policies.PrincipalSet // toIdentityFilter converts this principalSetsByCollectionName mapping to a filter // which accepts or rejects identities of peers. -func (psbc principalSetsByCollectionName) toIdentityFilter(channel string, evaluator principalEvaluator, cc *discovery.ChaincodeCall) (identityFilter, error) { +func (psbc principalSetsByCollectionName) toIdentityFilter(channel string, evaluator principalEvaluator, cc *peer.ChaincodeCall) (identityFilter, error) { var principalSets policies.PrincipalSets for _, col := range cc.CollectionNames { // Each collection we're interested in should exist in the principalSetsByCollectionName mapping. diff --git a/discovery/endorsement/collection_test.go b/discovery/endorsement/collection_test.go index 6eba2c3a953..2a738f190c0 100644 --- a/discovery/endorsement/collection_test.go +++ b/discovery/endorsement/collection_test.go @@ -12,7 +12,6 @@ import ( "testing" "github.com/hyperledger/fabric-protos-go/common" - "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/msp" "github.com/hyperledger/fabric-protos-go/peer" "github.com/hyperledger/fabric/common/policies" @@ -98,7 +97,7 @@ func TestToIdentityFilter(t *testing.T) { col2principals["foo"] = []*msp.MSPPrincipal{orgPrincipal("Org1MSP"), orgPrincipal("Org2MSP")} t.Run("collection doesn't exist in mapping", func(t *testing.T) { - filter, err := col2principals.toIdentityFilter("mychannel", &principalEvaluatorMock{}, &discovery.ChaincodeCall{ + filter, err := col2principals.toIdentityFilter("mychannel", &principalEvaluatorMock{}, &peer.ChaincodeCall{ Name: "mycc", CollectionNames: []string{"bar"}, }) @@ -107,7 +106,7 @@ func TestToIdentityFilter(t *testing.T) { }) t.Run("collection exists in mapping", func(t *testing.T) { - filter, err := col2principals.toIdentityFilter("mychannel", &principalEvaluatorMock{}, &discovery.ChaincodeCall{ + filter, err := col2principals.toIdentityFilter("mychannel", &principalEvaluatorMock{}, &peer.ChaincodeCall{ Name: "mycc", CollectionNames: []string{"foo"}, }) diff --git a/discovery/endorsement/endorsement.go b/discovery/endorsement/endorsement.go index 1fdece7f501..80ed929e6a7 100644 --- a/discovery/endorsement/endorsement.go +++ b/discovery/endorsement/endorsement.go @@ -9,6 +9,8 @@ package endorsement import ( "fmt" + "github.com/hyperledger/fabric-protos-go/peer" + "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/msp" "github.com/hyperledger/fabric/common/chaincode" @@ -79,7 +81,7 @@ func NewEndorsementAnalyzer(gs gossipSupport, pf policyFetcher, pe principalEval type peerPrincipalEvaluator func(member gossipdiscovery.NetworkMember, principal *msp.MSPPrincipal) bool // PeersForEndorsement returns an EndorsementDescriptor for a given set of peers, channel, and chaincode -func (ea *endorsementAnalyzer) PeersForEndorsement(channelID common.ChannelID, interest *discovery.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { +func (ea *endorsementAnalyzer) PeersForEndorsement(channelID common.ChannelID, interest *peer.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { membersAndCC, err := ea.peersByCriteria(channelID, interest, false) if err != nil { return nil, errors.WithStack(err) @@ -107,12 +109,12 @@ func (ea *endorsementAnalyzer) PeersForEndorsement(channelID common.ChannelID, i }) } -func (ea *endorsementAnalyzer) PeersAuthorizedByCriteria(channelID common.ChannelID, interest *discovery.ChaincodeInterest) (gossipdiscovery.Members, error) { +func (ea *endorsementAnalyzer) PeersAuthorizedByCriteria(channelID common.ChannelID, interest *peer.ChaincodeInterest) (gossipdiscovery.Members, error) { res, err := ea.peersByCriteria(channelID, interest, true) return res.members, err } -func (ea *endorsementAnalyzer) peersByCriteria(channelID common.ChannelID, interest *discovery.ChaincodeInterest, excludePeersWithoutChaincode bool) (membersChaincodeMapping, error) { +func (ea *endorsementAnalyzer) peersByCriteria(channelID common.ChannelID, interest *peer.ChaincodeInterest, excludePeersWithoutChaincode bool) (membersChaincodeMapping, error) { peersOfChannel := ea.PeersOfChannel(channelID) if interest == nil || len(interest.Chaincodes) == 0 { return membersChaincodeMapping{members: peersOfChannel}, nil @@ -214,7 +216,7 @@ func filterOutUnsatisfiedLayouts(endorsersByGroup map[string]*discovery.Peers, l return filteredLayouts } -func (ea *endorsementAnalyzer) computePrincipalSets(channelID common.ChannelID, interest *discovery.ChaincodeInterest) (policies.PrincipalSets, error) { +func (ea *endorsementAnalyzer) computePrincipalSets(channelID common.ChannelID, interest *peer.ChaincodeInterest) (policies.PrincipalSets, error) { sessionLogger := logger.With("channel", string(channelID)) var inquireablePolicies []policies.InquireablePolicy for _, chaincode := range interest.Chaincodes { @@ -253,7 +255,7 @@ func (ea *endorsementAnalyzer) computePrincipalSets(channelID common.ChannelID, type metadataAndFilterContext struct { chainID common.ChannelID - interest *discovery.ChaincodeInterest + interest *peer.ChaincodeInterest fetch chaincodeMetadataFetcher identityInfoByID map[string]api.PeerIdentityInfo evaluator principalEvaluator diff --git a/discovery/endorsement/endorsement_test.go b/discovery/endorsement/endorsement_test.go index 461eb33d523..805cb2a6027 100644 --- a/discovery/endorsement/endorsement_test.go +++ b/discovery/endorsement/endorsement_test.go @@ -97,8 +97,8 @@ func TestPeersForEndorsement(t *testing.T) { Version: "1.0", }).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: ccWithMissingPolicy, }, @@ -121,8 +121,8 @@ func TestPeersForEndorsement(t *testing.T) { mf.On("Metadata").Return(&chaincode.Metadata{Name: cc, Version: "1.0"}).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) pf.On("PoliciesByChaincode", cc).Return(policy).Once() - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, }, @@ -148,8 +148,8 @@ func TestPeersForEndorsement(t *testing.T) { }).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) pf.On("PoliciesByChaincode", cc).Return(policy).Once() - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, }, @@ -181,8 +181,8 @@ func TestPeersForEndorsement(t *testing.T) { }).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) pf.On("PoliciesByChaincode", cc).Return(policy).Once() - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, }, @@ -214,8 +214,8 @@ func TestPeersForEndorsement(t *testing.T) { g.On("PeersOfChannel").Return(chanPeers.toMembers()).Once() pf.On("PoliciesByChaincode", cc).Return(policy).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, }, @@ -239,8 +239,8 @@ func TestPeersForEndorsement(t *testing.T) { Name: cc, Version: "1.0", }).Once() - desc, err = analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err = analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, }, @@ -261,8 +261,8 @@ func TestPeersForEndorsement(t *testing.T) { mf := &metadataFetcher{} mf.On("Metadata").Return(nil).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, }, @@ -297,8 +297,8 @@ func TestPeersForEndorsement(t *testing.T) { g.On("PeersOfChannel").Return(chanPeers.toMembers()).Once() pf.On("PoliciesByChaincode", cc).Return(policy).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, CollectionNames: []string{"collection"}, @@ -360,8 +360,8 @@ func TestPeersForEndorsement(t *testing.T) { pf.On("PoliciesByChaincode", "cc3").Return(cc3policy).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: "cc1", }, @@ -429,8 +429,8 @@ func TestPeersForEndorsement(t *testing.T) { pf.On("PoliciesByChaincode", "cc2").Return(cc2policy).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: "cc1", }, @@ -481,8 +481,8 @@ func TestPeersForEndorsement(t *testing.T) { pf := &policyFetcherMock{} pf.On("PoliciesByChaincode", cc).Return([]policies.InquireablePolicy{chaincodeEP, collectionEP}).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, CollectionNames: []string{"collection"}, @@ -533,8 +533,8 @@ func TestPeersForEndorsement(t *testing.T) { pf := &policyFetcherMock{} pf.On("PoliciesByChaincode", cc).Return([]policies.InquireablePolicy{chaincodeEP, collectionEP}).Once() analyzer := NewEndorsementAnalyzer(g, pf, &principalEvaluatorMock{}, mf) - desc, err := analyzer.PeersForEndorsement(channel, &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + desc, err := analyzer.PeersForEndorsement(channel, &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: cc, CollectionNames: []string{"collection"}, @@ -587,7 +587,7 @@ func TestPeersAuthorizedByCriteria(t *testing.T) { for _, tst := range []struct { name string - arguments *discoveryprotos.ChaincodeInterest + arguments *peer.ChaincodeInterest totalExistingMembers discovery.Members metadata []*chaincode.Metadata expected discovery.Members @@ -600,14 +600,14 @@ func TestPeersAuthorizedByCriteria(t *testing.T) { }, { name: "Empty interest invocation chain", - arguments: &discoveryprotos.ChaincodeInterest{}, + arguments: &peer.ChaincodeInterest{}, totalExistingMembers: members, expected: members, }, { name: "Chaincodes only installed on some peers", - arguments: &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + arguments: &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ {Name: cc1}, {Name: cc2}, }, @@ -627,8 +627,8 @@ func TestPeersAuthorizedByCriteria(t *testing.T) { }, { name: "Only some peers authorized by collection", - arguments: &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + arguments: &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ {Name: cc1, CollectionNames: []string{"collection"}}, }, }, @@ -703,8 +703,8 @@ func TestMergePrincipalSetsNilInput(t *testing.T) { func TestComputePrincipalSetsNoPolicies(t *testing.T) { // Tests a hypothetical case where no chaincodes populate the chaincode interest. - interest := &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{}, + interest := &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{}, } ea := &endorsementAnalyzer{} _, err := ea.computePrincipalSets(common.ChannelID("mychannel"), interest) @@ -713,8 +713,8 @@ func TestComputePrincipalSetsNoPolicies(t *testing.T) { } func TestLoadMetadataAndFiltersCollectionNotPresentInConfig(t *testing.T) { - interest := &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + interest := &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: "mycc", CollectionNames: []string{"bar"}, @@ -750,8 +750,8 @@ func TestLoadMetadataAndFiltersCollectionNotPresentInConfig(t *testing.T) { } func TestLoadMetadataAndFiltersInvalidCollectionData(t *testing.T) { - interest := &discoveryprotos.ChaincodeInterest{ - Chaincodes: []*discoveryprotos.ChaincodeCall{ + interest := &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{ { Name: "mycc", CollectionNames: []string{"col1"}, diff --git a/discovery/service_test.go b/discovery/service_test.go index c7980e2e58d..57c7f14f708 100644 --- a/discovery/service_test.go +++ b/discovery/service_test.go @@ -13,6 +13,8 @@ import ( "reflect" "testing" + "github.com/hyperledger/fabric-protos-go/peer" + "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/gossip" @@ -107,7 +109,7 @@ func TestService(t *testing.T) { // Scenario V: Request a CC query with no chaincodes at all req.Queries[0].Query = &discovery.Query_CcQuery{ CcQuery: &discovery.ChaincodeQuery{ - Interests: []*discovery.ChaincodeInterest{ + Interests: []*peer.ChaincodeInterest{ {}, }, }, @@ -119,7 +121,7 @@ func TestService(t *testing.T) { // Scenario VI: Request a CC query with no interests at all req.Queries[0].Query = &discovery.Query_CcQuery{ CcQuery: &discovery.ChaincodeQuery{ - Interests: []*discovery.ChaincodeInterest{}, + Interests: []*peer.ChaincodeInterest{}, }, } resp, err = service.Discover(ctx, toSignedRequest(req)) @@ -129,8 +131,8 @@ func TestService(t *testing.T) { // Scenario VII: Request a CC query with a chaincode name that is empty req.Queries[0].Query = &discovery.Query_CcQuery{ CcQuery: &discovery.ChaincodeQuery{ - Interests: []*discovery.ChaincodeInterest{{ - Chaincodes: []*discovery.ChaincodeCall{{ + Interests: []*peer.ChaincodeInterest{{ + Chaincodes: []*peer.ChaincodeCall{{ Name: "", }}, }}, @@ -143,12 +145,12 @@ func TestService(t *testing.T) { // Scenario VIII: Request with a CC query where one chaincode is unavailable req.Queries[0].Query = &discovery.Query_CcQuery{ CcQuery: &discovery.ChaincodeQuery{ - Interests: []*discovery.ChaincodeInterest{ + Interests: []*peer.ChaincodeInterest{ { - Chaincodes: []*discovery.ChaincodeCall{{Name: "unknownCC"}}, + Chaincodes: []*peer.ChaincodeCall{{Name: "unknownCC"}}, }, { - Chaincodes: []*discovery.ChaincodeCall{{Name: "cc1"}}, + Chaincodes: []*peer.ChaincodeCall{{Name: "cc1"}}, }, }, }, @@ -162,15 +164,15 @@ func TestService(t *testing.T) { // Scenario IX: Request with a CC query where all are available req.Queries[0].Query = &discovery.Query_CcQuery{ CcQuery: &discovery.ChaincodeQuery{ - Interests: []*discovery.ChaincodeInterest{ + Interests: []*peer.ChaincodeInterest{ { - Chaincodes: []*discovery.ChaincodeCall{{Name: "cc1"}}, + Chaincodes: []*peer.ChaincodeCall{{Name: "cc1"}}, }, { - Chaincodes: []*discovery.ChaincodeCall{{Name: "cc2"}}, + Chaincodes: []*peer.ChaincodeCall{{Name: "cc2"}}, }, { - Chaincodes: []*discovery.ChaincodeCall{{Name: "cc3"}}, + Chaincodes: []*peer.ChaincodeCall{{Name: "cc3"}}, }, }, }, @@ -238,7 +240,7 @@ func TestService(t *testing.T) { Channel: "channelWithSomeProblem", Query: &discovery.Query_PeerQuery{ PeerQuery: &discovery.PeerMembershipQuery{ - Filter: &discovery.ChaincodeInterest{}, + Filter: &peer.ChaincodeInterest{}, }, }, }, @@ -426,7 +428,7 @@ func TestValidateStructure(t *testing.T) { func TestValidateCCQuery(t *testing.T) { err := validateCCQuery(&discovery.ChaincodeQuery{ - Interests: []*discovery.ChaincodeInterest{ + Interests: []*peer.ChaincodeInterest{ nil, }, }) @@ -504,7 +506,7 @@ func (ms *mockSupport) Peers() gdisc.Members { return ms.Called().Get(0).(gdisc.Members) } -func (ms *mockSupport) PeersForEndorsement(channel gcommon.ChannelID, interest *discovery.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { +func (ms *mockSupport) PeersForEndorsement(channel gcommon.ChannelID, interest *peer.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { cc := interest.Chaincodes[0].Name args := ms.Called(cc) if args.Get(0) == nil { @@ -513,7 +515,7 @@ func (ms *mockSupport) PeersForEndorsement(channel gcommon.ChannelID, interest * return args.Get(0).(*discovery.EndorsementDescriptor), args.Error(1) } -func (ms *mockSupport) PeersAuthorizedByCriteria(chainID gcommon.ChannelID, interest *discovery.ChaincodeInterest) (gdisc.Members, error) { +func (ms *mockSupport) PeersAuthorizedByCriteria(chainID gcommon.ChannelID, interest *peer.ChaincodeInterest) (gdisc.Members, error) { args := ms.Called(chainID) if args.Error(1) != nil { return nil, args.Error(1) diff --git a/discovery/test/integration_test.go b/discovery/test/integration_test.go index afe2586b394..11608ddcc32 100644 --- a/discovery/test/integration_test.go +++ b/discovery/test/integration_test.go @@ -23,12 +23,13 @@ import ( "testing" "time" + discovery_protos "github.com/hyperledger/fabric-protos-go/discovery" + "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-protos-go/common" - . "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/gossip" msprotos "github.com/hyperledger/fabric-protos-go/msp" - "github.com/hyperledger/fabric-protos-go/peer" + . "github.com/hyperledger/fabric-protos-go/peer" "github.com/hyperledger/fabric/bccsp/sw" bccsp "github.com/hyperledger/fabric/bccsp/utils" "github.com/hyperledger/fabric/common/cauthdsl" @@ -331,7 +332,7 @@ func TestRevocation(t *testing.T) { type client struct { *disc.Client - *AuthInfo + *discovery_protos.AuthInfo conn *grpc.ClientConn } @@ -482,7 +483,7 @@ func createClientAndService(t *testing.T, testdir string) (*client, *client, *se AuthCachePurgeRetentionRatio: 0.5, }, sup) - RegisterDiscoveryServer(gRPCServer.Server(), svc) + discovery_protos.RegisterDiscoveryServer(gRPCServer.Server(), svc) require.NoError(t, err) go gRPCServer.Start() @@ -503,7 +504,7 @@ func createClientAndService(t *testing.T, testdir string) (*client, *client, *se require.NoError(t, err) userSigner := createUserSigner(t) - wrapperUserClient := &client{AuthInfo: &AuthInfo{ + wrapperUserClient := &client{AuthInfo: &discovery_protos.AuthInfo{ ClientIdentity: userSigner.Creator, ClientTlsCertHash: util.ComputeSHA256(clientKeyPair.TLSCert.Raw), }, conn: conn} @@ -511,7 +512,7 @@ func createClientAndService(t *testing.T, testdir string) (*client, *client, *se wrapperUserClient.Client = disc.NewClient(wrapperUserClient.newConnection, userSigner.Sign, signerCacheSize) adminSigner := createAdminSigner(t) - wrapperAdminClient := &client{AuthInfo: &AuthInfo{ + wrapperAdminClient := &client{AuthInfo: &discovery_protos.AuthInfo{ ClientIdentity: adminSigner.Creator, ClientTlsCertHash: util.ComputeSHA256(clientKeyPair.TLSCert.Raw), }, conn: conn} @@ -882,14 +883,14 @@ func aliveMsg(pkiID gcommon.PKIidType) gdisc.NetworkMember { } func buildCollectionConfig(col2principals map[string][]*msprotos.MSPPrincipal) []byte { - collections := &peer.CollectionConfigPackage{} + collections := &CollectionConfigPackage{} for col, principals := range col2principals { - collections.Config = append(collections.Config, &peer.CollectionConfig{ - Payload: &peer.CollectionConfig_StaticCollectionConfig{ - StaticCollectionConfig: &peer.StaticCollectionConfig{ + collections.Config = append(collections.Config, &CollectionConfig{ + Payload: &CollectionConfig_StaticCollectionConfig{ + StaticCollectionConfig: &StaticCollectionConfig{ Name: col, - MemberOrgsPolicy: &peer.CollectionPolicyConfig{ - Payload: &peer.CollectionPolicyConfig_SignaturePolicy{ + MemberOrgsPolicy: &CollectionPolicyConfig{ + Payload: &CollectionPolicyConfig_SignaturePolicy{ SignaturePolicy: &common.SignaturePolicyEnvelope{ Identities: principals, }, diff --git a/go.mod b/go.mod index 6c4419c01c4..afd382ae176 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/hyperledger/fabric-chaincode-go v0.0.0-20201119163726-f8ef75b17719 github.com/hyperledger/fabric-config v0.1.0 github.com/hyperledger/fabric-lib-go v1.0.0 - github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31 + github.com/hyperledger/fabric-protos-go v0.0.0-20210717172449-368ac8b7bc5b github.com/kr/pretty v0.2.1 github.com/magiconair/properties v1.8.1 // indirect github.com/mattn/go-runewidth v0.0.4 // indirect diff --git a/go.sum b/go.sum index 4d58be79b7d..ef6229e518d 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1Q github.com/hyperledger/fabric-lib-go v1.0.0/go.mod h1:H362nMlunurmHwkYqR5uHL2UDWbQdbfz74n8kbCFsqc= github.com/hyperledger/fabric-protos-go v0.0.0-20190919234611-2a87503ac7c9/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= -github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31 h1:T/uwoFIUioDDLffuJ/XgMLOWCUcx95/xXidv5igafl8= -github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= +github.com/hyperledger/fabric-protos-go v0.0.0-20210717172449-368ac8b7bc5b h1:F3UmdNp9Hl6OCw3NwmEjrkJzG08X0+Xmt3NhmPnueE8= +github.com/hyperledger/fabric-protos-go v0.0.0-20210717172449-368ac8b7bc5b/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= diff --git a/internal/pkg/gateway/api_test.go b/internal/pkg/gateway/api_test.go index a8194c2b2c9..eeb0a3cca41 100644 --- a/internal/pkg/gateway/api_test.go +++ b/internal/pkg/gateway/api_test.go @@ -543,8 +543,8 @@ func TestEndorse(t *testing.T) { // check the discovery service (mock) was invoked as expected expectedChannel := common.ChannelID(testChannel) - expectedInterest := &dp.ChaincodeInterest{ - Chaincodes: []*dp.ChaincodeCall{{ + expectedInterest := &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{{ Name: testChaincode, }}, } diff --git a/internal/pkg/gateway/mocks/discovery.go b/internal/pkg/gateway/mocks/discovery.go index 841facfe243..77d25ce34c2 100644 --- a/internal/pkg/gateway/mocks/discovery.go +++ b/internal/pkg/gateway/mocks/discovery.go @@ -5,6 +5,7 @@ import ( "sync" "github.com/hyperledger/fabric-protos-go/discovery" + "github.com/hyperledger/fabric-protos-go/peer" "github.com/hyperledger/fabric/gossip/api" "github.com/hyperledger/fabric/gossip/common" discoverya "github.com/hyperledger/fabric/gossip/discovery" @@ -26,19 +27,18 @@ type Discovery struct { } IdentityInfoStub func() api.PeerIdentitySet identityInfoMutex sync.RWMutex - identityInfoArgsForCall []struct { - } - identityInfoReturns struct { + identityInfoArgsForCall []struct{} + identityInfoReturns struct { result1 api.PeerIdentitySet } identityInfoReturnsOnCall map[int]struct { result1 api.PeerIdentitySet } - PeersForEndorsementStub func(common.ChannelID, *discovery.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) + PeersForEndorsementStub func(common.ChannelID, *peer.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) peersForEndorsementMutex sync.RWMutex peersForEndorsementArgsForCall []struct { arg1 common.ChannelID - arg2 *discovery.ChaincodeInterest + arg2 *peer.ChaincodeInterest } peersForEndorsementReturns struct { result1 *discovery.EndorsementDescriptor @@ -130,8 +130,7 @@ func (fake *Discovery) ConfigReturnsOnCall(i int, result1 *discovery.ConfigResul func (fake *Discovery) IdentityInfo() api.PeerIdentitySet { fake.identityInfoMutex.Lock() ret, specificReturn := fake.identityInfoReturnsOnCall[len(fake.identityInfoArgsForCall)] - fake.identityInfoArgsForCall = append(fake.identityInfoArgsForCall, struct { - }{}) + fake.identityInfoArgsForCall = append(fake.identityInfoArgsForCall, struct{}{}) stub := fake.IdentityInfoStub fakeReturns := fake.identityInfoReturns fake.recordInvocation("IdentityInfo", []interface{}{}) @@ -180,12 +179,12 @@ func (fake *Discovery) IdentityInfoReturnsOnCall(i int, result1 api.PeerIdentity }{result1} } -func (fake *Discovery) PeersForEndorsement(arg1 common.ChannelID, arg2 *discovery.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { +func (fake *Discovery) PeersForEndorsement(arg1 common.ChannelID, arg2 *peer.ChaincodeInterest) (*discovery.EndorsementDescriptor, error) { fake.peersForEndorsementMutex.Lock() ret, specificReturn := fake.peersForEndorsementReturnsOnCall[len(fake.peersForEndorsementArgsForCall)] fake.peersForEndorsementArgsForCall = append(fake.peersForEndorsementArgsForCall, struct { arg1 common.ChannelID - arg2 *discovery.ChaincodeInterest + arg2 *peer.ChaincodeInterest }{arg1, arg2}) stub := fake.PeersForEndorsementStub fakeReturns := fake.peersForEndorsementReturns @@ -206,13 +205,13 @@ func (fake *Discovery) PeersForEndorsementCallCount() int { return len(fake.peersForEndorsementArgsForCall) } -func (fake *Discovery) PeersForEndorsementCalls(stub func(common.ChannelID, *discovery.ChaincodeInterest) (*discovery.EndorsementDescriptor, error)) { +func (fake *Discovery) PeersForEndorsementCalls(stub func(common.ChannelID, *peer.ChaincodeInterest) (*discovery.EndorsementDescriptor, error)) { fake.peersForEndorsementMutex.Lock() defer fake.peersForEndorsementMutex.Unlock() fake.PeersForEndorsementStub = stub } -func (fake *Discovery) PeersForEndorsementArgsForCall(i int) (common.ChannelID, *discovery.ChaincodeInterest) { +func (fake *Discovery) PeersForEndorsementArgsForCall(i int) (common.ChannelID, *peer.ChaincodeInterest) { fake.peersForEndorsementMutex.RLock() defer fake.peersForEndorsementMutex.RUnlock() argsForCall := fake.peersForEndorsementArgsForCall[i] diff --git a/internal/pkg/gateway/registry.go b/internal/pkg/gateway/registry.go index 9e4f7b50529..63082565f5c 100644 --- a/internal/pkg/gateway/registry.go +++ b/internal/pkg/gateway/registry.go @@ -16,6 +16,7 @@ import ( "github.com/golang/protobuf/proto" dp "github.com/hyperledger/fabric-protos-go/discovery" "github.com/hyperledger/fabric-protos-go/gossip" + "github.com/hyperledger/fabric-protos-go/peer" "github.com/hyperledger/fabric/common/flogging" gossipapi "github.com/hyperledger/fabric/gossip/api" "github.com/hyperledger/fabric/gossip/common" @@ -25,7 +26,7 @@ import ( type Discovery interface { Config(channel string) (*dp.ConfigResult, error) IdentityInfo() gossipapi.PeerIdentitySet - PeersForEndorsement(channel common.ChannelID, interest *dp.ChaincodeInterest) (*dp.EndorsementDescriptor, error) + PeersForEndorsement(channel common.ChannelID, interest *peer.ChaincodeInterest) (*dp.EndorsementDescriptor, error) PeersOfChannel(common.ChannelID) gossipdiscovery.Members } @@ -56,8 +57,8 @@ func (reg *registry) endorsers(channel string, chaincode string) ([]*endorser, e var endorsers []*endorser - interest := &dp.ChaincodeInterest{ - Chaincodes: []*dp.ChaincodeCall{{ + interest := &peer.ChaincodeInterest{ + Chaincodes: []*peer.ChaincodeCall{{ Name: chaincode, }}, } diff --git a/vendor/github.com/hyperledger/fabric-protos-go/discovery/protocol.pb.go b/vendor/github.com/hyperledger/fabric-protos-go/discovery/protocol.pb.go index 045e1380c15..a9b31249a16 100644 --- a/vendor/github.com/hyperledger/fabric-protos-go/discovery/protocol.pb.go +++ b/vendor/github.com/hyperledger/fabric-protos-go/discovery/protocol.pb.go @@ -6,19 +6,23 @@ package discovery import ( context "context" fmt "fmt" + math "math" + proto "github.com/golang/protobuf/proto" gossip "github.com/hyperledger/fabric-protos-go/gossip" msp "github.com/hyperledger/fabric-protos-go/msp" + peer "github.com/hyperledger/fabric-protos-go/peer" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf +var ( + _ = proto.Marshal + _ = fmt.Errorf + _ = math.Inf +) // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -49,15 +53,19 @@ func (*SignedRequest) Descriptor() ([]byte, []int) { func (m *SignedRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignedRequest.Unmarshal(m, b) } + func (m *SignedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SignedRequest.Marshal(b, m, deterministic) } + func (m *SignedRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_SignedRequest.Merge(m, src) } + func (m *SignedRequest) XXX_Size() int { return xxx_messageInfo_SignedRequest.Size(m) } + func (m *SignedRequest) XXX_DiscardUnknown() { xxx_messageInfo_SignedRequest.DiscardUnknown(m) } @@ -101,15 +109,19 @@ func (*Request) Descriptor() ([]byte, []int) { func (m *Request) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Request.Unmarshal(m, b) } + func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Request.Marshal(b, m, deterministic) } + func (m *Request) XXX_Merge(src proto.Message) { xxx_messageInfo_Request.Merge(m, src) } + func (m *Request) XXX_Size() int { return xxx_messageInfo_Request.Size(m) } + func (m *Request) XXX_DiscardUnknown() { xxx_messageInfo_Request.DiscardUnknown(m) } @@ -148,15 +160,19 @@ func (*Response) Descriptor() ([]byte, []int) { func (m *Response) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Response.Unmarshal(m, b) } + func (m *Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Response.Marshal(b, m, deterministic) } + func (m *Response) XXX_Merge(src proto.Message) { xxx_messageInfo_Response.Merge(m, src) } + func (m *Response) XXX_Size() int { return xxx_messageInfo_Response.Size(m) } + func (m *Response) XXX_DiscardUnknown() { xxx_messageInfo_Response.DiscardUnknown(m) } @@ -200,15 +216,19 @@ func (*AuthInfo) Descriptor() ([]byte, []int) { func (m *AuthInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AuthInfo.Unmarshal(m, b) } + func (m *AuthInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AuthInfo.Marshal(b, m, deterministic) } + func (m *AuthInfo) XXX_Merge(src proto.Message) { xxx_messageInfo_AuthInfo.Merge(m, src) } + func (m *AuthInfo) XXX_Size() int { return xxx_messageInfo_AuthInfo.Size(m) } + func (m *AuthInfo) XXX_DiscardUnknown() { xxx_messageInfo_AuthInfo.DiscardUnknown(m) } @@ -253,15 +273,19 @@ func (*Query) Descriptor() ([]byte, []int) { func (m *Query) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Query.Unmarshal(m, b) } + func (m *Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Query.Marshal(b, m, deterministic) } + func (m *Query) XXX_Merge(src proto.Message) { xxx_messageInfo_Query.Merge(m, src) } + func (m *Query) XXX_Size() int { return xxx_messageInfo_Query.Size(m) } + func (m *Query) XXX_DiscardUnknown() { xxx_messageInfo_Query.DiscardUnknown(m) } @@ -374,15 +398,19 @@ func (*QueryResult) Descriptor() ([]byte, []int) { func (m *QueryResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueryResult.Unmarshal(m, b) } + func (m *QueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_QueryResult.Marshal(b, m, deterministic) } + func (m *QueryResult) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryResult.Merge(m, src) } + func (m *QueryResult) XXX_Size() int { return xxx_messageInfo_QueryResult.Size(m) } + func (m *QueryResult) XXX_DiscardUnknown() { xxx_messageInfo_QueryResult.DiscardUnknown(m) } @@ -479,15 +507,19 @@ func (*ConfigQuery) Descriptor() ([]byte, []int) { func (m *ConfigQuery) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigQuery.Unmarshal(m, b) } + func (m *ConfigQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ConfigQuery.Marshal(b, m, deterministic) } + func (m *ConfigQuery) XXX_Merge(src proto.Message) { xxx_messageInfo_ConfigQuery.Merge(m, src) } + func (m *ConfigQuery) XXX_Size() int { return xxx_messageInfo_ConfigQuery.Size(m) } + func (m *ConfigQuery) XXX_DiscardUnknown() { xxx_messageInfo_ConfigQuery.DiscardUnknown(m) } @@ -514,15 +546,19 @@ func (*ConfigResult) Descriptor() ([]byte, []int) { func (m *ConfigResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigResult.Unmarshal(m, b) } + func (m *ConfigResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ConfigResult.Marshal(b, m, deterministic) } + func (m *ConfigResult) XXX_Merge(src proto.Message) { xxx_messageInfo_ConfigResult.Merge(m, src) } + func (m *ConfigResult) XXX_Size() int { return xxx_messageInfo_ConfigResult.Size(m) } + func (m *ConfigResult) XXX_DiscardUnknown() { xxx_messageInfo_ConfigResult.DiscardUnknown(m) } @@ -549,10 +585,10 @@ func (m *ConfigResult) GetOrderers() map[string]*Endpoints { // chaincodes that are installed on peers and collection // access control policies. type PeerMembershipQuery struct { - Filter *ChaincodeInterest `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Filter *peer.ChaincodeInterest `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PeerMembershipQuery) Reset() { *m = PeerMembershipQuery{} } @@ -565,22 +601,26 @@ func (*PeerMembershipQuery) Descriptor() ([]byte, []int) { func (m *PeerMembershipQuery) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PeerMembershipQuery.Unmarshal(m, b) } + func (m *PeerMembershipQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PeerMembershipQuery.Marshal(b, m, deterministic) } + func (m *PeerMembershipQuery) XXX_Merge(src proto.Message) { xxx_messageInfo_PeerMembershipQuery.Merge(m, src) } + func (m *PeerMembershipQuery) XXX_Size() int { return xxx_messageInfo_PeerMembershipQuery.Size(m) } + func (m *PeerMembershipQuery) XXX_DiscardUnknown() { xxx_messageInfo_PeerMembershipQuery.DiscardUnknown(m) } var xxx_messageInfo_PeerMembershipQuery proto.InternalMessageInfo -func (m *PeerMembershipQuery) GetFilter() *ChaincodeInterest { +func (m *PeerMembershipQuery) GetFilter() *peer.ChaincodeInterest { if m != nil { return m.Filter } @@ -605,15 +645,19 @@ func (*PeerMembershipResult) Descriptor() ([]byte, []int) { func (m *PeerMembershipResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PeerMembershipResult.Unmarshal(m, b) } + func (m *PeerMembershipResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PeerMembershipResult.Marshal(b, m, deterministic) } + func (m *PeerMembershipResult) XXX_Merge(src proto.Message) { xxx_messageInfo_PeerMembershipResult.Merge(m, src) } + func (m *PeerMembershipResult) XXX_Size() int { return xxx_messageInfo_PeerMembershipResult.Size(m) } + func (m *PeerMembershipResult) XXX_DiscardUnknown() { xxx_messageInfo_PeerMembershipResult.DiscardUnknown(m) } @@ -632,10 +676,10 @@ func (m *PeerMembershipResult) GetPeersByOrg() map[string]*Peers { // Each invocation is a separate one, and the endorsement policy // is evaluated independantly for each given interest. type ChaincodeQuery struct { - Interests []*ChaincodeInterest `protobuf:"bytes,1,rep,name=interests,proto3" json:"interests,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Interests []*peer.ChaincodeInterest `protobuf:"bytes,1,rep,name=interests,proto3" json:"interests,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ChaincodeQuery) Reset() { *m = ChaincodeQuery{} } @@ -648,135 +692,32 @@ func (*ChaincodeQuery) Descriptor() ([]byte, []int) { func (m *ChaincodeQuery) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ChaincodeQuery.Unmarshal(m, b) } + func (m *ChaincodeQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ChaincodeQuery.Marshal(b, m, deterministic) } + func (m *ChaincodeQuery) XXX_Merge(src proto.Message) { xxx_messageInfo_ChaincodeQuery.Merge(m, src) } + func (m *ChaincodeQuery) XXX_Size() int { return xxx_messageInfo_ChaincodeQuery.Size(m) } + func (m *ChaincodeQuery) XXX_DiscardUnknown() { xxx_messageInfo_ChaincodeQuery.DiscardUnknown(m) } var xxx_messageInfo_ChaincodeQuery proto.InternalMessageInfo -func (m *ChaincodeQuery) GetInterests() []*ChaincodeInterest { +func (m *ChaincodeQuery) GetInterests() []*peer.ChaincodeInterest { if m != nil { return m.Interests } return nil } -// ChaincodeInterest defines an interest about an endorsement -// for a specific single chaincode invocation. -// Multiple chaincodes indicate chaincode to chaincode invocations. -type ChaincodeInterest struct { - Chaincodes []*ChaincodeCall `protobuf:"bytes,1,rep,name=chaincodes,proto3" json:"chaincodes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ChaincodeInterest) Reset() { *m = ChaincodeInterest{} } -func (m *ChaincodeInterest) String() string { return proto.CompactTextString(m) } -func (*ChaincodeInterest) ProtoMessage() {} -func (*ChaincodeInterest) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{11} -} - -func (m *ChaincodeInterest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ChaincodeInterest.Unmarshal(m, b) -} -func (m *ChaincodeInterest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ChaincodeInterest.Marshal(b, m, deterministic) -} -func (m *ChaincodeInterest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ChaincodeInterest.Merge(m, src) -} -func (m *ChaincodeInterest) XXX_Size() int { - return xxx_messageInfo_ChaincodeInterest.Size(m) -} -func (m *ChaincodeInterest) XXX_DiscardUnknown() { - xxx_messageInfo_ChaincodeInterest.DiscardUnknown(m) -} - -var xxx_messageInfo_ChaincodeInterest proto.InternalMessageInfo - -func (m *ChaincodeInterest) GetChaincodes() []*ChaincodeCall { - if m != nil { - return m.Chaincodes - } - return nil -} - -// ChaincodeCall defines a call to a chaincode. -// It may have collections that are related to the chaincode -type ChaincodeCall struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - CollectionNames []string `protobuf:"bytes,2,rep,name=collection_names,json=collectionNames,proto3" json:"collection_names,omitempty"` - NoPrivateReads bool `protobuf:"varint,3,opt,name=no_private_reads,json=noPrivateReads,proto3" json:"no_private_reads,omitempty"` - NoPublicWrites bool `protobuf:"varint,4,opt,name=no_public_writes,json=noPublicWrites,proto3" json:"no_public_writes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ChaincodeCall) Reset() { *m = ChaincodeCall{} } -func (m *ChaincodeCall) String() string { return proto.CompactTextString(m) } -func (*ChaincodeCall) ProtoMessage() {} -func (*ChaincodeCall) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{12} -} - -func (m *ChaincodeCall) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ChaincodeCall.Unmarshal(m, b) -} -func (m *ChaincodeCall) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ChaincodeCall.Marshal(b, m, deterministic) -} -func (m *ChaincodeCall) XXX_Merge(src proto.Message) { - xxx_messageInfo_ChaincodeCall.Merge(m, src) -} -func (m *ChaincodeCall) XXX_Size() int { - return xxx_messageInfo_ChaincodeCall.Size(m) -} -func (m *ChaincodeCall) XXX_DiscardUnknown() { - xxx_messageInfo_ChaincodeCall.DiscardUnknown(m) -} - -var xxx_messageInfo_ChaincodeCall proto.InternalMessageInfo - -func (m *ChaincodeCall) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *ChaincodeCall) GetCollectionNames() []string { - if m != nil { - return m.CollectionNames - } - return nil -} - -func (m *ChaincodeCall) GetNoPrivateReads() bool { - if m != nil { - return m.NoPrivateReads - } - return false -} - -func (m *ChaincodeCall) GetNoPublicWrites() bool { - if m != nil { - return m.NoPublicWrites - } - return false -} - // ChaincodeQueryResult contains EndorsementDescriptors for // chaincodes type ChaincodeQueryResult struct { @@ -790,21 +731,25 @@ func (m *ChaincodeQueryResult) Reset() { *m = ChaincodeQueryResult{} } func (m *ChaincodeQueryResult) String() string { return proto.CompactTextString(m) } func (*ChaincodeQueryResult) ProtoMessage() {} func (*ChaincodeQueryResult) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{13} + return fileDescriptor_ce69bf33982206ff, []int{11} } func (m *ChaincodeQueryResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ChaincodeQueryResult.Unmarshal(m, b) } + func (m *ChaincodeQueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ChaincodeQueryResult.Marshal(b, m, deterministic) } + func (m *ChaincodeQueryResult) XXX_Merge(src proto.Message) { xxx_messageInfo_ChaincodeQueryResult.Merge(m, src) } + func (m *ChaincodeQueryResult) XXX_Size() int { return xxx_messageInfo_ChaincodeQueryResult.Size(m) } + func (m *ChaincodeQueryResult) XXX_DiscardUnknown() { xxx_messageInfo_ChaincodeQueryResult.DiscardUnknown(m) } @@ -829,21 +774,25 @@ func (m *LocalPeerQuery) Reset() { *m = LocalPeerQuery{} } func (m *LocalPeerQuery) String() string { return proto.CompactTextString(m) } func (*LocalPeerQuery) ProtoMessage() {} func (*LocalPeerQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{14} + return fileDescriptor_ce69bf33982206ff, []int{12} } func (m *LocalPeerQuery) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LocalPeerQuery.Unmarshal(m, b) } + func (m *LocalPeerQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_LocalPeerQuery.Marshal(b, m, deterministic) } + func (m *LocalPeerQuery) XXX_Merge(src proto.Message) { xxx_messageInfo_LocalPeerQuery.Merge(m, src) } + func (m *LocalPeerQuery) XXX_Size() int { return xxx_messageInfo_LocalPeerQuery.Size(m) } + func (m *LocalPeerQuery) XXX_DiscardUnknown() { xxx_messageInfo_LocalPeerQuery.DiscardUnknown(m) } @@ -879,21 +828,25 @@ func (m *EndorsementDescriptor) Reset() { *m = EndorsementDescriptor{} } func (m *EndorsementDescriptor) String() string { return proto.CompactTextString(m) } func (*EndorsementDescriptor) ProtoMessage() {} func (*EndorsementDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{15} + return fileDescriptor_ce69bf33982206ff, []int{13} } func (m *EndorsementDescriptor) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EndorsementDescriptor.Unmarshal(m, b) } + func (m *EndorsementDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EndorsementDescriptor.Marshal(b, m, deterministic) } + func (m *EndorsementDescriptor) XXX_Merge(src proto.Message) { xxx_messageInfo_EndorsementDescriptor.Merge(m, src) } + func (m *EndorsementDescriptor) XXX_Size() int { return xxx_messageInfo_EndorsementDescriptor.Size(m) } + func (m *EndorsementDescriptor) XXX_DiscardUnknown() { xxx_messageInfo_EndorsementDescriptor.DiscardUnknown(m) } @@ -936,21 +889,25 @@ func (m *Layout) Reset() { *m = Layout{} } func (m *Layout) String() string { return proto.CompactTextString(m) } func (*Layout) ProtoMessage() {} func (*Layout) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{16} + return fileDescriptor_ce69bf33982206ff, []int{14} } func (m *Layout) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Layout.Unmarshal(m, b) } + func (m *Layout) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Layout.Marshal(b, m, deterministic) } + func (m *Layout) XXX_Merge(src proto.Message) { xxx_messageInfo_Layout.Merge(m, src) } + func (m *Layout) XXX_Size() int { return xxx_messageInfo_Layout.Size(m) } + func (m *Layout) XXX_DiscardUnknown() { xxx_messageInfo_Layout.DiscardUnknown(m) } @@ -976,21 +933,25 @@ func (m *Peers) Reset() { *m = Peers{} } func (m *Peers) String() string { return proto.CompactTextString(m) } func (*Peers) ProtoMessage() {} func (*Peers) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{17} + return fileDescriptor_ce69bf33982206ff, []int{15} } func (m *Peers) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Peers.Unmarshal(m, b) } + func (m *Peers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Peers.Marshal(b, m, deterministic) } + func (m *Peers) XXX_Merge(src proto.Message) { xxx_messageInfo_Peers.Merge(m, src) } + func (m *Peers) XXX_Size() int { return xxx_messageInfo_Peers.Size(m) } + func (m *Peers) XXX_DiscardUnknown() { xxx_messageInfo_Peers.DiscardUnknown(m) } @@ -1022,21 +983,25 @@ func (m *Peer) Reset() { *m = Peer{} } func (m *Peer) String() string { return proto.CompactTextString(m) } func (*Peer) ProtoMessage() {} func (*Peer) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{18} + return fileDescriptor_ce69bf33982206ff, []int{16} } func (m *Peer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Peer.Unmarshal(m, b) } + func (m *Peer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Peer.Marshal(b, m, deterministic) } + func (m *Peer) XXX_Merge(src proto.Message) { xxx_messageInfo_Peer.Merge(m, src) } + func (m *Peer) XXX_Size() int { return xxx_messageInfo_Peer.Size(m) } + func (m *Peer) XXX_DiscardUnknown() { xxx_messageInfo_Peer.DiscardUnknown(m) } @@ -1076,21 +1041,25 @@ func (m *Error) Reset() { *m = Error{} } func (m *Error) String() string { return proto.CompactTextString(m) } func (*Error) ProtoMessage() {} func (*Error) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{19} + return fileDescriptor_ce69bf33982206ff, []int{17} } func (m *Error) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Error.Unmarshal(m, b) } + func (m *Error) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Error.Marshal(b, m, deterministic) } + func (m *Error) XXX_Merge(src proto.Message) { xxx_messageInfo_Error.Merge(m, src) } + func (m *Error) XXX_Size() int { return xxx_messageInfo_Error.Size(m) } + func (m *Error) XXX_DiscardUnknown() { xxx_messageInfo_Error.DiscardUnknown(m) } @@ -1116,21 +1085,25 @@ func (m *Endpoints) Reset() { *m = Endpoints{} } func (m *Endpoints) String() string { return proto.CompactTextString(m) } func (*Endpoints) ProtoMessage() {} func (*Endpoints) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{20} + return fileDescriptor_ce69bf33982206ff, []int{18} } func (m *Endpoints) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Endpoints.Unmarshal(m, b) } + func (m *Endpoints) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Endpoints.Marshal(b, m, deterministic) } + func (m *Endpoints) XXX_Merge(src proto.Message) { xxx_messageInfo_Endpoints.Merge(m, src) } + func (m *Endpoints) XXX_Size() int { return xxx_messageInfo_Endpoints.Size(m) } + func (m *Endpoints) XXX_DiscardUnknown() { xxx_messageInfo_Endpoints.DiscardUnknown(m) } @@ -1157,21 +1130,25 @@ func (m *Endpoint) Reset() { *m = Endpoint{} } func (m *Endpoint) String() string { return proto.CompactTextString(m) } func (*Endpoint) ProtoMessage() {} func (*Endpoint) Descriptor() ([]byte, []int) { - return fileDescriptor_ce69bf33982206ff, []int{21} + return fileDescriptor_ce69bf33982206ff, []int{19} } func (m *Endpoint) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Endpoint.Unmarshal(m, b) } + func (m *Endpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Endpoint.Marshal(b, m, deterministic) } + func (m *Endpoint) XXX_Merge(src proto.Message) { xxx_messageInfo_Endpoint.Merge(m, src) } + func (m *Endpoint) XXX_Size() int { return xxx_messageInfo_Endpoint.Size(m) } + func (m *Endpoint) XXX_DiscardUnknown() { xxx_messageInfo_Endpoint.DiscardUnknown(m) } @@ -1207,8 +1184,6 @@ func init() { proto.RegisterType((*PeerMembershipResult)(nil), "discovery.PeerMembershipResult") proto.RegisterMapType((map[string]*Peers)(nil), "discovery.PeerMembershipResult.PeersByOrgEntry") proto.RegisterType((*ChaincodeQuery)(nil), "discovery.ChaincodeQuery") - proto.RegisterType((*ChaincodeInterest)(nil), "discovery.ChaincodeInterest") - proto.RegisterType((*ChaincodeCall)(nil), "discovery.ChaincodeCall") proto.RegisterType((*ChaincodeQueryResult)(nil), "discovery.ChaincodeQueryResult") proto.RegisterType((*LocalPeerQuery)(nil), "discovery.LocalPeerQuery") proto.RegisterType((*EndorsementDescriptor)(nil), "discovery.EndorsementDescriptor") @@ -1225,87 +1200,84 @@ func init() { func init() { proto.RegisterFile("discovery/protocol.proto", fileDescriptor_ce69bf33982206ff) } var fileDescriptor_ce69bf33982206ff = []byte{ - // 1200 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x5b, 0x6f, 0x1b, 0x45, - 0x14, 0x8e, 0x9d, 0x38, 0xb6, 0x8f, 0x63, 0xc7, 0x99, 0x98, 0x62, 0xac, 0x8a, 0xb6, 0x2b, 0x95, - 0x86, 0xa2, 0xae, 0x21, 0xdc, 0x7a, 0x13, 0xa8, 0x4d, 0x2f, 0xa9, 0x68, 0x68, 0x32, 0x45, 0x80, - 0x10, 0xd2, 0x6a, 0xbd, 0x3e, 0x59, 0xaf, 0x58, 0xef, 0x6c, 0x66, 0x66, 0x83, 0xfc, 0xcc, 0x3b, - 0x3f, 0x81, 0x07, 0x78, 0x41, 0xfc, 0x04, 0x7e, 0x1d, 0xda, 0xb9, 0xac, 0xd7, 0x8e, 0x43, 0x91, - 0x78, 0x9b, 0xf9, 0xce, 0xf7, 0x9d, 0x39, 0xe7, 0xcc, 0x99, 0x0b, 0xf4, 0xc7, 0x91, 0x08, 0xd8, - 0x39, 0xf2, 0xd9, 0x30, 0xe5, 0x4c, 0xb2, 0x80, 0xc5, 0xae, 0x1a, 0x90, 0x66, 0x61, 0x19, 0xf4, - 0x42, 0x26, 0x44, 0x94, 0x0e, 0xa7, 0x28, 0x84, 0x1f, 0xa2, 0x26, 0x0c, 0x7a, 0x53, 0x91, 0x0e, - 0xa7, 0x22, 0xf5, 0x02, 0x96, 0x9c, 0x46, 0xa1, 0x46, 0x9d, 0xe7, 0xd0, 0x7e, 0x1d, 0x85, 0x09, - 0x8e, 0x29, 0x9e, 0x65, 0x28, 0x24, 0xe9, 0x43, 0x3d, 0xf5, 0x67, 0x31, 0xf3, 0xc7, 0xfd, 0xca, - 0xf5, 0xca, 0xde, 0x16, 0xb5, 0x53, 0x72, 0x15, 0x9a, 0x22, 0x0a, 0x13, 0x5f, 0x66, 0x1c, 0xfb, - 0x55, 0x65, 0x9b, 0x03, 0x0e, 0x87, 0xba, 0x75, 0xf1, 0x00, 0x3a, 0x7e, 0x26, 0x27, 0x98, 0xc8, - 0x28, 0xf0, 0x65, 0xc4, 0x12, 0xe5, 0xa9, 0xb5, 0xbf, 0xeb, 0x16, 0x31, 0xba, 0x8f, 0x32, 0x39, - 0x79, 0x91, 0x9c, 0x32, 0xba, 0x44, 0x25, 0xb7, 0xa1, 0x7e, 0x96, 0x21, 0x8f, 0x50, 0xf4, 0xab, - 0xd7, 0xd7, 0xf7, 0x5a, 0xfb, 0xdd, 0x92, 0xea, 0x24, 0x43, 0x3e, 0xa3, 0x96, 0xe0, 0x3c, 0x84, - 0x06, 0x45, 0x91, 0xb2, 0x44, 0x20, 0xf9, 0x10, 0xea, 0x1c, 0x45, 0x16, 0x4b, 0xd1, 0xaf, 0x28, - 0xdd, 0x95, 0x0b, 0x3a, 0x65, 0xa6, 0x96, 0xe6, 0x8c, 0xa1, 0x61, 0xa3, 0x20, 0xb7, 0x60, 0x3b, - 0x88, 0x23, 0x4c, 0xa4, 0x17, 0x8d, 0xf3, 0x60, 0xe4, 0xcc, 0x64, 0xdf, 0xd1, 0xf0, 0x0b, 0x83, - 0x92, 0x21, 0xf4, 0x0c, 0x51, 0xc6, 0xc2, 0x0b, 0x90, 0x4b, 0x6f, 0xe2, 0x8b, 0x89, 0xa9, 0xc7, - 0x8e, 0xb6, 0x7d, 0x13, 0x8b, 0x03, 0xe4, 0xf2, 0xd0, 0x17, 0x13, 0xe7, 0xb7, 0x2a, 0xd4, 0xd4, - 0xf2, 0x79, 0x65, 0x83, 0x89, 0x9f, 0x24, 0x18, 0x2b, 0xdf, 0x4d, 0x6a, 0xa7, 0xe4, 0x01, 0x6c, - 0xe9, 0x4d, 0xf1, 0xf2, 0xcc, 0x66, 0xca, 0xd9, 0x62, 0x02, 0x07, 0xca, 0xac, 0xfc, 0x1c, 0xae, - 0xd1, 0x56, 0x30, 0x9f, 0x92, 0x2f, 0x01, 0x52, 0x44, 0x6e, 0xa4, 0xeb, 0x4a, 0xfa, 0x6e, 0x49, - 0x7a, 0x8c, 0xc8, 0x8f, 0x70, 0x3a, 0x42, 0x2e, 0x26, 0x51, 0x6a, 0x5d, 0x34, 0x73, 0x8d, 0x76, - 0xf0, 0x19, 0x34, 0x82, 0xc0, 0xc8, 0x37, 0x94, 0xfc, 0x9d, 0xf2, 0xca, 0x13, 0x3f, 0x4a, 0x02, - 0x36, 0x46, 0xab, 0xac, 0x07, 0x81, 0xd6, 0x3d, 0x84, 0x56, 0xcc, 0x02, 0x3f, 0xf6, 0x72, 0x57, - 0xa2, 0x5f, 0xbb, 0x20, 0x7d, 0x99, 0x5b, 0x8f, 0xed, 0x3a, 0x87, 0x6b, 0x14, 0x62, 0x8b, 0x88, - 0xc7, 0x75, 0xa8, 0xa9, 0x25, 0x9d, 0x5f, 0xaa, 0xd0, 0x2a, 0xed, 0x0f, 0xd9, 0x83, 0x1a, 0x72, - 0xce, 0xb8, 0x69, 0x9a, 0xf2, 0xf6, 0x3f, 0xcd, 0xf1, 0xc3, 0x35, 0xaa, 0x09, 0xe4, 0x0b, 0x68, - 0x9b, 0xb2, 0xe9, 0x2d, 0x35, 0x75, 0x7b, 0xfb, 0x42, 0xdd, 0xb4, 0xe7, 0xc3, 0x35, 0x6a, 0xca, - 0x6c, 0x56, 0x3a, 0x80, 0x2d, 0x9b, 0x78, 0xee, 0xc1, 0xd4, 0xee, 0xda, 0xa5, 0xc9, 0x17, 0x6e, - 0xc0, 0x94, 0x80, 0xa2, 0x20, 0x0f, 0xa0, 0x3e, 0xd5, 0xd5, 0x35, 0xc5, 0xbb, 0x76, 0x69, 0xed, - 0x0b, 0xbd, 0x55, 0x3c, 0x6e, 0xc0, 0xa6, 0x0e, 0xdd, 0x69, 0x43, 0xab, 0xb4, 0xc7, 0xce, 0x5f, - 0x55, 0xd8, 0x2a, 0xc7, 0x4e, 0x3e, 0x85, 0x8d, 0xa9, 0x48, 0x6d, 0x6f, 0xdf, 0xb8, 0x24, 0x45, - 0xf7, 0x48, 0xa4, 0xe2, 0x69, 0x22, 0xf9, 0x8c, 0x2a, 0x3a, 0x79, 0x04, 0x0d, 0xc6, 0xc7, 0xc8, - 0xf3, 0xf0, 0xf4, 0x71, 0xba, 0x79, 0x99, 0xf4, 0x95, 0xe1, 0x69, 0x79, 0x21, 0x1b, 0x1c, 0x41, - 0xb3, 0xf0, 0x4a, 0xba, 0xb0, 0xfe, 0x13, 0xce, 0x4c, 0xff, 0xe6, 0x43, 0x72, 0x1b, 0x6a, 0xe7, - 0x7e, 0x9c, 0xa1, 0x29, 0x7e, 0xcf, 0x9d, 0x8a, 0xd4, 0x7d, 0xe6, 0x8f, 0x78, 0x14, 0x1c, 0xbd, - 0x3e, 0x36, 0x2b, 0x68, 0xca, 0xfd, 0xea, 0xdd, 0xca, 0xe0, 0x04, 0xda, 0x0b, 0x2b, 0xfd, 0x17, - 0x97, 0xa5, 0x0e, 0x48, 0xc6, 0x29, 0x8b, 0x12, 0x29, 0x4a, 0x2e, 0x9d, 0xaf, 0x60, 0x77, 0x45, - 0x93, 0x93, 0x4f, 0x60, 0xf3, 0x34, 0x8a, 0x25, 0xda, 0x4e, 0xba, 0xba, 0x6a, 0x63, 0x5f, 0x24, - 0x12, 0x39, 0x0a, 0x49, 0x0d, 0xd7, 0xf9, 0xbb, 0x02, 0xbd, 0x55, 0xdb, 0x46, 0x4e, 0x60, 0x4b, - 0x35, 0xba, 0x37, 0x9a, 0x79, 0x8c, 0x87, 0x66, 0x27, 0x86, 0x6f, 0xd8, 0x6d, 0x57, 0x77, 0xfb, - 0xec, 0x15, 0x0f, 0x75, 0x61, 0xd5, 0x61, 0xd5, 0xc0, 0xe0, 0x15, 0x6c, 0x2f, 0x99, 0x57, 0x54, - 0xe3, 0xbd, 0xc5, 0x6a, 0x74, 0x97, 0x16, 0x5c, 0xa8, 0xc4, 0x4b, 0xe8, 0x2c, 0xb6, 0x2c, 0xb9, - 0x0f, 0xcd, 0xc8, 0xa4, 0x68, 0x9b, 0xe7, 0xdf, 0xeb, 0x30, 0xa7, 0x3b, 0x47, 0xb0, 0x73, 0xc1, - 0x4e, 0xee, 0x02, 0x04, 0x16, 0xb4, 0x1e, 0xfb, 0xab, 0x3c, 0x1e, 0xf8, 0x71, 0x4c, 0x4b, 0x5c, - 0xe7, 0xf7, 0x0a, 0xb4, 0x17, 0xac, 0x84, 0xc0, 0x46, 0xe2, 0x4f, 0xd1, 0x64, 0xab, 0xc6, 0xe4, - 0x7d, 0xe8, 0x06, 0x2c, 0x8e, 0x31, 0xc8, 0x5f, 0x03, 0x2f, 0x87, 0x74, 0xe7, 0x36, 0xe9, 0xf6, - 0x1c, 0xff, 0x3a, 0x87, 0xc9, 0x1e, 0x74, 0x13, 0xe6, 0xa5, 0x3c, 0x3a, 0xf7, 0x25, 0x7a, 0x1c, - 0xfd, 0xb1, 0x3e, 0xc3, 0x0d, 0xda, 0x49, 0xd8, 0xb1, 0x86, 0x69, 0x8e, 0x5a, 0x66, 0x36, 0x8a, - 0xa3, 0xc0, 0xfb, 0x99, 0x47, 0x12, 0xf5, 0x69, 0xd5, 0x4c, 0x05, 0x7f, 0xa7, 0x50, 0x87, 0x42, - 0x6f, 0xd5, 0xa1, 0x27, 0xf7, 0xa1, 0x1e, 0xb0, 0x44, 0x62, 0x22, 0x4d, 0xce, 0xd7, 0x17, 0xbb, - 0x92, 0x71, 0x81, 0x53, 0x4c, 0xe4, 0x13, 0x14, 0x01, 0x8f, 0x52, 0xc9, 0x38, 0xb5, 0x02, 0xa7, - 0x0b, 0x9d, 0xc5, 0xab, 0xd0, 0xf9, 0xa3, 0x0a, 0x6f, 0xad, 0x14, 0xe5, 0x8f, 0x6c, 0x51, 0x32, - 0x53, 0x97, 0x39, 0x40, 0x42, 0xd8, 0x45, 0x2d, 0xd3, 0x7d, 0x18, 0x72, 0x96, 0xa5, 0xf6, 0x64, - 0x7f, 0xfe, 0xa6, 0x88, 0x2c, 0x9a, 0x37, 0xdc, 0x73, 0xa5, 0xd4, 0x2d, 0xb9, 0x83, 0xcb, 0x38, - 0xf9, 0x00, 0xea, 0xb1, 0x3f, 0x63, 0x99, 0xcc, 0x2b, 0x9a, 0x3b, 0xdf, 0x29, 0xdf, 0xeb, 0xca, - 0x42, 0x2d, 0x63, 0xf0, 0x2d, 0x5c, 0x59, 0xed, 0xf9, 0x7f, 0x76, 0xf3, 0x9f, 0x15, 0xd8, 0xd4, - 0x6b, 0x91, 0xef, 0x61, 0xf7, 0x2c, 0xf3, 0xf3, 0x27, 0x38, 0xc2, 0x79, 0xe6, 0x66, 0x2b, 0xf6, - 0x2e, 0xc4, 0xe6, 0x9e, 0x14, 0x64, 0x13, 0x90, 0xc9, 0xf4, 0x6c, 0x19, 0x1f, 0x3c, 0x81, 0x2b, - 0xab, 0xc9, 0x2b, 0x82, 0xef, 0x95, 0x83, 0x6f, 0x97, 0x43, 0x75, 0xa1, 0xa6, 0xc2, 0x27, 0x37, - 0xa1, 0xa6, 0x9f, 0x43, 0x1d, 0xda, 0xf6, 0x52, 0x7e, 0x54, 0x5b, 0x9d, 0x5f, 0x2b, 0xb0, 0x91, - 0xcf, 0xc9, 0x10, 0x40, 0xc8, 0xbc, 0x7d, 0xa3, 0xe4, 0x94, 0x15, 0x4f, 0x9e, 0xfe, 0xc0, 0xb9, - 0x4f, 0x93, 0x73, 0x8c, 0x59, 0x8a, 0xb4, 0xa9, 0x38, 0xea, 0xa7, 0x72, 0x0f, 0xb6, 0xa7, 0xc5, - 0x1d, 0xa3, 0x55, 0xd5, 0x4b, 0x54, 0x9d, 0x39, 0x51, 0x49, 0x07, 0xd0, 0x28, 0x7e, 0x37, 0xeb, - 0xea, 0xbf, 0x52, 0xcc, 0x9d, 0x1b, 0x50, 0x53, 0xaf, 0xab, 0xfa, 0xa5, 0x14, 0x8d, 0xae, 0x7f, - 0x29, 0xa6, 0x8d, 0x1f, 0x42, 0xb3, 0xb8, 0x7e, 0xc9, 0x10, 0x1a, 0x68, 0x26, 0x26, 0xd5, 0xdd, - 0x15, 0xd7, 0x34, 0x2d, 0x48, 0xce, 0x3e, 0x34, 0x2c, 0x9a, 0x9f, 0xfb, 0x09, 0x13, 0x76, 0x01, - 0x35, 0xce, 0xb1, 0x94, 0x71, 0x69, 0x4a, 0xab, 0xc6, 0xfb, 0xcf, 0xa0, 0xf9, 0xc4, 0xfa, 0x24, - 0xf7, 0xa0, 0x61, 0x27, 0xa4, 0x7c, 0xe1, 0x2c, 0x7c, 0x5f, 0x07, 0xe5, 0x28, 0xec, 0xdf, 0xf0, - 0xf1, 0x8f, 0x70, 0x8b, 0xf1, 0xd0, 0x9d, 0xcc, 0x52, 0xe4, 0x31, 0x8e, 0x43, 0xe4, 0xee, 0xa9, - 0x7a, 0xa1, 0xf4, 0x27, 0x58, 0xcc, 0x35, 0x3f, 0x7c, 0x14, 0x46, 0x72, 0x92, 0x8d, 0xdc, 0x80, - 0x4d, 0x87, 0x25, 0xfe, 0x50, 0xf3, 0xef, 0x68, 0xfe, 0x9d, 0x90, 0x0d, 0x0b, 0xc9, 0x68, 0x53, - 0x81, 0x1f, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x3a, 0x1a, 0x79, 0x9c, 0x0b, 0x00, 0x00, + // 1113 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x5b, 0x6f, 0xe3, 0x44, + 0x14, 0x6e, 0xd2, 0xa6, 0x49, 0x4e, 0x7a, 0x9d, 0x86, 0x92, 0x8d, 0x56, 0x6c, 0xd7, 0xd2, 0xb2, + 0xd5, 0xa2, 0x75, 0xd8, 0x22, 0x58, 0x76, 0x5b, 0x81, 0xb6, 0x97, 0xdd, 0x54, 0xa2, 0x6a, 0xeb, + 0x45, 0x08, 0x21, 0xa4, 0xc8, 0x75, 0x4e, 0x6d, 0x0b, 0xdb, 0xe3, 0xce, 0x8c, 0x2b, 0xf9, 0x99, + 0x77, 0x7e, 0x02, 0x2f, 0xbc, 0x20, 0x7e, 0x02, 0xbf, 0x0e, 0x79, 0x2e, 0x8e, 0x93, 0xa6, 0x2c, + 0x12, 0x6f, 0x33, 0x67, 0xbe, 0xef, 0x5c, 0xbe, 0x73, 0x3c, 0x63, 0xe8, 0x8d, 0x43, 0xee, 0xd1, + 0x5b, 0x64, 0xf9, 0x20, 0x65, 0x54, 0x50, 0x8f, 0x46, 0xb6, 0x5c, 0x90, 0x76, 0x79, 0xd2, 0xef, + 0xfa, 0x94, 0xf3, 0x30, 0x1d, 0xc4, 0xc8, 0xb9, 0xeb, 0xa3, 0x02, 0xf4, 0xbb, 0x31, 0x4f, 0x07, + 0x31, 0x4f, 0x47, 0x1e, 0x4d, 0xae, 0x43, 0x5f, 0x5b, 0x1f, 0xa6, 0x88, 0xac, 0xf0, 0x95, 0x52, + 0xee, 0x46, 0x23, 0x86, 0x3c, 0xa5, 0x09, 0xd7, 0x1c, 0xeb, 0x1d, 0xac, 0xbe, 0x0f, 0xfd, 0x04, + 0xc7, 0x0e, 0xde, 0x64, 0xc8, 0x05, 0xe9, 0x41, 0x33, 0x75, 0xf3, 0x88, 0xba, 0xe3, 0x5e, 0x6d, + 0xa7, 0xb6, 0xbb, 0xe2, 0x98, 0x2d, 0x79, 0x08, 0x6d, 0x1e, 0xfa, 0x89, 0x2b, 0x32, 0x86, 0xbd, + 0xba, 0x3c, 0x9b, 0x18, 0x2c, 0x06, 0x4d, 0xe3, 0x62, 0x1f, 0xd6, 0xdc, 0x4c, 0x04, 0x98, 0x88, + 0xd0, 0x73, 0x45, 0x48, 0x13, 0xe9, 0xa9, 0xb3, 0xb7, 0x65, 0x97, 0x15, 0xd8, 0x6f, 0x32, 0x11, + 0x9c, 0x26, 0xd7, 0xd4, 0x99, 0x81, 0x92, 0x67, 0xd0, 0xbc, 0xc9, 0x90, 0x85, 0xc8, 0x7b, 0xf5, + 0x9d, 0xc5, 0xdd, 0xce, 0xde, 0x46, 0x85, 0x75, 0x99, 0x21, 0xcb, 0x1d, 0x03, 0xb0, 0x0e, 0xa0, + 0xe5, 0xe8, 0x72, 0xc8, 0xe7, 0xd0, 0x64, 0xc8, 0xb3, 0x48, 0xf0, 0x5e, 0x4d, 0xf2, 0xb6, 0xef, + 0xf0, 0xe4, 0xb1, 0x63, 0x60, 0xd6, 0x18, 0x5a, 0x26, 0x0b, 0xf2, 0x14, 0xd6, 0xbd, 0x28, 0xc4, + 0x44, 0x8c, 0xc2, 0x71, 0x91, 0x8c, 0xc8, 0x75, 0xf5, 0x6b, 0xca, 0x7c, 0xaa, 0xad, 0x64, 0x00, + 0x5d, 0x0d, 0x14, 0x11, 0x1f, 0x79, 0xc8, 0xc4, 0x28, 0x70, 0x79, 0xa0, 0xf5, 0xd8, 0x54, 0x67, + 0xdf, 0x47, 0xfc, 0x08, 0x99, 0x18, 0xba, 0x3c, 0xb0, 0x7e, 0xaf, 0x43, 0x43, 0x86, 0x2f, 0x94, + 0xf5, 0x02, 0x37, 0x49, 0x30, 0x92, 0xbe, 0xdb, 0x8e, 0xd9, 0x92, 0x7d, 0x58, 0x51, 0x2d, 0x1b, + 0x15, 0x95, 0xe5, 0xd2, 0xd9, 0x74, 0x01, 0x47, 0xf2, 0x58, 0xfa, 0x19, 0x2e, 0x38, 0x1d, 0x6f, + 0xb2, 0x25, 0xdf, 0x02, 0x14, 0x1d, 0xd6, 0xd4, 0x45, 0x49, 0xfd, 0xa4, 0x42, 0xbd, 0x40, 0x64, + 0x67, 0x18, 0x5f, 0x21, 0xe3, 0x41, 0x98, 0x1a, 0x17, 0xed, 0x82, 0xa3, 0x1c, 0x7c, 0x05, 0x2d, + 0xcf, 0xd3, 0xf4, 0x25, 0x49, 0x7f, 0x50, 0x8d, 0x1c, 0xb8, 0x61, 0xe2, 0xd1, 0x31, 0x1a, 0x66, + 0xd3, 0xf3, 0x14, 0xef, 0x00, 0x3a, 0x11, 0xf5, 0xdc, 0x68, 0x54, 0xb8, 0xe2, 0xbd, 0xc6, 0x1d, + 0xea, 0x77, 0xc5, 0xe9, 0x85, 0x89, 0x33, 0x5c, 0x70, 0x20, 0x32, 0x16, 0x7e, 0xd8, 0x84, 0x86, + 0x0c, 0x69, 0xfd, 0x5a, 0x87, 0x4e, 0xa5, 0x3f, 0x64, 0x17, 0x1a, 0xc8, 0x18, 0x65, 0x7a, 0x68, + 0xaa, 0xed, 0x3f, 0x29, 0xec, 0xc3, 0x05, 0x47, 0x01, 0xc8, 0x37, 0xb0, 0xaa, 0x65, 0x53, 0x2d, + 0xd5, 0xba, 0x7d, 0x7c, 0x47, 0x37, 0xe5, 0x79, 0xb8, 0xe0, 0x68, 0x99, 0x75, 0xa4, 0x23, 0x58, + 0x31, 0x85, 0x17, 0x1e, 0xb4, 0x76, 0x8f, 0xee, 0x2d, 0xbe, 0x74, 0x03, 0x5a, 0x02, 0x07, 0x39, + 0xd9, 0x87, 0x66, 0xac, 0xd4, 0xd5, 0xe2, 0x3d, 0xba, 0x57, 0xfb, 0x92, 0x6f, 0x18, 0x87, 0x2d, + 0x58, 0x56, 0xa9, 0x5b, 0xab, 0xd0, 0xa9, 0xf4, 0xd8, 0xfa, 0xab, 0x0e, 0x2b, 0xd5, 0xdc, 0xc9, + 0x97, 0xb0, 0x14, 0xf3, 0xd4, 0xcc, 0xf6, 0xe3, 0x7b, 0x4a, 0xb4, 0xcf, 0x78, 0xca, 0x4f, 0x12, + 0xc1, 0x72, 0x47, 0xc2, 0xc9, 0x1b, 0x68, 0x51, 0x36, 0x46, 0x56, 0xa4, 0xa7, 0x3e, 0xa7, 0x27, + 0xf7, 0x51, 0xcf, 0x35, 0x4e, 0xd1, 0x4b, 0x5a, 0xff, 0x0c, 0xda, 0xa5, 0x57, 0xb2, 0x01, 0x8b, + 0xbf, 0x60, 0xae, 0xe7, 0xb7, 0x58, 0x92, 0x67, 0xd0, 0xb8, 0x75, 0xa3, 0x0c, 0xb5, 0xf8, 0x5d, + 0x3b, 0xe6, 0xa9, 0xfd, 0xd6, 0xbd, 0x62, 0xa1, 0x77, 0xf6, 0xfe, 0x42, 0x47, 0x50, 0x90, 0xd7, + 0xf5, 0xaf, 0x6b, 0xfd, 0x4b, 0x58, 0x9d, 0x8a, 0xf4, 0x5f, 0x5c, 0x56, 0x26, 0x20, 0x19, 0xa7, + 0x34, 0x4c, 0x04, 0xaf, 0xb8, 0xb4, 0x86, 0xb0, 0x35, 0x67, 0xc8, 0xc9, 0x0b, 0x58, 0xbe, 0x0e, + 0x23, 0x81, 0x66, 0x92, 0x1e, 0xa8, 0x2b, 0x8f, 0x4f, 0xba, 0x7a, 0x9a, 0x08, 0x64, 0xc8, 0x85, + 0xa3, 0x81, 0xd6, 0xdf, 0x35, 0xe8, 0xce, 0xeb, 0x19, 0xb9, 0x84, 0x15, 0x39, 0xe5, 0xa3, 0xab, + 0x7c, 0x44, 0x99, 0xaf, 0xdb, 0x30, 0xf8, 0x40, 0xab, 0x6d, 0x35, 0xea, 0xf9, 0x39, 0xf3, 0x95, + 0xaa, 0xf2, 0x4b, 0x55, 0x86, 0xfe, 0x39, 0xac, 0xcf, 0x1c, 0xcf, 0x91, 0xe2, 0xd3, 0x69, 0x29, + 0x36, 0x66, 0x02, 0x4e, 0xc9, 0x70, 0x0a, 0x6b, 0xd3, 0xf3, 0x4a, 0x5e, 0x42, 0x3b, 0xd4, 0x25, + 0x9a, 0xc9, 0xf9, 0x17, 0x11, 0x26, 0x58, 0xcb, 0x81, 0xee, 0xbc, 0xd1, 0x27, 0xaf, 0xa1, 0xe9, + 0xd1, 0x44, 0x60, 0x22, 0xb4, 0xbb, 0x9d, 0xe9, 0xde, 0x50, 0xc6, 0x31, 0xc6, 0x44, 0x1c, 0x23, + 0xf7, 0x58, 0x98, 0x0a, 0xca, 0x1c, 0x43, 0xb0, 0x36, 0x60, 0x6d, 0xfa, 0x42, 0xb0, 0xfe, 0xa8, + 0xc3, 0x47, 0x73, 0x49, 0xc5, 0x53, 0xe3, 0x99, 0xf8, 0x5a, 0x8e, 0x89, 0x81, 0xf8, 0xb0, 0x85, + 0x8a, 0xa6, 0x1a, 0xe2, 0x33, 0x9a, 0xa5, 0x66, 0xbe, 0x5f, 0x7e, 0x28, 0x23, 0x63, 0x2d, 0x94, + 0x7f, 0x27, 0x99, 0xaa, 0x37, 0x9b, 0x38, 0x6b, 0x27, 0x9f, 0x41, 0x33, 0x72, 0x73, 0x9a, 0x89, + 0xe2, 0x6e, 0x28, 0x9c, 0x6f, 0x56, 0x6f, 0x37, 0x79, 0xe2, 0x18, 0x44, 0xff, 0x07, 0xd8, 0x9e, + 0xef, 0xf9, 0x7f, 0xb6, 0xf5, 0xcf, 0x1a, 0x2c, 0xab, 0x58, 0xe4, 0x47, 0xd8, 0xba, 0xc9, 0xdc, + 0xe2, 0x21, 0x0a, 0x71, 0x52, 0xb9, 0x6e, 0xc5, 0xee, 0x9d, 0xdc, 0xec, 0xcb, 0x12, 0xac, 0x13, + 0xd2, 0x95, 0xde, 0xcc, 0xda, 0xfb, 0xc7, 0xb0, 0x3d, 0x1f, 0x3c, 0x27, 0xf9, 0x6e, 0x35, 0xf9, + 0xd5, 0x6a, 0xaa, 0x36, 0x34, 0x64, 0xfa, 0xe4, 0x09, 0x34, 0xd4, 0xa3, 0xa0, 0x52, 0x5b, 0x9f, + 0xa9, 0xcf, 0x51, 0xa7, 0xd6, 0x6f, 0x35, 0x58, 0x2a, 0xf6, 0x64, 0x00, 0xc0, 0x85, 0x2b, 0x70, + 0x14, 0x26, 0xd7, 0xb4, 0xbc, 0xf8, 0xd5, 0x4f, 0x8e, 0x7d, 0x92, 0xdc, 0x62, 0x44, 0x53, 0x74, + 0xda, 0x12, 0x23, 0xdf, 0xeb, 0x57, 0xb0, 0x1e, 0x97, 0x1f, 0x9b, 0x62, 0xd5, 0xef, 0x61, 0xad, + 0x4d, 0x80, 0x92, 0xda, 0x87, 0x56, 0xf9, 0xc6, 0x2f, 0xca, 0x57, 0xbb, 0xdc, 0x5b, 0x8f, 0xa1, + 0x21, 0xdf, 0x18, 0xf9, 0x56, 0x97, 0x83, 0xae, 0xde, 0x6a, 0x3d, 0xc6, 0x07, 0xd0, 0x2e, 0x2f, + 0x21, 0x32, 0x80, 0x16, 0xea, 0x8d, 0x2e, 0x75, 0x6b, 0xce, 0x65, 0xe5, 0x94, 0x20, 0x6b, 0x0f, + 0x5a, 0xc6, 0x4a, 0x08, 0x2c, 0x05, 0x94, 0x9b, 0x00, 0x72, 0x5d, 0xd8, 0x52, 0xca, 0x84, 0x96, + 0x56, 0xae, 0xf7, 0xde, 0x42, 0xfb, 0xd8, 0xf8, 0x24, 0xaf, 0xa0, 0x65, 0x36, 0xa4, 0x57, 0x89, + 0x35, 0xf5, 0x13, 0xd7, 0xaf, 0x66, 0x61, 0xfe, 0x90, 0x0e, 0x7f, 0x86, 0xa7, 0x94, 0xf9, 0x76, + 0x90, 0xa7, 0xc8, 0x22, 0x1c, 0xfb, 0xc8, 0xec, 0x6b, 0x79, 0x4f, 0x9b, 0x2b, 0xa1, 0xe4, 0xfc, + 0xf4, 0xc2, 0x0f, 0x45, 0x90, 0x5d, 0xd9, 0x1e, 0x8d, 0x07, 0x15, 0xfc, 0x40, 0xe1, 0x9f, 0x2b, + 0xfc, 0x73, 0x9f, 0x0e, 0x4a, 0xca, 0xd5, 0xb2, 0x34, 0x7e, 0xf1, 0x4f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xc5, 0x26, 0x97, 0xc6, 0xc0, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn +var ( + _ context.Context + _ grpc.ClientConn +) // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -1343,8 +1315,7 @@ type DiscoveryServer interface { } // UnimplementedDiscoveryServer can be embedded to have forward compatible implementations. -type UnimplementedDiscoveryServer struct { -} +type UnimplementedDiscoveryServer struct{} func (*UnimplementedDiscoveryServer) Discover(ctx context.Context, req *SignedRequest) (*Response, error) { return nil, status.Errorf(codes.Unimplemented, "method Discover not implemented") diff --git a/vendor/github.com/hyperledger/fabric-protos-go/peer/proposal_response.pb.go b/vendor/github.com/hyperledger/fabric-protos-go/peer/proposal_response.pb.go index a133e4edbc8..a50783d6316 100644 --- a/vendor/github.com/hyperledger/fabric-protos-go/peer/proposal_response.pb.go +++ b/vendor/github.com/hyperledger/fabric-protos-go/peer/proposal_response.pb.go @@ -5,15 +5,19 @@ package peer import ( fmt "fmt" + math "math" + proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" - math "math" + common "github.com/hyperledger/fabric-protos-go/common" ) // Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf +var ( + _ = proto.Marshal + _ = fmt.Errorf + _ = math.Inf +) // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -42,10 +46,12 @@ type ProposalResponse struct { Payload []byte `protobuf:"bytes,5,opt,name=payload,proto3" json:"payload,omitempty"` // The endorsement of the proposal, basically // the endorser's signature over the payload - Endorsement *Endorsement `protobuf:"bytes,6,opt,name=endorsement,proto3" json:"endorsement,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Endorsement *Endorsement `protobuf:"bytes,6,opt,name=endorsement,proto3" json:"endorsement,omitempty"` + // The chaincode interest derived from simulating the proposal. + Interest *ChaincodeInterest `protobuf:"bytes,7,opt,name=interest,proto3" json:"interest,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ProposalResponse) Reset() { *m = ProposalResponse{} } @@ -58,15 +64,19 @@ func (*ProposalResponse) Descriptor() ([]byte, []int) { func (m *ProposalResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProposalResponse.Unmarshal(m, b) } + func (m *ProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProposalResponse.Marshal(b, m, deterministic) } + func (m *ProposalResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_ProposalResponse.Merge(m, src) } + func (m *ProposalResponse) XXX_Size() int { return xxx_messageInfo_ProposalResponse.Size(m) } + func (m *ProposalResponse) XXX_DiscardUnknown() { xxx_messageInfo_ProposalResponse.DiscardUnknown(m) } @@ -108,6 +118,13 @@ func (m *ProposalResponse) GetEndorsement() *Endorsement { return nil } +func (m *ProposalResponse) GetInterest() *ChaincodeInterest { + if m != nil { + return m.Interest + } + return nil +} + // A response with a representation similar to an HTTP response that can // be used within another message. type Response struct { @@ -132,15 +149,19 @@ func (*Response) Descriptor() ([]byte, []int) { func (m *Response) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Response.Unmarshal(m, b) } + func (m *Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Response.Marshal(b, m, deterministic) } + func (m *Response) XXX_Merge(src proto.Message) { xxx_messageInfo_Response.Merge(m, src) } + func (m *Response) XXX_Size() int { return xxx_messageInfo_Response.Size(m) } + func (m *Response) XXX_DiscardUnknown() { xxx_messageInfo_Response.DiscardUnknown(m) } @@ -201,15 +222,19 @@ func (*ProposalResponsePayload) Descriptor() ([]byte, []int) { func (m *ProposalResponsePayload) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProposalResponsePayload.Unmarshal(m, b) } + func (m *ProposalResponsePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProposalResponsePayload.Marshal(b, m, deterministic) } + func (m *ProposalResponsePayload) XXX_Merge(src proto.Message) { xxx_messageInfo_ProposalResponsePayload.Merge(m, src) } + func (m *ProposalResponsePayload) XXX_Size() int { return xxx_messageInfo_ProposalResponsePayload.Size(m) } + func (m *ProposalResponsePayload) XXX_DiscardUnknown() { xxx_messageInfo_ProposalResponsePayload.DiscardUnknown(m) } @@ -260,15 +285,19 @@ func (*Endorsement) Descriptor() ([]byte, []int) { func (m *Endorsement) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Endorsement.Unmarshal(m, b) } + func (m *Endorsement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Endorsement.Marshal(b, m, deterministic) } + func (m *Endorsement) XXX_Merge(src proto.Message) { xxx_messageInfo_Endorsement.Merge(m, src) } + func (m *Endorsement) XXX_Size() int { return xxx_messageInfo_Endorsement.Size(m) } + func (m *Endorsement) XXX_DiscardUnknown() { xxx_messageInfo_Endorsement.DiscardUnknown(m) } @@ -289,39 +318,178 @@ func (m *Endorsement) GetSignature() []byte { return nil } +// ChaincodeInterest defines an interest about an endorsement +// for a specific single chaincode invocation. +// Multiple chaincodes indicate chaincode to chaincode invocations. +type ChaincodeInterest struct { + Chaincodes []*ChaincodeCall `protobuf:"bytes,1,rep,name=chaincodes,proto3" json:"chaincodes,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ChaincodeInterest) Reset() { *m = ChaincodeInterest{} } +func (m *ChaincodeInterest) String() string { return proto.CompactTextString(m) } +func (*ChaincodeInterest) ProtoMessage() {} +func (*ChaincodeInterest) Descriptor() ([]byte, []int) { + return fileDescriptor_2ed51030656d961a, []int{4} +} + +func (m *ChaincodeInterest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ChaincodeInterest.Unmarshal(m, b) +} + +func (m *ChaincodeInterest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ChaincodeInterest.Marshal(b, m, deterministic) +} + +func (m *ChaincodeInterest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ChaincodeInterest.Merge(m, src) +} + +func (m *ChaincodeInterest) XXX_Size() int { + return xxx_messageInfo_ChaincodeInterest.Size(m) +} + +func (m *ChaincodeInterest) XXX_DiscardUnknown() { + xxx_messageInfo_ChaincodeInterest.DiscardUnknown(m) +} + +var xxx_messageInfo_ChaincodeInterest proto.InternalMessageInfo + +func (m *ChaincodeInterest) GetChaincodes() []*ChaincodeCall { + if m != nil { + return m.Chaincodes + } + return nil +} + +// ChaincodeCall defines a call to a chaincode. +// It may have collections that are related to the chaincode +type ChaincodeCall struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + CollectionNames []string `protobuf:"bytes,2,rep,name=collection_names,json=collectionNames,proto3" json:"collection_names,omitempty"` + NoPrivateReads bool `protobuf:"varint,3,opt,name=no_private_reads,json=noPrivateReads,proto3" json:"no_private_reads,omitempty"` + NoPublicWrites bool `protobuf:"varint,4,opt,name=no_public_writes,json=noPublicWrites,proto3" json:"no_public_writes,omitempty"` + // The set of signature policies associated with states in the write-set + // that have state-based endorsement policies. + KeyPolicies []*common.SignaturePolicyEnvelope `protobuf:"bytes,5,rep,name=key_policies,json=keyPolicies,proto3" json:"key_policies,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ChaincodeCall) Reset() { *m = ChaincodeCall{} } +func (m *ChaincodeCall) String() string { return proto.CompactTextString(m) } +func (*ChaincodeCall) ProtoMessage() {} +func (*ChaincodeCall) Descriptor() ([]byte, []int) { + return fileDescriptor_2ed51030656d961a, []int{5} +} + +func (m *ChaincodeCall) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ChaincodeCall.Unmarshal(m, b) +} + +func (m *ChaincodeCall) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ChaincodeCall.Marshal(b, m, deterministic) +} + +func (m *ChaincodeCall) XXX_Merge(src proto.Message) { + xxx_messageInfo_ChaincodeCall.Merge(m, src) +} + +func (m *ChaincodeCall) XXX_Size() int { + return xxx_messageInfo_ChaincodeCall.Size(m) +} + +func (m *ChaincodeCall) XXX_DiscardUnknown() { + xxx_messageInfo_ChaincodeCall.DiscardUnknown(m) +} + +var xxx_messageInfo_ChaincodeCall proto.InternalMessageInfo + +func (m *ChaincodeCall) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *ChaincodeCall) GetCollectionNames() []string { + if m != nil { + return m.CollectionNames + } + return nil +} + +func (m *ChaincodeCall) GetNoPrivateReads() bool { + if m != nil { + return m.NoPrivateReads + } + return false +} + +func (m *ChaincodeCall) GetNoPublicWrites() bool { + if m != nil { + return m.NoPublicWrites + } + return false +} + +func (m *ChaincodeCall) GetKeyPolicies() []*common.SignaturePolicyEnvelope { + if m != nil { + return m.KeyPolicies + } + return nil +} + func init() { proto.RegisterType((*ProposalResponse)(nil), "protos.ProposalResponse") proto.RegisterType((*Response)(nil), "protos.Response") proto.RegisterType((*ProposalResponsePayload)(nil), "protos.ProposalResponsePayload") proto.RegisterType((*Endorsement)(nil), "protos.Endorsement") + proto.RegisterType((*ChaincodeInterest)(nil), "protos.ChaincodeInterest") + proto.RegisterType((*ChaincodeCall)(nil), "protos.ChaincodeCall") } func init() { proto.RegisterFile("peer/proposal_response.proto", fileDescriptor_2ed51030656d961a) } var fileDescriptor_2ed51030656d961a = []byte{ - // 371 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x41, 0x6b, 0xe3, 0x30, - 0x10, 0x85, 0x71, 0x76, 0x93, 0x4d, 0x94, 0x2c, 0x04, 0x2f, 0xec, 0x9a, 0x10, 0xd8, 0xe0, 0x5e, - 0x72, 0x48, 0x64, 0x68, 0x29, 0xf4, 0x1c, 0x28, 0xed, 0x31, 0x88, 0xd2, 0x43, 0x29, 0x14, 0x39, - 0x99, 0xc8, 0x26, 0xb6, 0x25, 0x34, 0x72, 0x69, 0x7e, 0x70, 0xff, 0x47, 0xb1, 0x6c, 0x39, 0x6e, - 0xe9, 0xc9, 0xbc, 0xf1, 0xd3, 0x37, 0xf3, 0x46, 0x22, 0x73, 0x05, 0xa0, 0x23, 0xa5, 0xa5, 0x92, - 0xc8, 0xb3, 0x17, 0x0d, 0xa8, 0x64, 0x81, 0x40, 0x95, 0x96, 0x46, 0xfa, 0x03, 0xfb, 0xc1, 0xd9, - 0x7f, 0x21, 0xa5, 0xc8, 0x20, 0xb2, 0x32, 0x2e, 0x0f, 0x91, 0x49, 0x73, 0x40, 0xc3, 0x73, 0x55, - 0x1b, 0xc3, 0x77, 0x8f, 0x4c, 0xb7, 0x0d, 0x84, 0x35, 0x0c, 0x3f, 0x20, 0xbf, 0x5e, 0x41, 0x63, - 0x2a, 0x8b, 0xc0, 0x5b, 0x78, 0xcb, 0x3e, 0x73, 0xd2, 0xbf, 0x21, 0xa3, 0x96, 0x10, 0xf4, 0x16, - 0xde, 0x72, 0x7c, 0x39, 0xa3, 0x75, 0x0f, 0xea, 0x7a, 0xd0, 0x07, 0xe7, 0x60, 0x67, 0xb3, 0xbf, - 0x22, 0x43, 0x37, 0x63, 0xf0, 0xd3, 0x1e, 0x9c, 0xd6, 0x27, 0x90, 0xba, 0xbe, 0xac, 0x75, 0x54, - 0x13, 0x28, 0x7e, 0xca, 0x24, 0xdf, 0x07, 0xfd, 0x85, 0xb7, 0x9c, 0x30, 0x27, 0xfd, 0x6b, 0x32, - 0x86, 0x62, 0x2f, 0x35, 0x42, 0x0e, 0x85, 0x09, 0x06, 0x16, 0xf5, 0xc7, 0xa1, 0x6e, 0xcf, 0xbf, - 0x58, 0xd7, 0x17, 0x3e, 0x92, 0x61, 0x1b, 0xef, 0x2f, 0x19, 0xa0, 0xe1, 0xa6, 0xc4, 0x26, 0x5d, - 0xa3, 0xaa, 0xa6, 0x39, 0x20, 0x72, 0x01, 0x36, 0xda, 0x88, 0x39, 0xd9, 0x1d, 0xe7, 0xc7, 0xa7, - 0x71, 0xc2, 0x67, 0xf2, 0xef, 0xeb, 0xfa, 0xb6, 0xcd, 0xa4, 0x17, 0xe4, 0x77, 0x7b, 0x3d, 0x09, - 0xc7, 0xc4, 0x76, 0x9b, 0xb0, 0x89, 0x2b, 0xde, 0x73, 0x4c, 0xfc, 0x39, 0x19, 0xc1, 0x9b, 0x81, - 0xc2, 0x2e, 0xbb, 0x67, 0x0d, 0xe7, 0x42, 0x78, 0x47, 0xc6, 0x9d, 0x44, 0xfe, 0x8c, 0x0c, 0x9b, - 0x4c, 0xba, 0x81, 0xb5, 0xba, 0x02, 0x61, 0x2a, 0x0a, 0x6e, 0x4a, 0x0d, 0x0e, 0xd4, 0x16, 0x36, - 0x47, 0x12, 0x4a, 0x2d, 0x68, 0x72, 0x52, 0xa0, 0x33, 0xd8, 0x0b, 0xd0, 0xf4, 0xc0, 0x63, 0x9d, - 0xee, 0xdc, 0xe2, 0xaa, 0xd7, 0xb4, 0xf9, 0x26, 0xca, 0xee, 0xc8, 0x05, 0x3c, 0xad, 0x44, 0x6a, - 0x92, 0x32, 0xa6, 0x3b, 0x99, 0x47, 0x1d, 0x46, 0x54, 0x33, 0xd6, 0x35, 0x63, 0x2d, 0x64, 0x54, - 0x61, 0xe2, 0xfa, 0xf1, 0x5d, 0x7d, 0x04, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xd6, 0x97, 0x69, 0xa3, - 0x02, 0x00, 0x00, + // 563 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xdd, 0x6a, 0xdb, 0x4c, + 0x10, 0xc5, 0x4e, 0xe2, 0xd8, 0x63, 0xe7, 0xfb, 0xdc, 0x2d, 0x69, 0x55, 0x13, 0x88, 0x51, 0x6f, + 0x54, 0x48, 0x24, 0x48, 0x31, 0xf4, 0xda, 0x21, 0xf4, 0xe7, 0xa2, 0x98, 0x6d, 0x69, 0xa1, 0x14, + 0xc4, 0x5a, 0x9e, 0x48, 0x8b, 0xa5, 0x5d, 0xb1, 0xbb, 0x76, 0xeb, 0x77, 0xe9, 0xf3, 0xf5, 0x39, + 0x8a, 0x56, 0x5a, 0xd9, 0x69, 0x7a, 0x65, 0xcf, 0xd9, 0x33, 0x67, 0x66, 0xce, 0x68, 0xe0, 0xa2, + 0x44, 0x54, 0x51, 0xa9, 0x64, 0x29, 0x35, 0xcb, 0x63, 0x85, 0xba, 0x94, 0x42, 0x63, 0x58, 0x2a, + 0x69, 0x24, 0xe9, 0xd9, 0x1f, 0x3d, 0xb9, 0x4c, 0xa5, 0x4c, 0x73, 0x8c, 0x6c, 0xb8, 0xdc, 0xdc, + 0x47, 0x86, 0x17, 0xa8, 0x0d, 0x2b, 0xca, 0x9a, 0x38, 0x39, 0x4f, 0x64, 0x51, 0x48, 0x11, 0x95, + 0x32, 0xe7, 0x09, 0x47, 0x5d, 0xc3, 0xfe, 0xaf, 0x2e, 0x8c, 0x17, 0x8d, 0x36, 0x6d, 0xa4, 0x89, + 0x07, 0xa7, 0x5b, 0x54, 0x9a, 0x4b, 0xe1, 0x75, 0xa6, 0x9d, 0xe0, 0x84, 0xba, 0x90, 0xbc, 0x81, + 0x41, 0x2b, 0xec, 0x75, 0xa7, 0x9d, 0x60, 0x78, 0x33, 0x09, 0xeb, 0xd2, 0xa1, 0x2b, 0x1d, 0x7e, + 0x76, 0x0c, 0xba, 0x27, 0x93, 0x2b, 0xe8, 0xbb, 0xd6, 0xbd, 0x63, 0x9b, 0x38, 0xae, 0x33, 0x74, + 0xe8, 0xea, 0xd2, 0x96, 0x51, 0x75, 0x50, 0xb2, 0x5d, 0x2e, 0xd9, 0xca, 0x3b, 0x99, 0x76, 0x82, + 0x11, 0x75, 0x21, 0x99, 0xc1, 0x10, 0xc5, 0x4a, 0x2a, 0x8d, 0x05, 0x0a, 0xe3, 0xf5, 0xac, 0xd4, + 0x53, 0x27, 0x75, 0xb7, 0x7f, 0xa2, 0x87, 0x3c, 0x32, 0x83, 0x3e, 0x17, 0x06, 0x15, 0x6a, 0xe3, + 0x9d, 0xda, 0x9c, 0x17, 0x2e, 0xe7, 0x36, 0x63, 0x5c, 0x24, 0x72, 0x85, 0xef, 0x1b, 0x02, 0x6d, + 0xa9, 0xfe, 0x17, 0xe8, 0xb7, 0xae, 0x3c, 0x83, 0x9e, 0x36, 0xcc, 0x6c, 0x74, 0x63, 0x4a, 0x13, + 0x55, 0xbd, 0x16, 0xa8, 0x35, 0x4b, 0xd1, 0x3a, 0x32, 0xa0, 0x2e, 0x3c, 0x9c, 0xe2, 0xe8, 0xc1, + 0x14, 0xfe, 0x77, 0x78, 0xfe, 0xb7, 0xeb, 0x8b, 0x66, 0xc0, 0x97, 0x70, 0xd6, 0x2e, 0x3b, 0x63, + 0x3a, 0xb3, 0xd5, 0x46, 0x74, 0xe4, 0xc0, 0x77, 0x4c, 0x67, 0xe4, 0x02, 0x06, 0xf8, 0xd3, 0xa0, + 0xb0, 0x3b, 0xea, 0x5a, 0xc2, 0x1e, 0xf0, 0xdf, 0xc2, 0xf0, 0xc0, 0x08, 0x32, 0x81, 0x7e, 0x63, + 0x85, 0x6a, 0xc4, 0xda, 0xb8, 0x12, 0xd2, 0x3c, 0x15, 0xcc, 0x6c, 0x14, 0x3a, 0xa1, 0x16, 0xf0, + 0x3f, 0xc0, 0x93, 0x47, 0xee, 0x90, 0x19, 0x40, 0xe2, 0xc0, 0xca, 0x8b, 0xa3, 0x60, 0x78, 0x73, + 0xfe, 0xc8, 0xcc, 0x5b, 0x96, 0xe7, 0xf4, 0x80, 0xe8, 0xff, 0xee, 0xc0, 0xd9, 0x83, 0x57, 0x42, + 0xe0, 0x58, 0xb0, 0x02, 0x6d, 0x4f, 0x03, 0x6a, 0xff, 0x93, 0x57, 0x30, 0x4e, 0x64, 0x9e, 0x63, + 0x62, 0xb8, 0x14, 0x71, 0x05, 0x69, 0xaf, 0x3b, 0x3d, 0x0a, 0x06, 0xf4, 0xff, 0x3d, 0xfe, 0xb1, + 0x82, 0x49, 0x00, 0x63, 0x21, 0xe3, 0x52, 0xf1, 0x2d, 0x33, 0x18, 0x2b, 0x64, 0x2b, 0x6d, 0x6d, + 0xee, 0xd3, 0xff, 0x84, 0x5c, 0xd4, 0x30, 0xad, 0x50, 0xc7, 0xdc, 0x2c, 0x73, 0x9e, 0xc4, 0x3f, + 0x14, 0x37, 0xa8, 0xed, 0x37, 0x58, 0x33, 0x2d, 0xfc, 0xd5, 0xa2, 0x64, 0x0e, 0xa3, 0x35, 0xee, + 0x62, 0x77, 0x24, 0xde, 0x89, 0x9d, 0xee, 0x32, 0xac, 0x8f, 0x27, 0xfc, 0xe4, 0x9c, 0x59, 0x54, + 0x84, 0xdd, 0x9d, 0xd8, 0x62, 0x2e, 0x4b, 0xa4, 0xc3, 0x35, 0xee, 0x16, 0x4d, 0xce, 0x7c, 0x0d, + 0xbe, 0x54, 0x69, 0x98, 0xed, 0x4a, 0x54, 0x39, 0xae, 0x52, 0x54, 0xe1, 0x3d, 0x5b, 0x2a, 0x9e, + 0x38, 0x8f, 0xaa, 0x83, 0x9e, 0xff, 0x63, 0xff, 0xc9, 0x9a, 0xa5, 0xf8, 0xed, 0x2a, 0xe5, 0x26, + 0xdb, 0x2c, 0xab, 0x92, 0xd1, 0x81, 0x46, 0x54, 0x6b, 0x5c, 0xd7, 0x1a, 0xd7, 0xa9, 0x8c, 0x2a, + 0x99, 0x65, 0x7d, 0xff, 0xaf, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xd1, 0xa0, 0x61, 0x26, + 0x04, 0x00, 0x00, } diff --git a/vendor/modules.txt b/vendor/modules.txt index 9325a99ab50..d38eef62256 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -195,7 +195,7 @@ github.com/hyperledger/fabric-config/protolator/protoext/peerext # github.com/hyperledger/fabric-lib-go v1.0.0 ## explicit github.com/hyperledger/fabric-lib-go/healthz -# github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31 +# github.com/hyperledger/fabric-protos-go v0.0.0-20210717172449-368ac8b7bc5b ## explicit github.com/hyperledger/fabric-protos-go/common github.com/hyperledger/fabric-protos-go/discovery