[FAB-2053] Move gossip proto under protos

yacovm · yacovm · commit 1d6d0e2ce39f · 2017-02-06T00:05:48.000+02:00
Currently the gossip proto files are under gossip/proto.
They need to be moved to be under protos.

Change-Id: Ifc70b3e2dbc859d520a452884a8fdb1d9c2291a3
Signed-off-by: Yacov Manevich &lt;yacovm@il.ibm.com&gt;
diff --git a/core/deliverservice/blocksprovider/blocksprovider.go b/core/deliverservice/blocksprovider/blocksprovider.go
@@ -24,8 +24,8 @@ import (
 	gossipcommon "github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
 
-	gossip_proto "github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/protos/common"
+	gossip_proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/op/go-logging"
diff --git a/core/deliverservice/mocks/blocksprovider.go b/core/deliverservice/mocks/blocksprovider.go
@@ -22,8 +22,8 @@ import (
 	"github.com/golang/protobuf/proto"
 	gossip_common "github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
-	gossip_proto "github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/protos/common"
+	gossip_proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric/protos/utils"
 )
diff --git a/gossip/comm/comm.go b/gossip/comm/comm.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 )
 
 // Comm is an object that enables to communicate with other peers
diff --git a/gossip/comm/comm_impl.go b/gossip/comm/comm_impl.go
@@ -30,8 +30,8 @@ import (
 	"github.com/hyperledger/fabric/gossip/api"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/identity"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/comm/comm_test.go b/gossip/comm/comm_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/api"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/identity"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/comm/conn.go b/gossip/comm/conn.go
@@ -22,7 +22,7 @@ import (
 	"sync/atomic"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 	"google.golang.org/grpc"
 )
diff --git a/gossip/comm/crypto_test.go b/gossip/comm/crypto_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/comm/mock/mock_comm.go b/gossip/comm/mock/mock_comm.go
@@ -19,8 +19,8 @@ package mock
 import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 )
 
 // Mock which aims to simulate socket
diff --git a/gossip/comm/mock/mock_comm_test.go b/gossip/comm/mock/mock_comm_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/comm/msg.go b/gossip/comm/msg.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 )
 
 // ReceivedMessageImpl is an implementation of ReceivedMessage
diff --git a/gossip/discovery/discovery.go b/gossip/discovery/discovery.go
@@ -18,7 +18,7 @@ package discovery
 
 import (
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 )
 
 // CryptoService is an interface that the discovery expects to be implemented and passed on creation
diff --git a/gossip/discovery/discovery_impl.go b/gossip/discovery/discovery_impl.go
@@ -24,8 +24,8 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/discovery/discovery_test.go b/gossip/discovery/discovery_test.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/election/adapter.go b/gossip/election/adapter.go
@@ -26,7 +26,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/election/adapter_test.go b/gossip/election/adapter_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 )
 
 func TestNewAdapter(t *testing.T) {
diff --git a/gossip/gossip/certstore.go b/gossip/gossip/certstore.go
@@ -26,8 +26,8 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
 	"github.com/hyperledger/fabric/gossip/identity"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/certstore_test.go b/gossip/gossip/certstore_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
 	"github.com/hyperledger/fabric/gossip/identity"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
diff --git a/gossip/gossip/channel/channel.go b/gossip/gossip/channel/channel.go
@@ -30,8 +30,8 @@ import (
 	"github.com/hyperledger/fabric/gossip/filter"
 	"github.com/hyperledger/fabric/gossip/gossip/msgstore"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/channel/channel_test.go b/gossip/gossip/channel/channel_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
diff --git a/gossip/gossip/chanstate.go b/gossip/gossip/chanstate.go
@@ -28,7 +28,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/channel"
 	"github.com/hyperledger/fabric/gossip/gossip/msgstore"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/gossip.go b/gossip/gossip/gossip.go
@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 )
 
 // Gossip is the interface of the gossip component
diff --git a/gossip/gossip/gossip_impl.go b/gossip/gossip/gossip_impl.go
@@ -33,8 +33,8 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/msgstore"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
 	"github.com/hyperledger/fabric/gossip/identity"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 	"google.golang.org/grpc"
 )
diff --git a/gossip/gossip/gossip_test.go b/gossip/gossip/gossip_test.go
@@ -31,8 +31,8 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/gossip/pull/pullstore.go b/gossip/gossip/pull/pullstore.go
@@ -24,8 +24,8 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/pull/pullstore_test.go b/gossip/gossip/pull/pullstore_test.go
@@ -26,8 +26,8 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/service/gossip_service.go b/gossip/service/gossip_service.go
@@ -26,10 +26,10 @@ import (
 	gossipCommon "github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/gossip"
 	"github.com/hyperledger/fabric/gossip/integration"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/state"
 	"github.com/hyperledger/fabric/gossip/util"
 	"github.com/hyperledger/fabric/protos/common"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"google.golang.org/grpc"
 )
 
diff --git a/gossip/state/payloads_buffer.go b/gossip/state/payloads_buffer.go
@@ -22,8 +22,8 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/state/payloads_buffer_test.go b/gossip/state/payloads_buffer_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/state/state.go b/gossip/state/state.go
@@ -28,9 +28,9 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	common2 "github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/gossip"
-	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
 	"github.com/hyperledger/fabric/protos/common"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/state/state_test.go b/gossip/state/state_test.go
@@ -34,9 +34,9 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/gossip"
-	"github.com/hyperledger/fabric/gossip/proto"
 	gossipUtil "github.com/hyperledger/fabric/gossip/util"
 	pcomm "github.com/hyperledger/fabric/protos/common"
+	"github.com/hyperledger/fabric/protos/gossip"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/protos/gossip/extensions.go b/protos/gossip/extensions.go
diff --git a/protos/gossip/message.pb.go b/protos/gossip/message.pb.go
diff --git a/protos/gossip/message.proto b/protos/gossip/message.proto

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"fmt"`
`21`	`21`
`22`	`22`	`"github.com/hyperledger/fabric/gossip/common"`
`23`		`- "github.com/hyperledger/fabric/gossip/proto"`
	`23`	`+ "github.com/hyperledger/fabric/protos/gossip"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// Comm is an object that enables to communicate with other peers`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"sync/atomic"`
`23`	`23`
`24`	`24`	`"github.com/hyperledger/fabric/gossip/common"`
`25`		`- "github.com/hyperledger/fabric/gossip/proto"`
	`25`	`+ "github.com/hyperledger/fabric/protos/gossip"`
`26`	`26`	`"github.com/op/go-logging"`
`27`	`27`	`"google.golang.org/grpc"`
`28`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ package mock`
`19`	`19`	`import (`
`20`	`20`	`"github.com/hyperledger/fabric/gossip/comm"`
`21`	`21`	`"github.com/hyperledger/fabric/gossip/common"`
`22`		`- "github.com/hyperledger/fabric/gossip/proto"`
`23`	`22`	`"github.com/hyperledger/fabric/gossip/util"`
	`23`	`+ "github.com/hyperledger/fabric/protos/gossip"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// Mock which aims to simulate socket`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`
`22`	`22`	`"github.com/hyperledger/fabric/gossip/comm"`
`23`	`23`	`"github.com/hyperledger/fabric/gossip/common"`
`24`		`- "github.com/hyperledger/fabric/gossip/proto"`
	`24`	`+ "github.com/hyperledger/fabric/protos/gossip"`
`25`	`25`	`"github.com/stretchr/testify/assert"`
`26`	`26`	`)`
`27`	`27`