Skip to content

Commit 07d16c9

Browse files
yacovmyacovm
committed
Fix gossip protos go_package directive
When https://gerrit.hyperledger.org/r/#/c/5543/ written, I didn't update the go_package in the proto file, and as a consequence- the files are outputted into the old path instead of the new one when make protos is run. This commit fixes it. Change-Id: Ia0e904baace29b41ac3f9f3998420d7f09228db5 Signed-off-by: Yacov Manevich <[email protected]>
1 parent e855f8e commit 07d16c9

31 files changed

+282
-282
lines changed

‎gossip/comm/comm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121

2222
"github.com/hyperledger/fabric/gossip/common"
23-
"github.com/hyperledger/fabric/protos/gossip"
23+
proto "github.com/hyperledger/fabric/protos/gossip"
2424
)
2525

2626
// Comm is an object that enables to communicate with other peers

‎gossip/comm/comm_impl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/hyperledger/fabric/gossip/common"
3232
"github.com/hyperledger/fabric/gossip/identity"
3333
"github.com/hyperledger/fabric/gossip/util"
34-
"github.com/hyperledger/fabric/protos/gossip"
34+
proto "github.com/hyperledger/fabric/protos/gossip"
3535
"github.com/op/go-logging"
3636
"golang.org/x/net/context"
3737
"google.golang.org/grpc"

‎gossip/comm/comm_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/hyperledger/fabric/gossip/api"
3030
"github.com/hyperledger/fabric/gossip/common"
3131
"github.com/hyperledger/fabric/gossip/identity"
32-
"github.com/hyperledger/fabric/protos/gossip"
32+
proto "github.com/hyperledger/fabric/protos/gossip"
3333
"github.com/stretchr/testify/assert"
3434
"golang.org/x/net/context"
3535
"google.golang.org/grpc"

‎gossip/comm/conn.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sync/atomic"
2323

2424
"github.com/hyperledger/fabric/gossip/common"
25-
"github.com/hyperledger/fabric/protos/gossip"
25+
proto "github.com/hyperledger/fabric/protos/gossip"
2626
"github.com/op/go-logging"
2727
"google.golang.org/grpc"
2828
)

‎gossip/comm/crypto_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"testing"
2626
"time"
2727

28-
"github.com/hyperledger/fabric/protos/gossip"
28+
proto "github.com/hyperledger/fabric/protos/gossip"
2929
"github.com/stretchr/testify/assert"
3030
"golang.org/x/net/context"
3131
"google.golang.org/grpc"

‎gossip/comm/mock/mock_comm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/hyperledger/fabric/gossip/comm"
2121
"github.com/hyperledger/fabric/gossip/common"
2222
"github.com/hyperledger/fabric/gossip/util"
23-
"github.com/hyperledger/fabric/protos/gossip"
23+
proto "github.com/hyperledger/fabric/protos/gossip"
2424
)
2525

2626
// Mock which aims to simulate socket

‎gossip/comm/mock/mock_comm_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/hyperledger/fabric/gossip/comm"
2323
"github.com/hyperledger/fabric/gossip/common"
24-
"github.com/hyperledger/fabric/protos/gossip"
24+
proto "github.com/hyperledger/fabric/protos/gossip"
2525
"github.com/stretchr/testify/assert"
2626
)
2727

‎gossip/comm/msg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"sync"
2121

2222
"github.com/hyperledger/fabric/gossip/common"
23-
"github.com/hyperledger/fabric/protos/gossip"
23+
proto "github.com/hyperledger/fabric/protos/gossip"
2424
)
2525

2626
// ReceivedMessageImpl is an implementation of ReceivedMessage

‎gossip/discovery/discovery.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package discovery
1818

1919
import (
2020
"github.com/hyperledger/fabric/gossip/common"
21-
"github.com/hyperledger/fabric/protos/gossip"
21+
proto "github.com/hyperledger/fabric/protos/gossip"
2222
)
2323

2424
// CryptoService is an interface that the discovery expects to be implemented and passed on creation

‎gossip/discovery/discovery_impl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/hyperledger/fabric/gossip/common"
2727
"github.com/hyperledger/fabric/gossip/util"
28-
"github.com/hyperledger/fabric/protos/gossip"
28+
proto "github.com/hyperledger/fabric/protos/gossip"
2929
"github.com/op/go-logging"
3030
)
3131

‎gossip/discovery/discovery_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"time"
2727

2828
"github.com/hyperledger/fabric/gossip/common"
29-
"github.com/hyperledger/fabric/protos/gossip"
29+
proto "github.com/hyperledger/fabric/protos/gossip"
3030
"github.com/stretchr/testify/assert"
3131
"golang.org/x/net/context"
3232
"google.golang.org/grpc"

‎gossip/election/adapter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/hyperledger/fabric/gossip/comm"
2727
"github.com/hyperledger/fabric/gossip/common"
2828
"github.com/hyperledger/fabric/gossip/discovery"
29-
"github.com/hyperledger/fabric/protos/gossip"
29+
proto "github.com/hyperledger/fabric/protos/gossip"
3030
"github.com/op/go-logging"
3131
)
3232

‎gossip/election/adapter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/hyperledger/fabric/gossip/comm"
2828
"github.com/hyperledger/fabric/gossip/common"
2929
"github.com/hyperledger/fabric/gossip/discovery"
30-
"github.com/hyperledger/fabric/protos/gossip"
30+
proto "github.com/hyperledger/fabric/protos/gossip"
3131
)
3232

3333
func TestNewAdapter(t *testing.T) {

‎gossip/gossip/certstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/hyperledger/fabric/gossip/gossip/pull"
2828
"github.com/hyperledger/fabric/gossip/identity"
2929
"github.com/hyperledger/fabric/gossip/util"
30-
"github.com/hyperledger/fabric/protos/gossip"
30+
proto "github.com/hyperledger/fabric/protos/gossip"
3131
"github.com/op/go-logging"
3232
)
3333

‎gossip/gossip/certstore_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/hyperledger/fabric/gossip/gossip/algo"
2929
"github.com/hyperledger/fabric/gossip/gossip/pull"
3030
"github.com/hyperledger/fabric/gossip/identity"
31-
"github.com/hyperledger/fabric/protos/gossip"
31+
proto "github.com/hyperledger/fabric/protos/gossip"
3232
"github.com/stretchr/testify/assert"
3333
"github.com/stretchr/testify/mock"
3434
)

‎gossip/gossip/channel/channel.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/hyperledger/fabric/gossip/gossip/msgstore"
3232
"github.com/hyperledger/fabric/gossip/gossip/pull"
3333
"github.com/hyperledger/fabric/gossip/util"
34-
"github.com/hyperledger/fabric/protos/gossip"
34+
proto "github.com/hyperledger/fabric/protos/gossip"
3535
"github.com/op/go-logging"
3636
)
3737

‎gossip/gossip/channel/channel_test.go

+19-19
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/hyperledger/fabric/gossip/common"
3030
"github.com/hyperledger/fabric/gossip/discovery"
3131
"github.com/hyperledger/fabric/gossip/gossip/algo"
32-
"github.com/hyperledger/fabric/protos/gossip"
32+
proto "github.com/hyperledger/fabric/protos/gossip"
3333
"github.com/stretchr/testify/assert"
3434
"github.com/stretchr/testify/mock"
3535
)
@@ -211,8 +211,8 @@ func TestChannelPeriodicalPublishStateInfo(t *testing.T) {
211211

212212
adapter := new(gossipAdapterMock)
213213
configureAdapter(adapter)
214-
adapter.On("Send", mock.AnythingOfType("*proto.GossipMessage"), mock.Anything)
215-
adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
214+
adapter.On("Send", mock.AnythingOfType("*gossip.GossipMessage"), mock.Anything)
215+
adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
216216
if atomic.LoadInt32(&receivedMsg) == int32(1) {
217217
return
218218
}
@@ -246,8 +246,8 @@ func TestChannelPull(t *testing.T) {
246246
receivedBlocksChan := make(chan *proto.GossipMessage)
247247
adapter := new(gossipAdapterMock)
248248
configureAdapter(adapter, discovery.NetworkMember{PKIid: pkiIDInOrg1})
249-
adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
250-
adapter.On("DeMultiplex", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
249+
adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
250+
adapter.On("DeMultiplex", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
251251
msg := arg.Get(0).(*proto.GossipMessage)
252252
if !msg.IsDataMsg() {
253253
return
@@ -261,7 +261,7 @@ func TestChannelPull(t *testing.T) {
261261

262262
var wg sync.WaitGroup
263263
pullPhase := simulatePullPhase(gc, t, &wg, func(*proto.GossipMessage) {})
264-
adapter.On("Send", mock.AnythingOfType("*proto.GossipMessage"), mock.Anything).Run(pullPhase)
264+
adapter.On("Send", mock.AnythingOfType("*gossip.GossipMessage"), mock.Anything).Run(pullPhase)
265265

266266
wg.Wait()
267267
for expectedSeq := 10; expectedSeq < 11; expectedSeq++ {
@@ -282,7 +282,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
282282
gossipMessagesSentFromChannel := make(chan *proto.GossipMessage, 1)
283283
adapter := new(gossipAdapterMock)
284284
configureAdapter(adapter)
285-
adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
285+
adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
286286
adapter.On("Send", mock.Anything, mock.Anything)
287287
adapter.On("DeMultiplex", mock.Anything)
288288
gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
@@ -306,7 +306,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
306306
}
307307
// First, ensure it does that for pull messages from peers that are in the channel
308308
helloMsg := createHelloMsg(pkiIDInOrg1)
309-
helloMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
309+
helloMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
310310
gc.HandleMessage(helloMsg)
311311
select {
312312
case <-gossipMessagesSentFromChannel:
@@ -315,7 +315,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
315315
}
316316
// And now for peers that are not in the channel (should not send back a message)
317317
helloMsg = createHelloMsg(pkiIDinOrg2)
318-
helloMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
318+
helloMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
319319
gc.HandleMessage(helloMsg)
320320
select {
321321
case <-gossipMessagesSentFromChannel:
@@ -329,7 +329,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
329329
msg: req,
330330
PKIID: pkiIDInOrg1,
331331
}
332-
validReceivedMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
332+
validReceivedMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
333333
gc.HandleMessage(validReceivedMsg)
334334
select {
335335
case <-gossipMessagesSentFromChannel:
@@ -342,7 +342,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
342342
msg: req,
343343
PKIID: pkiIDinOrg2,
344344
}
345-
invalidReceivedMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
345+
invalidReceivedMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
346346
gc.HandleMessage(invalidReceivedMsg)
347347
select {
348348
case <-gossipMessagesSentFromChannel:
@@ -357,7 +357,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
357357
msg: req2,
358358
PKIID: pkiIDInOrg1,
359359
}
360-
invalidReceivedMsg2.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
360+
invalidReceivedMsg2.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
361361
gc.HandleMessage(invalidReceivedMsg2)
362362
select {
363363
case <-gossipMessagesSentFromChannel:
@@ -374,7 +374,7 @@ func TestChannelIsInChannel(t *testing.T) {
374374
adapter := new(gossipAdapterMock)
375375
configureAdapter(adapter)
376376
gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
377-
adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
377+
adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
378378
adapter.On("Send", mock.Anything, mock.Anything)
379379
adapter.On("DeMultiplex", mock.Anything)
380380

@@ -393,7 +393,7 @@ func TestChannelIsSubscribed(t *testing.T) {
393393
adapter := new(gossipAdapterMock)
394394
configureAdapter(adapter)
395395
gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
396-
adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
396+
adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
397397
adapter.On("Send", mock.Anything, mock.Anything)
398398
adapter.On("DeMultiplex", mock.Anything)
399399
gc.HandleMessage(&receivedMsg{msg: createStateInfoMsg(10, pkiIDInOrg1, channelA), PKIID: pkiIDInOrg1})
@@ -411,7 +411,7 @@ func TestChannelAddToMessageStore(t *testing.T) {
411411
gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
412412
adapter.On("Gossip", mock.Anything)
413413
adapter.On("Send", mock.Anything, mock.Anything)
414-
adapter.On("DeMultiplex", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
414+
adapter.On("DeMultiplex", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
415415
demuxedMsgs <- arg.Get(0).(*proto.GossipMessage)
416416
})
417417

@@ -438,7 +438,7 @@ func TestChannelAddToMessageStore(t *testing.T) {
438438
gc.AddToMsgStore(createStateInfoMsg(10, pkiIDInOrg1, channelA))
439439
helloMsg := createHelloMsg(pkiIDInOrg1)
440440
respondedChan := make(chan struct{}, 1)
441-
helloMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
441+
helloMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
442442
respondedChan <- struct{}{}
443443
})
444444
gc.HandleMessage(helloMsg)
@@ -588,7 +588,7 @@ func TestChannelStateInfoSnapshot(t *testing.T) {
588588
adapter.On("Gossip", mock.Anything)
589589
sentMessages := make(chan *proto.GossipMessage, 10)
590590
adapter.On("Send", mock.Anything, mock.Anything)
591-
adapter.On("ValidateStateInfoMessage", mock.AnythingOfType("*proto.GossipMessage")).Return(nil)
591+
adapter.On("ValidateStateInfoMessage", mock.AnythingOfType("*gossip.GossipMessage")).Return(nil)
592592

593593
// Ensure we ignore stateInfo snapshots from peers not in the channel
594594
gc.HandleMessage(&receivedMsg{PKIID: pkiIDInOrg1, msg: stateInfoSnapshotForChannel(common.ChainID("B"), createStateInfoMsg(4, pkiIDInOrg1, channelA))})
@@ -728,7 +728,7 @@ func TestChannelReconfigureChannel(t *testing.T) {
728728
// Just call it again, to make sure stuff don't crash
729729
gc.ConfigureChannel(api.JoinChannelMessage(newJoinChanMsg))
730730

731-
adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
731+
adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
732732
adapter.On("Send", mock.Anything, mock.Anything)
733733
adapter.On("DeMultiplex", mock.Anything)
734734

@@ -760,7 +760,7 @@ func TestChannelReconfigureChannel(t *testing.T) {
760760
msg := arg.Get(0).(*proto.GossipMessage)
761761
gossipMessagesSentFromChannel <- msg
762762
}
763-
invalidReceivedMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
763+
invalidReceivedMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
764764
gc.HandleMessage(invalidReceivedMsg)
765765
select {
766766
case <-gossipMessagesSentFromChannel:

‎gossip/gossip/chanstate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/hyperledger/fabric/gossip/gossip/channel"
2929
"github.com/hyperledger/fabric/gossip/gossip/msgstore"
3030
"github.com/hyperledger/fabric/gossip/gossip/pull"
31-
"github.com/hyperledger/fabric/protos/gossip"
31+
proto "github.com/hyperledger/fabric/protos/gossip"
3232
"github.com/op/go-logging"
3333
)
3434

‎gossip/gossip/gossip.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/hyperledger/fabric/gossip/comm"
2626
"github.com/hyperledger/fabric/gossip/common"
2727
"github.com/hyperledger/fabric/gossip/discovery"
28-
"github.com/hyperledger/fabric/protos/gossip"
28+
proto "github.com/hyperledger/fabric/protos/gossip"
2929
)
3030

3131
// Gossip is the interface of the gossip component

‎gossip/gossip/gossip_impl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/hyperledger/fabric/gossip/gossip/pull"
3535
"github.com/hyperledger/fabric/gossip/identity"
3636
"github.com/hyperledger/fabric/gossip/util"
37-
"github.com/hyperledger/fabric/protos/gossip"
37+
proto "github.com/hyperledger/fabric/protos/gossip"
3838
"github.com/op/go-logging"
3939
"google.golang.org/grpc"
4040
)

‎gossip/gossip/gossip_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/hyperledger/fabric/gossip/discovery"
3333
"github.com/hyperledger/fabric/gossip/gossip/algo"
3434
"github.com/hyperledger/fabric/gossip/util"
35-
"github.com/hyperledger/fabric/protos/gossip"
35+
proto "github.com/hyperledger/fabric/protos/gossip"
3636
"github.com/stretchr/testify/assert"
3737
)
3838

‎gossip/gossip/pull/pullstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/hyperledger/fabric/gossip/discovery"
2626
"github.com/hyperledger/fabric/gossip/gossip/algo"
2727
"github.com/hyperledger/fabric/gossip/util"
28-
"github.com/hyperledger/fabric/protos/gossip"
28+
proto "github.com/hyperledger/fabric/protos/gossip"
2929
"github.com/op/go-logging"
3030
)
3131

‎gossip/gossip/pull/pullstore_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/hyperledger/fabric/gossip/discovery"
2828
"github.com/hyperledger/fabric/gossip/gossip/algo"
2929
"github.com/hyperledger/fabric/gossip/util"
30-
"github.com/hyperledger/fabric/protos/gossip"
30+
proto "github.com/hyperledger/fabric/protos/gossip"
3131
"github.com/stretchr/testify/assert"
3232
)
3333

‎gossip/service/gossip_service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/hyperledger/fabric/gossip/state"
3030
"github.com/hyperledger/fabric/gossip/util"
3131
"github.com/hyperledger/fabric/protos/common"
32-
"github.com/hyperledger/fabric/protos/gossip"
32+
proto "github.com/hyperledger/fabric/protos/gossip"
3333
"google.golang.org/grpc"
3434
)
3535

‎gossip/state/payloads_buffer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sync/atomic"
2424

2525
"github.com/hyperledger/fabric/gossip/util"
26-
"github.com/hyperledger/fabric/protos/gossip"
26+
proto "github.com/hyperledger/fabric/protos/gossip"
2727
"github.com/op/go-logging"
2828
)
2929

‎gossip/state/payloads_buffer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"testing"
2525
"time"
2626

27-
"github.com/hyperledger/fabric/protos/gossip"
27+
proto "github.com/hyperledger/fabric/protos/gossip"
2828
"github.com/stretchr/testify/assert"
2929
)
3030

‎gossip/state/state.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/hyperledger/fabric/gossip/gossip"
3131
"github.com/hyperledger/fabric/gossip/util"
3232
"github.com/hyperledger/fabric/protos/common"
33-
"github.com/hyperledger/fabric/protos/gossip"
33+
proto "github.com/hyperledger/fabric/protos/gossip"
3434
"github.com/op/go-logging"
3535
)
3636

‎gossip/state/state_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"github.com/hyperledger/fabric/gossip/gossip"
3737
gossipUtil "github.com/hyperledger/fabric/gossip/util"
3838
pcomm "github.com/hyperledger/fabric/protos/common"
39-
"github.com/hyperledger/fabric/protos/gossip"
39+
proto "github.com/hyperledger/fabric/protos/gossip"
4040
"github.com/spf13/viper"
4141
"github.com/stretchr/testify/assert"
4242
)

0 commit comments

Comments
 (0)