Move flogging pkg into the peer pkg

The flogging pkg is only utilized by peer and core module with single source-code file. It will keep the structure more tight to move the pkg under the core pkg. Change-Id: Id47cc1315f845dba625ed0fc61873a41250ff99d Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
hyperledger · Dec 12, 2016 · 4f7c22c · 4f7c22c
1 parent 3ef851e
commit 4f7c22c
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/core/admin.go b/core/admin.go
@@ -25,7 +25,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

diff --git a/core/chaincode/chaincode_support.go b/core/chaincode/chaincode_support.go
@@ -33,8 +33,8 @@ import (
 
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/container/ccintf"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/flogging"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

diff --git a/core/errors/errors.go b/core/errors/errors.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 	logging "github.com/op/go-logging"
 )
 

diff --git a/core/errors/errors_test.go b/core/errors/errors_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 )
 
 func TestError(t *testing.T) {

diff --git a/flogging/logging.go → core/flogging/logging.go b/flogging/logging.go → core/flogging/logging.go
diff --git a/flogging/logging_test.go → core/flogging/logging_test.go b/flogging/logging_test.go → core/flogging/logging_test.go
@@ -19,7 +19,7 @@ package flogging_test
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/flogging"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 )

diff --git a/peer/common/common.go b/peer/common/common.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric/core/errors"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/peer/msp"
-	"github.com/hyperledger/fabric/flogging"
 	"github.com/hyperledger/fabric/msp"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/viper"

diff --git a/peer/main.go b/peer/main.go
@@ -31,8 +31,8 @@ import (
 
 	"github.com/hyperledger/fabric/core"
 	"github.com/hyperledger/fabric/core/crypto/primitives"
+	"github.com/hyperledger/fabric/core/flogging"
 	"github.com/hyperledger/fabric/core/peer/msp"
-	"github.com/hyperledger/fabric/flogging"
 	"github.com/hyperledger/fabric/peer/chaincode"
 	"github.com/hyperledger/fabric/peer/clilogging"
 	"github.com/hyperledger/fabric/peer/node"