Skip to content

Commit 053980b

Browse files
author
Jason Yellick
committed
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 <[email protected]>
1 parent f1a3675 commit 053980b

File tree

13 files changed

+8
-8
lines changed

13 files changed

+8
-8
lines changed
File renamed without changes.

orderer/bootstrap/static/static.go orderer/common/bootstrap/static/static.go

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

1919
import (
2020
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
21-
"github.com/hyperledger/fabric/orderer/bootstrap"
21+
"github.com/hyperledger/fabric/orderer/common/bootstrap"
2222
)
2323

2424
type bootstrapper struct{}
File renamed without changes.
File renamed without changes.
File renamed without changes.

orderer/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"os/signal"
2727

2828
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
29-
"github.com/hyperledger/fabric/orderer/bootstrap"
30-
"github.com/hyperledger/fabric/orderer/bootstrap/static"
29+
"github.com/hyperledger/fabric/orderer/common/bootstrap"
30+
"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
3131
"github.com/hyperledger/fabric/orderer/config"
3232
"github.com/hyperledger/fabric/orderer/kafka"
3333
"github.com/hyperledger/fabric/orderer/rawledger"

orderer/rawledger/fileledger/fileledger_test.go

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

2525
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
26-
"github.com/hyperledger/fabric/orderer/bootstrap/static"
26+
"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
2727
)
2828

2929
var genesisBlock *ab.Block

orderer/rawledger/fileledger_test.go

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

2323
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
24-
"github.com/hyperledger/fabric/orderer/bootstrap/static"
24+
"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
2525
. "github.com/hyperledger/fabric/orderer/rawledger"
2626
"github.com/hyperledger/fabric/orderer/rawledger/fileledger"
2727
)

orderer/rawledger/ramledger/ramledger_test.go

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

2222
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
23-
"github.com/hyperledger/fabric/orderer/bootstrap/static"
23+
"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
2424
)
2525

2626
var genesisBlock *ab.Block

orderer/solo/broadcast.go

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

2222
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
23-
"github.com/hyperledger/fabric/orderer/broadcastfilter"
23+
"github.com/hyperledger/fabric/orderer/common/broadcastfilter"
2424
"github.com/hyperledger/fabric/orderer/rawledger"
2525
)
2626

orderer/solo/broadcast_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"google.golang.org/grpc"
2525

2626
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
27-
"github.com/hyperledger/fabric/orderer/bootstrap/static"
27+
"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
2828
"github.com/hyperledger/fabric/orderer/rawledger"
2929
"github.com/hyperledger/fabric/orderer/rawledger/ramledger"
3030
)

0 commit comments

Comments
 (0)