Skip to content

Commit

Permalink
[FAB-2163] Move orderer provisional bootstrapper
Browse files Browse the repository at this point in the history 
https://jira.hyperledger.org/browse/FAB-2163

This CR moves the orderer provisional bootstrapper to the
common/configtx/tool directory to be used as the starting point for the
configtx/tool

Change-Id: I0bf349235255e7d49e4c7c2828dfd34e7e67aa57
Signed-off-by: Jason Yellick <[email protected]>
  • Loading branch information
Jason Yellick committed Feb 13, 2017
1 parent a061e6d commit a423726
Show file tree
Hide file tree
Showing 23 changed files with 21 additions and 21 deletions.
0 ...mmon/bootstrap/provisional/provisional.go → .../configtx/tool/provisional/provisional.go
View file
File renamed without changes.
0 ...bootstrap/provisional/provisional_test.go → ...igtx/tool/provisional/provisional_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion orderer/common/deliver/deliver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (

configtxapi "github.com/hyperledger/fabric/common/configtx/api"
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
mockconfigtxorderer "github.com/hyperledger/fabric/common/mocks/configtx/handlers/orderer"
mockpolicies "github.com/hyperledger/fabric/common/mocks/policies"
"github.com/hyperledger/fabric/common/policies"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
cb "github.com/hyperledger/fabric/protos/common"
Expand Down
2 changes: 1 addition & 1 deletion orderer/kafka/broker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

"github.com/Shopify/sarama"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
)

func TestBrokerGetOffset(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion orderer/kafka/chain_partition_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"
"testing"

"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
)

func TestChainPartition(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion orderer/kafka/consumer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package kafka
import (
"testing"

"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
ab "github.com/hyperledger/fabric/protos/orderer"
)

Expand Down
2 changes: 1 addition & 1 deletion orderer/kafka/orderer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"time"

"github.com/Shopify/sarama"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
mockconfigtxorderer "github.com/hyperledger/fabric/common/mocks/configtx/handlers/orderer"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/orderer/localconfig"
mockblockcutter "github.com/hyperledger/fabric/orderer/mocks/blockcutter"
mockmultichain "github.com/hyperledger/fabric/orderer/mocks/multichain"
Expand Down
2 changes: 1 addition & 1 deletion orderer/kafka/partitioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

"github.com/Shopify/sarama"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
)

func TestStaticPartitioner(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion orderer/kafka/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

"github.com/Shopify/sarama"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
"github.com/hyperledger/fabric/orderer/localconfig"
"github.com/hyperledger/fabric/orderer/mocks/util"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion orderer/ledger/file/fileledger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"

genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
cb "github.com/hyperledger/fabric/protos/common"
ab "github.com/hyperledger/fabric/protos/orderer"
Expand Down
2 changes: 1 addition & 1 deletion orderer/ledger/fileledger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"

genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
. "github.com/hyperledger/fabric/orderer/ledger"
fileledger "github.com/hyperledger/fabric/orderer/ledger/file"
cb "github.com/hyperledger/fabric/protos/common"
Expand Down
2 changes: 1 addition & 1 deletion orderer/ledger/ram/ramledger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
cb "github.com/hyperledger/fabric/protos/common"

logging "github.com/op/go-logging"
Expand Down
2 changes: 1 addition & 1 deletion orderer/ledger/ramledger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package ordererledger_test

import (
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
. "github.com/hyperledger/fabric/orderer/ledger"
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
)
Expand Down
2 changes: 1 addition & 1 deletion orderer/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"os"

genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/core/comm"
"github.com/hyperledger/fabric/orderer/common/bootstrap/file"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/orderer/kafka"
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
fileledger "github.com/hyperledger/fabric/orderer/ledger/file"
Expand Down
2 changes: 1 addition & 1 deletion orderer/multichain/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hyperledger/fabric/common/configtx"
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
cb "github.com/hyperledger/fabric/protos/common"
Expand Down
2 changes: 1 addition & 1 deletion orderer/multichain/systemchain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (

"github.com/hyperledger/fabric/common/configtx"
configtxapi "github.com/hyperledger/fabric/common/configtx/api"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
mockconfigtxchannel "github.com/hyperledger/fabric/common/mocks/configtx/handlers/channel"
mockconfigtxorderer "github.com/hyperledger/fabric/common/mocks/configtx/handlers/orderer"
"github.com/hyperledger/fabric/common/policies"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/orderer/common/filter"
cb "github.com/hyperledger/fabric/protos/common"
"github.com/hyperledger/fabric/protos/utils"
Expand Down
2 changes: 1 addition & 1 deletion orderer/network_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"encoding/json"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
cb "github.com/hyperledger/fabric/protos/common"
ab "github.com/hyperledger/fabric/protos/orderer"
"github.com/hyperledger/fabric/protos/utils"
Expand Down
2 changes: 1 addition & 1 deletion orderer/sample_clients/broadcast_config/newchain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package main

import (
"github.com/hyperledger/fabric/common/configtx"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
"github.com/hyperledger/fabric/msp"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
cb "github.com/hyperledger/fabric/protos/common"
)

Expand Down
2 changes: 1 addition & 1 deletion orderer/sample_clients/broadcast_timestamp/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
"github.com/hyperledger/fabric/orderer/localconfig"
cb "github.com/hyperledger/fabric/protos/common"
ab "github.com/hyperledger/fabric/protos/orderer"
Expand Down
2 changes: 1 addition & 1 deletion orderer/sample_clients/deliver_stdout/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"math"

"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
"github.com/hyperledger/fabric/orderer/localconfig"
cb "github.com/hyperledger/fabric/protos/common"
ab "github.com/hyperledger/fabric/protos/orderer"
Expand Down
2 changes: 1 addition & 1 deletion orderer/sample_clients/single_tx_client/single_tx_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"time"

"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
cb "github.com/hyperledger/fabric/protos/common"
ab "github.com/hyperledger/fabric/protos/orderer"
"github.com/hyperledger/fabric/protos/utils"
Expand Down
2 changes: 1 addition & 1 deletion orderer/sbft_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (

"github.com/golang/protobuf/proto"
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
"github.com/hyperledger/fabric/common/localmsp"
mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/orderer/ledger"
"github.com/hyperledger/fabric/orderer/ledger/ram"
"github.com/hyperledger/fabric/orderer/localconfig"
Expand Down
2 changes: 1 addition & 1 deletion peer/channel/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/hyperledger/fabric/common/configtx"
configtxapplication "github.com/hyperledger/fabric/common/configtx/handlers/application"
configtxtest "github.com/hyperledger/fabric/common/configtx/test"
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
"github.com/hyperledger/fabric/peer/common"
cb "github.com/hyperledger/fabric/protos/common"
"github.com/spf13/cobra"
Expand Down

0 comments on commit a423726

Please sign in to comment.