[FAB-3341] Move errors package to fabric/common

This CR moves the error handling package from fabric/core to fabric/common so that it can be used by the orderer in addition to the peer. Change-Id: Iaba59f107cc504a4a99464b92cdaccbc3e824736 Signed-off-by: Will Lahti <[email protected]>
hyperledger · Apr 22, 2017 · a1feab0 · a1feab0
1 parent 95d13d2
commit a1feab0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/core/errors/errors.go → common/errors/errors.go b/core/errors/errors.go → common/errors/errors.go
diff --git a/core/errors/errors_test.go → common/errors/errors_test.go b/core/errors/errors_test.go → common/errors/errors_test.go
@@ -118,7 +118,7 @@ func TestErrorWithCallstackMessage(t *testing.T) {
 
 	// check that the error message contains this part of the stack trace, which
 	// is non-platform specific
-	if !strings.Contains(e.Error(), "github.com/hyperledger/fabric/core/errors.TestErrorWithCallstackMessage") {
+	if !strings.Contains(e.Error(), "github.com/hyperledger/fabric/common/errors.TestErrorWithCallstackMessage") {
 		t.Fatalf("Error message does not have stack trace appended.")
 	}
 }
@@ -136,7 +136,7 @@ func TestErrorWithCallstackMessage_wrapped(t *testing.T) {
 
 	// check that the error message contains this part of the stack trace, which
 	// is non-platform specific
-	if !strings.Contains(e.Error(), "github.com/hyperledger/fabric/core/errors.TestErrorWithCallstackMessage_wrapped") {
+	if !strings.Contains(e.Error(), "github.com/hyperledger/fabric/common/errors.TestErrorWithCallstackMessage_wrapped") {
 		t.Fatalf("Error message does not have stack trace appended.")
 	}
 
@@ -148,7 +148,7 @@ func TestErrorWithCallstackMessage_wrapped(t *testing.T) {
 
 	// check that the error message contains this part of the stack trace, which
 	// is non-platform specific
-	if !strings.Contains(e2.Error(), "github.com/hyperledger/fabric/core/errors.TestErrorWithCallstackMessage_wrapped") {
+	if !strings.Contains(e2.Error(), "github.com/hyperledger/fabric/common/errors.TestErrorWithCallstackMessage_wrapped") {
 		t.Fatalf("Error message does not have stack trace appended.")
 	}
 }

diff --git a/peer/clilogging/common.go b/peer/clilogging/common.go
@@ -17,7 +17,7 @@ limitations under the License.
 package clilogging
 
 import (
-	"github.com/hyperledger/fabric/core/errors"
+	"github.com/hyperledger/fabric/common/errors"
 	"github.com/hyperledger/fabric/peer/common"
 
 	"github.com/spf13/cobra"

diff --git a/peer/common/common.go b/peer/common/common.go
@@ -22,9 +22,9 @@ import (
 	"path/filepath"
 
 	"github.com/hyperledger/fabric/bccsp/factory"
+	"github.com/hyperledger/fabric/common/errors"
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/viperutil"
-	"github.com/hyperledger/fabric/core/errors"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/msp"
 	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"

diff --git a/peer/core.yaml b/peer/core.yaml
@@ -31,7 +31,7 @@ logging:
     msp:        warning
 
     # Error handling framework log level - when set to DEBUG, a callstack will
-    # be appended to all errors generated using the fabric/core/errors package
+    # be appended to all errors generated using the fabric/common/errors package
     error:      debug
 
     format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'