From a4237261a7bfa2bf4c8ebe22eda5a097c5f8022c Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Thu, 9 Feb 2017 21:58:12 -0500 Subject: [PATCH] [FAB-2163] Move orderer provisional bootstrapper 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 --- .../configtx/tool}/provisional/provisional.go | 0 .../configtx/tool}/provisional/provisional_test.go | 0 orderer/common/deliver/deliver_test.go | 2 +- orderer/kafka/broker_test.go | 2 +- orderer/kafka/chain_partition_test.go | 2 +- orderer/kafka/consumer_test.go | 2 +- orderer/kafka/orderer_test.go | 2 +- orderer/kafka/partitioner_test.go | 2 +- orderer/kafka/util_test.go | 2 +- orderer/ledger/file/fileledger_test.go | 2 +- orderer/ledger/fileledger_test.go | 2 +- orderer/ledger/ram/ramledger_test.go | 2 +- orderer/ledger/ramledger_test.go | 2 +- orderer/main.go | 2 +- orderer/multichain/manager_test.go | 2 +- orderer/multichain/systemchain_test.go | 2 +- orderer/network_test.go | 2 +- orderer/sample_clients/broadcast_config/newchain.go | 2 +- orderer/sample_clients/broadcast_timestamp/client.go | 2 +- orderer/sample_clients/deliver_stdout/client.go | 2 +- orderer/sample_clients/single_tx_client/single_tx_client.go | 2 +- orderer/sbft_test.go | 2 +- peer/channel/create.go | 2 +- 23 files changed, 21 insertions(+), 21 deletions(-) rename {orderer/common/bootstrap => common/configtx/tool}/provisional/provisional.go (100%) rename {orderer/common/bootstrap => common/configtx/tool}/provisional/provisional_test.go (100%) diff --git a/orderer/common/bootstrap/provisional/provisional.go b/common/configtx/tool/provisional/provisional.go similarity index 100% rename from orderer/common/bootstrap/provisional/provisional.go rename to common/configtx/tool/provisional/provisional.go diff --git a/orderer/common/bootstrap/provisional/provisional_test.go b/common/configtx/tool/provisional/provisional_test.go similarity index 100% rename from orderer/common/bootstrap/provisional/provisional_test.go rename to common/configtx/tool/provisional/provisional_test.go diff --git a/orderer/common/deliver/deliver_test.go b/orderer/common/deliver/deliver_test.go index 4710fec91ab..7e682053afc 100644 --- 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 index b40316181ec..b2fc9c092a2 100644 --- 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 index 982f1662b4a..f37634224a8 100644 --- 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 index 27a21b11784..b19ad2d6eae 100644 --- 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 index 04fd41aea54..06ceeace1a7 100644 --- 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 index 258cfcfb10a..688c00bb9d1 100644 --- 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 index 62daf5fe4a0..74ce0c3a264 100644 --- 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 index e16e8ece9b7..9d6d2e8be66 100644 --- 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 index b08913f0776..571197e7f3f 100644 --- 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 index f9f6308ce9c..fb0e38ba9b7 100644 --- 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 index 33e9e59bb80..8fc8f95d5e9 100644 --- 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 index c07681ca5c6..08a8cca11a2 100644 --- 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 index 7fbc21c4112..f7e23f43247 100644 --- 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 index 7a97ef5bb2a..4b75addfc95 100644 --- 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 index 4d96089db16..dbb7a1d5bb2 100644 --- 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 index e826d55cecf..381aa7fe302 100644 --- 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 index 43f02f6b52d..102403f2cfa 100644 --- 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 index d803d4e1993..8d11ec871d2 100644 --- 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 index 5344acb0a26..5b0e7e857f9 100644 --- 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 index 2fc45b6b63a..0ea9eda82da 100644 --- 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 index 902f837afd7..46e3715b274 100644 --- 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"