Move orderer common components to common dir

As the complexity in the orderer grows, there is an increasing need to add new component directories, which do not actually correspond to different ordering services. This can be seen with the bootstrap, cauthdsl, and broadcastfilter directories, and more are on the way. This changeset simply creates a new common directory, and moves the common components there. It also makes trivial updates to import paths, but otherwise introduces no new features, so does not require new tests. https://jira.hyperledger.org/browse/FAB-706 Change-Id: I61e803aa4454926b4ad26610680eb543554346b8 Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
hyperledger · Oct 24, 2016 · 053980b · 053980b
1 parent f1a3675
commit 053980b
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 8 deletions.
diff --git a/orderer/bootstrap/bootstrap.go → orderer/common/bootstrap/bootstrap.go b/orderer/bootstrap/bootstrap.go → orderer/common/bootstrap/bootstrap.go
diff --git a/orderer/bootstrap/static/static.go → orderer/common/bootstrap/static/static.go b/orderer/bootstrap/static/static.go → orderer/common/bootstrap/static/static.go
@@ -18,7 +18,7 @@ package static
 
 import (
 	ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
-	"github.com/hyperledger/fabric/orderer/bootstrap"
+	"github.com/hyperledger/fabric/orderer/common/bootstrap"
 )
 
 type bootstrapper struct{}

diff --git a/orderer/broadcastfilter/filter.go → orderer/common/broadcastfilter/filter.go b/orderer/broadcastfilter/filter.go → orderer/common/broadcastfilter/filter.go
diff --git a/orderer/broadcastfilter/filter_test.go → ...rer/common/broadcastfilter/filter_test.go b/orderer/broadcastfilter/filter_test.go → ...rer/common/broadcastfilter/filter_test.go
diff --git a/orderer/cauthdsl/cauthdsl.go → orderer/common/cauthdsl/cauthdsl.go b/orderer/cauthdsl/cauthdsl.go → orderer/common/cauthdsl/cauthdsl.go
diff --git a/orderer/cauthdsl/cauthdsl_builder.go → orderer/common/cauthdsl/cauthdsl_builder.go b/orderer/cauthdsl/cauthdsl_builder.go → orderer/common/cauthdsl/cauthdsl_builder.go
diff --git a/orderer/cauthdsl/cauthdsl_test.go → orderer/common/cauthdsl/cauthdsl_test.go b/orderer/cauthdsl/cauthdsl_test.go → orderer/common/cauthdsl/cauthdsl_test.go
diff --git a/orderer/main.go b/orderer/main.go
@@ -26,8 +26,8 @@ import (
 	"os/signal"
 
 	ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
-	"github.com/hyperledger/fabric/orderer/bootstrap"
-	"github.com/hyperledger/fabric/orderer/bootstrap/static"
+	"github.com/hyperledger/fabric/orderer/common/bootstrap"
+	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
 	"github.com/hyperledger/fabric/orderer/config"
 	"github.com/hyperledger/fabric/orderer/kafka"
 	"github.com/hyperledger/fabric/orderer/rawledger"

diff --git a/orderer/rawledger/fileledger/fileledger_test.go b/orderer/rawledger/fileledger/fileledger_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
-	"github.com/hyperledger/fabric/orderer/bootstrap/static"
+	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
 )
 
 var genesisBlock *ab.Block

diff --git a/orderer/rawledger/fileledger_test.go b/orderer/rawledger/fileledger_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
-	"github.com/hyperledger/fabric/orderer/bootstrap/static"
+	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
 	. "github.com/hyperledger/fabric/orderer/rawledger"
 	"github.com/hyperledger/fabric/orderer/rawledger/fileledger"
 )

diff --git a/orderer/rawledger/ramledger/ramledger_test.go b/orderer/rawledger/ramledger/ramledger_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
-	"github.com/hyperledger/fabric/orderer/bootstrap/static"
+	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
 )
 
 var genesisBlock *ab.Block

diff --git a/orderer/solo/broadcast.go b/orderer/solo/broadcast.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
-	"github.com/hyperledger/fabric/orderer/broadcastfilter"
+	"github.com/hyperledger/fabric/orderer/common/broadcastfilter"
 	"github.com/hyperledger/fabric/orderer/rawledger"
 )
 

diff --git a/orderer/solo/broadcast_test.go b/orderer/solo/broadcast_test.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc"
 
 	ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
-	"github.com/hyperledger/fabric/orderer/bootstrap/static"
+	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
 	"github.com/hyperledger/fabric/orderer/rawledger"
 	"github.com/hyperledger/fabric/orderer/rawledger/ramledger"
 )