[FABG-700] fix typoes and imports

Change-Id: I1ed71dbabe69763606897bfb9003edccaddd1749
Signed-off-by: ping40 <norberthu30@gmail.com>

Author: ping40

pkg/client/msp/client_test.go

@@ -8,15 +8,14 @@ package msp
 
 import (
 	"errors"
+	"fmt"
 	"math/rand"
 	"net"
+	"os"
 	"strconv"
 	"strings"
 	"testing"
 
-	"fmt"
-	"os"
-
 	contextApi "github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/msp"

pkg/fab/channel/transactor.go

@@ -7,15 +7,13 @@ SPDX-License-Identifier: Apache-2.0
 package channel
 
 import (
+	reqContext "context"
 	"strings"
 
 	"github.com/pkg/errors"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
-
-	reqContext "context"
-
 	contextImpl "github.com/hyperledger/fabric-sdk-go/pkg/context"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/endpoint"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/txn"

pkg/fab/channel/transactor_test.go

@@ -8,9 +8,10 @@ package channel
 
 import (
 	"testing"
-
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
 	"github.com/hyperledger/fabric-sdk-go/pkg/context"
@@ -21,7 +22,6 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/txn"
 	mspmocks "github.com/hyperledger/fabric-sdk-go/pkg/msp/test/mockmsp"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestCreateTxnID(t *testing.T) {

pkg/fab/events/endpoint/endpoint.go

@@ -10,9 +10,8 @@ import (
 	"crypto/x509"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/options"
-	"github.com/hyperledger/fabric-sdk-go/pkg/fab/comm"
-
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
+	"github.com/hyperledger/fabric-sdk-go/pkg/fab/comm"
 )
 
 // EventEndpoint extends a Peer endpoint and provides the

pkg/fab/events/endpoint/endpoint_test.go

@@ -10,12 +10,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
 	clientmocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/events/client/mocks"
 	fabmocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
 	mspmocks "github.com/hyperledger/fabric-sdk-go/pkg/msp/test/mockmsp"
 	"github.com/hyperledger/fabric-sdk-go/pkg/util/test"
-	"github.com/stretchr/testify/assert"
 )
 
 const (

pkg/fab/events/endpoint/endpointdiscovery.go

@@ -7,16 +7,17 @@ SPDX-License-Identifier: Apache-2.0
 package endpoint
 
 import (
+	"github.com/pkg/errors"
+
 	"github.com/hyperledger/fabric-sdk-go/pkg/client/common/discovery"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/logging"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
-	"github.com/pkg/errors"
 )
 
 var logger = logging.NewLogger("fabsdk/fab")
 
-// DiscoveryWrapper wraps a target discovery service and and adds endpoint data to each
+// DiscoveryWrapper wraps a target discovery service and adds endpoint data to each
 // of the discovered peers.
 type DiscoveryWrapper struct {
 	fab.DiscoveryService

pkg/fabsdk/provider/chpvdr/cachekey.go

@@ -47,7 +47,7 @@ func (k *cacheKey) String() string {
 	return k.key
 }
 
-// cacheKey holds a key for the provider cache
+// eventCacheKey holds a key for the provider cache
 type eventCacheKey struct {
 	cacheKey
 	opts []options.Opt

pkg/msp/test/mockmsp/mockfabriccaserver.go

@@ -9,11 +9,10 @@ package mockmsp
 import (
 	"net"
 	"net/http"
-
 	"time"
 
-	cfapi "github.com/cloudflare/cfssl/api"
 	cfsslapi "github.com/cloudflare/cfssl/api"
+
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/api"
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/logging"
@@ -143,7 +142,7 @@ func (s *MockFabricCAServer) enroll(w http.ResponseWriter, req *http.Request) {
 	}
 	resp := &enrollmentResponseNet{Cert: util.B64Encode([]byte(ecert))}
 	fillCAInfo(&resp.ServerInfo)
-	if err := cfapi.SendResponse(w, resp); err != nil {
+	if err := cfsslapi.SendResponse(w, resp); err != nil {
 		logger.Error(err)
 	}
 }