Skip to content

Commit a423726

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

23 files changed

+21
-21
lines changed

‎orderer/common/bootstrap/provisional/provisional.go ‎common/configtx/tool/provisional/provisional.go

File renamed without changes.

‎orderer/common/bootstrap/provisional/provisional_test.go ‎common/configtx/tool/provisional/provisional_test.go

File renamed without changes.

‎orderer/common/deliver/deliver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323

2424
configtxapi "github.com/hyperledger/fabric/common/configtx/api"
2525
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
26+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2627
mockconfigtxorderer "github.com/hyperledger/fabric/common/mocks/configtx/handlers/orderer"
2728
mockpolicies "github.com/hyperledger/fabric/common/mocks/policies"
2829
"github.com/hyperledger/fabric/common/policies"
29-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
3030
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
3131
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
3232
cb "github.com/hyperledger/fabric/protos/common"

‎orderer/kafka/broker_test.go

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

2222
"github.com/Shopify/sarama"
23-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
23+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2424
)
2525

2626
func TestBrokerGetOffset(t *testing.T) {

‎orderer/kafka/chain_partition_test.go

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

24-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
24+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2525
)
2626

2727
func TestChainPartition(t *testing.T) {

‎orderer/kafka/consumer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package kafka
1919
import (
2020
"testing"
2121

22-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
22+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2323
ab "github.com/hyperledger/fabric/protos/orderer"
2424
)
2525

‎orderer/kafka/orderer_test.go

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

2525
"github.com/Shopify/sarama"
26+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2627
mockconfigtxorderer "github.com/hyperledger/fabric/common/mocks/configtx/handlers/orderer"
27-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
2828
"github.com/hyperledger/fabric/orderer/localconfig"
2929
mockblockcutter "github.com/hyperledger/fabric/orderer/mocks/blockcutter"
3030
mockmultichain "github.com/hyperledger/fabric/orderer/mocks/multichain"

‎orderer/kafka/partitioner_test.go

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

2222
"github.com/Shopify/sarama"
23-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
23+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2424
)
2525

2626
func TestStaticPartitioner(t *testing.T) {

‎orderer/kafka/util_test.go

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

2222
"github.com/Shopify/sarama"
23-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
23+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2424
"github.com/hyperledger/fabric/orderer/localconfig"
2525
"github.com/hyperledger/fabric/orderer/mocks/util"
2626
"github.com/stretchr/testify/assert"

‎orderer/ledger/file/fileledger_test.go

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

2525
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
26-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
26+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2727
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
2828
cb "github.com/hyperledger/fabric/protos/common"
2929
ab "github.com/hyperledger/fabric/protos/orderer"

‎orderer/ledger/fileledger_test.go

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

2323
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
24-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
24+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2525
. "github.com/hyperledger/fabric/orderer/ledger"
2626
fileledger "github.com/hyperledger/fabric/orderer/ledger/file"
2727
cb "github.com/hyperledger/fabric/protos/common"

‎orderer/ledger/ram/ramledger_test.go

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

2222
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
23-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
23+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2424
cb "github.com/hyperledger/fabric/protos/common"
2525

2626
logging "github.com/op/go-logging"

‎orderer/ledger/ramledger_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package ordererledger_test
1818

1919
import (
20-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
20+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2121
. "github.com/hyperledger/fabric/orderer/ledger"
2222
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
2323
)

‎orderer/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"os"
2727

2828
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
29+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2930
"github.com/hyperledger/fabric/common/flogging"
3031
"github.com/hyperledger/fabric/core/comm"
3132
"github.com/hyperledger/fabric/orderer/common/bootstrap/file"
32-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
3333
"github.com/hyperledger/fabric/orderer/kafka"
3434
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
3535
fileledger "github.com/hyperledger/fabric/orderer/ledger/file"

‎orderer/multichain/manager_test.go

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

2424
"github.com/hyperledger/fabric/common/configtx"
2525
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
26-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
26+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2727
ordererledger "github.com/hyperledger/fabric/orderer/ledger"
2828
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
2929
cb "github.com/hyperledger/fabric/protos/common"

‎orderer/multichain/systemchain_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222

2323
"github.com/hyperledger/fabric/common/configtx"
2424
configtxapi "github.com/hyperledger/fabric/common/configtx/api"
25+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2526
mockconfigtxchannel "github.com/hyperledger/fabric/common/mocks/configtx/handlers/channel"
2627
mockconfigtxorderer "github.com/hyperledger/fabric/common/mocks/configtx/handlers/orderer"
2728
"github.com/hyperledger/fabric/common/policies"
28-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
2929
"github.com/hyperledger/fabric/orderer/common/filter"
3030
cb "github.com/hyperledger/fabric/protos/common"
3131
"github.com/hyperledger/fabric/protos/utils"

‎orderer/network_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"encoding/json"
3434

3535
"github.com/golang/protobuf/proto"
36-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
36+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
3737
cb "github.com/hyperledger/fabric/protos/common"
3838
ab "github.com/hyperledger/fabric/protos/orderer"
3939
"github.com/hyperledger/fabric/protos/utils"

‎orderer/sample_clients/broadcast_config/newchain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package main
1818

1919
import (
2020
"github.com/hyperledger/fabric/common/configtx"
21+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2122
"github.com/hyperledger/fabric/msp"
22-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
2323
cb "github.com/hyperledger/fabric/protos/common"
2424
)
2525

‎orderer/sample_clients/broadcast_timestamp/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"time"
2323

2424
"github.com/golang/protobuf/proto"
25-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
25+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2626
"github.com/hyperledger/fabric/orderer/localconfig"
2727
cb "github.com/hyperledger/fabric/protos/common"
2828
ab "github.com/hyperledger/fabric/protos/orderer"

‎orderer/sample_clients/deliver_stdout/client.go

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

24-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
24+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2525
"github.com/hyperledger/fabric/orderer/localconfig"
2626
cb "github.com/hyperledger/fabric/protos/common"
2727
ab "github.com/hyperledger/fabric/protos/orderer"

‎orderer/sample_clients/single_tx_client/single_tx_client.go

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

23-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
23+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2424
cb "github.com/hyperledger/fabric/protos/common"
2525
ab "github.com/hyperledger/fabric/protos/orderer"
2626
"github.com/hyperledger/fabric/protos/utils"

‎orderer/sbft_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929

3030
"github.com/golang/protobuf/proto"
3131
genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
32+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
3233
"github.com/hyperledger/fabric/common/localmsp"
3334
mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
34-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
3535
"github.com/hyperledger/fabric/orderer/ledger"
3636
"github.com/hyperledger/fabric/orderer/ledger/ram"
3737
"github.com/hyperledger/fabric/orderer/localconfig"

‎peer/channel/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/hyperledger/fabric/common/configtx"
2525
configtxapplication "github.com/hyperledger/fabric/common/configtx/handlers/application"
2626
configtxtest "github.com/hyperledger/fabric/common/configtx/test"
27+
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2728
mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
28-
"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
2929
"github.com/hyperledger/fabric/peer/common"
3030
cb "github.com/hyperledger/fabric/protos/common"
3131
"github.com/spf13/cobra"

0 commit comments

Comments
 (0)