[FAB-7508] Move status, retry to pkg/errors

Change-Id: I293772464c7687704a2111a09653d78826d8c80a Signed-off-by: Divyank Katira <[email protected]>
hyperledger · Jan 30, 2018 · f3eca56 · f3eca56
1 parent 47e68c4
commit f3eca56
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 20 deletions.
diff --git a/api/apiconfig/network.go b/api/apiconfig/network.go
@@ -12,7 +12,7 @@ import (
 	"io/ioutil"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 )
 
 // NetworkConfig provides a static definition of a Hyperledger Fabric network

diff --git a/api/apitxn/opts.go b/api/apitxn/opts.go
@@ -9,7 +9,7 @@ package apitxn
 import (
 	"time"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/retry"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/retry"
 )
 
 //WithTimeout encapsulates time.Duration to Option

diff --git a/api/apitxn/txn.go b/api/apitxn/txn.go
@@ -9,7 +9,7 @@ package apitxn
 import (
 	"time"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/retry"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/retry"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 )
 

diff --git a/api/apitxn/txnhandler/txnhandler.go b/api/apitxn/txnhandler/txnhandler.go
@@ -9,7 +9,7 @@ package txnhandler
 import (
 	"github.com/hyperledger/fabric-sdk-go/api/apifabclient"
 	"github.com/hyperledger/fabric-sdk-go/api/apitxn"
-	"github.com/hyperledger/fabric-sdk-go/pkg/retry"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/retry"
 )
 
 //Handler for chaining transaction executions

diff --git a/pkg/retry/defaults.go → pkg/errors/retry/defaults.go b/pkg/retry/defaults.go → pkg/errors/retry/defaults.go
@@ -9,7 +9,7 @@ package retry
 import (
 	"time"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 	grpcCodes "google.golang.org/grpc/codes"

diff --git a/pkg/retry/retry.go → pkg/errors/retry/retry.go b/pkg/retry/retry.go → pkg/errors/retry/retry.go
@@ -10,7 +10,7 @@ package retry
 import (
 	"time"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 )
 
 // Opts defines the retry parameters

diff --git a/pkg/retry/retry_test.go → pkg/errors/retry/retry_test.go b/pkg/retry/retry_test.go → pkg/errors/retry/retry_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/pkg/status/codes.go → pkg/errors/status/codes.go b/pkg/status/codes.go → pkg/errors/status/codes.go
diff --git a/pkg/status/status.go → pkg/errors/status/status.go b/pkg/status/status.go → pkg/errors/status/status.go
diff --git a/pkg/status/status_test.go → pkg/errors/status/status_test.go b/pkg/status/status_test.go → pkg/errors/status/status_test.go
diff --git a/pkg/fabric-client/events/eventhub.go b/pkg/fabric-client/events/eventhub.go
@@ -26,9 +26,9 @@ import (
 	cnsmr "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/events/consumer"
 	"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	consumer "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/events/consumer"
 	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/core/ledger/util"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/utils"
 )

diff --git a/pkg/fabric-client/events/eventhub_test.go b/pkg/fabric-client/events/eventhub_test.go
@@ -16,7 +16,7 @@ import (
 	"reflect"
 
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/fabric-client/orderer/deprecated_test.go b/pkg/fabric-client/orderer/deprecated_test.go
@@ -19,9 +19,9 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
 	mocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
 )
 
 //

diff --git a/pkg/fabric-client/orderer/orderer.go b/pkg/fabric-client/orderer/orderer.go
@@ -17,7 +17,7 @@ import (
 	ab "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric-sdk-go/pkg/config/comm"
 	"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 
 	"crypto/x509"

diff --git a/pkg/fabric-client/orderer/orderer_test.go b/pkg/fabric-client/orderer/orderer_test.go
@@ -24,9 +24,9 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
 	mocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
 )
 
 var testOrdererURL = "127.0.0.1:0"

diff --git a/pkg/fabric-client/peer/peerendorser.go b/pkg/fabric-client/peer/peerendorser.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
 	"github.com/hyperledger/fabric-sdk-go/api/apitxn"
 	"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 
 	"crypto/x509"

diff --git a/pkg/fabric-client/peer/peerendorser_test.go b/pkg/fabric-client/peer/peerendorser_test.go
@@ -22,8 +22,8 @@ import (
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 
 	"github.com/hyperledger/fabric-sdk-go/api/apiconfig/mocks"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
 )
 
 const (

diff --git a/pkg/fabric-txn/chclient/chclient.go b/pkg/fabric-txn/chclient/chclient.go
@@ -17,9 +17,9 @@ import (
 
 	"github.com/hyperledger/fabric-sdk-go/api/apitxn/txnhandler"
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/retry"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	txnHandlerImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/txnhandler"
-	"github.com/hyperledger/fabric-sdk-go/pkg/retry"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
 )
 
 const (

diff --git a/pkg/fabric-txn/chclient/chclient_test.go b/pkg/fabric-txn/chclient/chclient_test.go
@@ -16,13 +16,12 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/retry"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/channel"
 	fcmocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/peer"
-	"github.com/hyperledger/fabric-sdk-go/pkg/retry"
-
 	txnmocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/mocks"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 )
 

diff --git a/pkg/fabric-txn/txnhandler/txnhandler.go b/pkg/fabric-txn/txnhandler/txnhandler.go
@@ -14,9 +14,9 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/api/apitxn"
 	"github.com/hyperledger/fabric-sdk-go/api/apitxn/txnhandler"
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/peer"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/internal"
-	"github.com/hyperledger/fabric-sdk-go/pkg/status"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 )