[FAB-2163] Move orderer provisional bootstrapper

Jason Yellick · Jason Yellick · commit a4237261a7bf · 2017-02-13T13:23:06.000-05:00
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 <jyellick@us.ibm.com>
diff --git a/common/configtx/tool/provisional/provisional.go b/common/configtx/tool/provisional/provisional.go
diff --git a/common/configtx/tool/provisional/provisional_test.go b/common/configtx/tool/provisional/provisional_test.go
diff --git a/orderer/common/deliver/deliver_test.go b/orderer/common/deliver/deliver_test.go
@@ -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"
diff --git a/orderer/kafka/broker_test.go b/orderer/kafka/broker_test.go
@@ -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) {
diff --git a/orderer/kafka/chain_partition_test.go b/orderer/kafka/chain_partition_test.go
@@ -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) {
diff --git a/orderer/kafka/consumer_test.go b/orderer/kafka/consumer_test.go
@@ -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"
 )
 
diff --git a/orderer/kafka/orderer_test.go b/orderer/kafka/orderer_test.go
@@ -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"
diff --git a/orderer/kafka/partitioner_test.go b/orderer/kafka/partitioner_test.go
@@ -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) {
diff --git a/orderer/kafka/util_test.go b/orderer/kafka/util_test.go
@@ -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"
diff --git a/orderer/ledger/file/fileledger_test.go b/orderer/ledger/file/fileledger_test.go
@@ -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"
diff --git a/orderer/ledger/fileledger_test.go b/orderer/ledger/fileledger_test.go
@@ -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"
diff --git a/orderer/ledger/ram/ramledger_test.go b/orderer/ledger/ram/ramledger_test.go
@@ -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"
diff --git a/orderer/ledger/ramledger_test.go b/orderer/ledger/ramledger_test.go
@@ -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"
 )
diff --git a/orderer/main.go b/orderer/main.go
@@ -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"
diff --git a/orderer/multichain/manager_test.go b/orderer/multichain/manager_test.go
@@ -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"
diff --git a/orderer/multichain/systemchain_test.go b/orderer/multichain/systemchain_test.go
@@ -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"
diff --git a/orderer/network_test.go b/orderer/network_test.go
@@ -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"
diff --git a/orderer/sample_clients/broadcast_config/newchain.go b/orderer/sample_clients/broadcast_config/newchain.go
@@ -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"
 )
 
diff --git a/orderer/sample_clients/broadcast_timestamp/client.go b/orderer/sample_clients/broadcast_timestamp/client.go
@@ -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"
diff --git a/orderer/sample_clients/deliver_stdout/client.go b/orderer/sample_clients/deliver_stdout/client.go
@@ -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"
diff --git a/orderer/sample_clients/single_tx_client/single_tx_client.go b/orderer/sample_clients/single_tx_client/single_tx_client.go
@@ -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"
diff --git a/orderer/sbft_test.go b/orderer/sbft_test.go
@@ -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"
diff --git a/peer/channel/create.go b/peer/channel/create.go
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"testing"`
`21`	`21`
`22`	`22`	`"github.com/Shopify/sarama"`
`23`		`- "github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"`
	`23`	`+ "github.com/hyperledger/fabric/common/configtx/tool/provisional"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func TestBrokerGetOffset(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"strings"`
`22`	`22`	`"testing"`
`23`	`23`
`24`		`- "github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"`
	`24`	`+ "github.com/hyperledger/fabric/common/configtx/tool/provisional"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func TestChainPartition(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package kafka`
`19`	`19`	`import (`
`20`	`20`	`"testing"`
`21`	`21`
`22`		`- "github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"`
	`22`	`+ "github.com/hyperledger/fabric/common/configtx/tool/provisional"`
`23`	`23`	`ab "github.com/hyperledger/fabric/protos/orderer"`
`24`	`24`	`)`
`25`	`25`