Merge "Rename orderer/config to orderer/localconfig"

hyperledger · Dec 5, 2016 · 97e6c35 · 97e6c35
2 parents 50f5ca9 + 8e97791
commit 97e6c35
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 20 deletions.
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/config/config.go → orderer/localconfig/config.go b/orderer/config/config.go → orderer/localconfig/config.go
diff --git a/orderer/config/config_test.go → orderer/localconfig/config_test.go b/orderer/config/config_test.go → orderer/localconfig/config_test.go
diff --git a/orderer/config/config_util.go → orderer/localconfig/config_util.go b/orderer/config/config_util.go → 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 change
@@ Expand Up / @@ -20,7 +20,7 @@ import ( @@
     	"time"
     	"github.com/Shopify/sarama"
-    	"github.com/hyperledger/fabric/orderer/config"
+    	"github.com/hyperledger/fabric/orderer/localconfig"
     )
     var (
@@ Expand Down @@