Rename orderer/config to orderer/localconfig

Jason Yellick · Jason Yellick · commit 8e97791a9e86 · 2016-12-02T12:18:10.000-05:00
The orderer service has two different types of configuration,
configuration which is local to the process (such as buffer sizes, and
backing structures like ledger type and location) as well as global
configuration which must be the same across nodes, such as the consensus
type and batch size.

Today, this information is all stored in one local config file
(orderer.yaml) but this needs to change.  As a first step to
differentiate between config which is local and which is shared, this
changeset renames the current yaml config mechanism to be localconfig
with the expectation that a sharedconfig package will be created in the
future.

Change-Id: I72298554600d8dc0d0c441e47fe9ab9c801e6aab
Signed-off-by: Jason Yellick &lt;jyellick@us.ibm.com&gt;
diff --git a/orderer/kafka/broadcast.go b/orderer/kafka/broadcast.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 
diff --git a/orderer/kafka/broadcast_mock_test.go b/orderer/kafka/broadcast_mock_test.go
@@ -20,10 +20,11 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
+
+	"github.com/golang/protobuf/proto"
 )
 
 func mockNewBroadcaster(t *testing.T, conf *config.TopLevel, seek int64, disk chan []byte) Broadcaster {
diff --git a/orderer/kafka/broker.go b/orderer/kafka/broker.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/Shopify/sarama"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 )
 
 // Broker allows the caller to get info on the orderer's stream
diff --git a/orderer/kafka/broker_mock_test.go b/orderer/kafka/broker_mock_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/Shopify/sarama"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 )
 
 type mockBrockerImpl struct {
diff --git a/orderer/kafka/client_deliver.go b/orderer/kafka/client_deliver.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 )
diff --git a/orderer/kafka/client_deliver_mock_test.go b/orderer/kafka/client_deliver_mock_test.go
@@ -19,7 +19,7 @@ package kafka
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 )
 
diff --git a/orderer/kafka/config_test.go b/orderer/kafka/config_test.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/Shopify/sarama"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 )
 
 var (
diff --git a/orderer/kafka/consumer.go b/orderer/kafka/consumer.go
@@ -18,7 +18,7 @@ package kafka
 
 import (
 	"github.com/Shopify/sarama"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 )
 
 // Consumer allows the caller to receive a stream of messages from the orderer
diff --git a/orderer/kafka/consumer_mock_test.go b/orderer/kafka/consumer_mock_test.go
@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
 
 	"github.com/Shopify/sarama"
diff --git a/orderer/kafka/deliver.go b/orderer/kafka/deliver.go
@@ -19,7 +19,7 @@ package kafka
 import (
 	"sync"
 
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 )
 
diff --git a/orderer/kafka/deliver_mock_test.go b/orderer/kafka/deliver_mock_test.go
@@ -19,7 +19,7 @@ package kafka
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 )
 
diff --git a/orderer/kafka/orderer.go b/orderer/kafka/orderer.go
@@ -17,7 +17,7 @@ limitations under the License.
 package kafka
 
 import (
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 )
 
diff --git a/orderer/kafka/orderer_mock_test.go b/orderer/kafka/orderer_mock_test.go
@@ -19,7 +19,7 @@ package kafka
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"google.golang.org/grpc"
diff --git a/orderer/kafka/producer.go b/orderer/kafka/producer.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/Shopify/sarama"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 )
 
 // Producer allows the caller to send blocks to the orderer
diff --git a/orderer/kafka/producer_mock_test.go b/orderer/kafka/producer_mock_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/Shopify/sarama/mocks"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 )
 
 type mockProducerImpl struct {
diff --git a/orderer/kafka/util.go b/orderer/kafka/util.go
@@ -18,7 +18,7 @@ package kafka
 
 import (
 	"github.com/Shopify/sarama"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 )
 
 const (
diff --git a/orderer/localconfig/config.go b/orderer/localconfig/config.go
diff --git a/orderer/localconfig/config_test.go b/orderer/localconfig/config_test.go
diff --git a/orderer/localconfig/config_util.go b/orderer/localconfig/config_util.go
diff --git a/orderer/main.go b/orderer/main.go
@@ -29,8 +29,8 @@ import (
 
 	"github.com/hyperledger/fabric/orderer/common/bootstrap"
 	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
-	"github.com/hyperledger/fabric/orderer/config"
 	"github.com/hyperledger/fabric/orderer/kafka"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	"github.com/hyperledger/fabric/orderer/multichain"
 	"github.com/hyperledger/fabric/orderer/rawledger"
 	"github.com/hyperledger/fabric/orderer/rawledger/fileledger"
diff --git a/orderer/sample_clients/broadcast_timestamp/client.go b/orderer/sample_clients/broadcast_timestamp/client.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"golang.org/x/net/context"
diff --git a/orderer/sample_clients/deliver_stdout/client.go b/orderer/sample_clients/deliver_stdout/client.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
-	"github.com/hyperledger/fabric/orderer/config"
+	"github.com/hyperledger/fabric/orderer/localconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"golang.org/x/net/context"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"fmt"`
`21`	`21`
`22`	`22`	`"github.com/Shopify/sarama"`
`23`		`- "github.com/hyperledger/fabric/orderer/config"`
	`23`	`+ "github.com/hyperledger/fabric/orderer/localconfig"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// Broker allows the caller to get info on the orderer's stream`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"fmt"`
`22`	`22`
`23`	`23`	`"github.com/golang/protobuf/proto"`
`24`		`- "github.com/hyperledger/fabric/orderer/config"`
	`24`	`+ "github.com/hyperledger/fabric/orderer/localconfig"`
`25`	`25`	`cb "github.com/hyperledger/fabric/protos/common"`
`26`	`26`	`ab "github.com/hyperledger/fabric/protos/orderer"`
`27`	`27`	`)`
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/config"`
	`22`	`+ "github.com/hyperledger/fabric/orderer/localconfig"`
`23`	`23`	`ab "github.com/hyperledger/fabric/protos/orderer"`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package kafka`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"github.com/Shopify/sarama"`
`21`		`- "github.com/hyperledger/fabric/orderer/config"`
	`21`	`+ "github.com/hyperledger/fabric/orderer/localconfig"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// Consumer allows the caller to receive a stream of messages from the orderer`