[FAB-12440] run goimports on tree and re-enable

Let the tool do what it wants with the imports.

Change-Id: I115230369be6349d89b5869951ce088ce38d8fb6
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

bccsp/mocks/mocks.go

@@ -17,13 +17,12 @@ limitations under the License.
 package mocks
 
 import (
+	"bytes"
 	"crypto"
 	"errors"
 	"hash"
 	"reflect"
 
-	"bytes"
-
 	"github.com/hyperledger/fabric/bccsp"
 )
 

bccsp/sw/aes_test.go

@@ -19,12 +19,11 @@ import (
 	"bytes"
 	"crypto/aes"
 	"crypto/rand"
+	"io"
 	"math/big"
 	mrand "math/rand"
 	"testing"
 
-	"io"
-
 	"github.com/hyperledger/fabric/bccsp"
 	"github.com/hyperledger/fabric/bccsp/mocks"
 	"github.com/hyperledger/fabric/bccsp/utils"

bccsp/sw/aeskey.go

@@ -16,9 +16,8 @@ limitations under the License.
 package sw
 
 import (
-	"errors"
-
 	"crypto/sha256"
+	"errors"
 
 	"github.com/hyperledger/fabric/bccsp"
 )

bccsp/sw/ecdsakey.go

@@ -17,14 +17,11 @@ package sw
 
 import (
 	"crypto/ecdsa"
-	"crypto/x509"
-	"fmt"
-
+	"crypto/elliptic"
 	"crypto/sha256"
-
+	"crypto/x509"
 	"errors"
-
-	"crypto/elliptic"
+	"fmt"
 
 	"github.com/hyperledger/fabric/bccsp"
 )

bccsp/sw/fileks.go

@@ -17,18 +17,16 @@ package sw
 
 import (
 	"bytes"
-	"io/ioutil"
-	"os"
-	"sync"
-
-	"errors"
-	"strings"
-
 	"crypto/ecdsa"
 	"crypto/rsa"
 	"encoding/hex"
+	"errors"
 	"fmt"
+	"io/ioutil"
+	"os"
 	"path/filepath"
+	"strings"
+	"sync"
 
 	"github.com/hyperledger/fabric/bccsp"
 	"github.com/hyperledger/fabric/bccsp/utils"

bccsp/sw/fileks_test.go

@@ -26,9 +26,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/hyperledger/fabric/bccsp/utils"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestInvalidStoreKey(t *testing.T) {

bccsp/sw/impl_test.go

@@ -33,11 +33,10 @@ import (
 	"math/big"
 	"net"
 	"os"
+	"reflect"
 	"testing"
 	"time"
 
-	"reflect"
-
 	"github.com/hyperledger/fabric/bccsp"
 	"github.com/hyperledger/fabric/bccsp/signer"
 	"github.com/hyperledger/fabric/bccsp/sw/mocks"

bccsp/sw/keyderiv.go

@@ -18,13 +18,11 @@ package sw
 
 import (
 	"crypto/ecdsa"
-	"fmt"
-
+	"crypto/hmac"
 	"errors"
+	"fmt"
 	"math/big"
 
-	"crypto/hmac"
-
 	"github.com/hyperledger/fabric/bccsp"
 )
 

bccsp/sw/keyimport.go

@@ -17,12 +17,11 @@ limitations under the License.
 package sw
 
 import (
-	"errors"
-	"fmt"
-
 	"crypto/ecdsa"
 	"crypto/rsa"
 	"crypto/x509"
+	"errors"
+	"fmt"
 	"reflect"
 
 	"github.com/hyperledger/fabric/bccsp"

bccsp/sw/rsakey.go

@@ -17,14 +17,11 @@ package sw
 
 import (
 	"crypto/rsa"
-	"crypto/x509"
-	"fmt"
-
 	"crypto/sha256"
-
-	"errors"
-
+	"crypto/x509"
 	"encoding/asn1"
+	"errors"
+	"fmt"
 	"math/big"
 
 	"github.com/hyperledger/fabric/bccsp"

bccsp/sw/sw_test.go

@@ -18,9 +18,8 @@ package sw
 
 import (
 	"errors"
-	"testing"
-
 	"reflect"
+	"testing"
 
 	"github.com/hyperledger/fabric/bccsp"
 	"github.com/hyperledger/fabric/bccsp/mocks"

cmd/common/cli.go

@@ -8,11 +8,10 @@ package common
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 
-	"io"
-
 	"github.com/hyperledger/fabric/cmd/common/comm"
 	"github.com/hyperledger/fabric/cmd/common/signer"
 	"gopkg.in/alecthomas/kingpin.v2"

cmd/common/cli_test.go

@@ -9,11 +9,10 @@ package common
 import (
 	"bytes"
 	"fmt"
-	"path/filepath"
-	"testing"
-
 	"math/rand"
 	"os"
+	"path/filepath"
+	"testing"
 
 	"github.com/hyperledger/fabric/cmd/common/signer"
 	"github.com/pkg/errors"

common/capabilities/application_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	cb "github.com/hyperledger/fabric/protos/common"
-
 	"github.com/stretchr/testify/assert"
 )
 

common/capabilities/capabilities.go

@@ -9,7 +9,6 @@ package capabilities
 import (
 	"github.com/hyperledger/fabric/common/flogging"
 	cb "github.com/hyperledger/fabric/protos/common"
-
 	"github.com/pkg/errors"
 )
 

common/capabilities/capabilities_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	cb "github.com/hyperledger/fabric/protos/common"
-
 	"github.com/stretchr/testify/assert"
 )
 

common/capabilities/channel_test.go

@@ -9,9 +9,8 @@ package capabilities
 import (
 	"testing"
 
-	cb "github.com/hyperledger/fabric/protos/common"
-
 	"github.com/hyperledger/fabric/msp"
+	cb "github.com/hyperledger/fabric/protos/common"
 	"github.com/stretchr/testify/assert"
 )
 

common/capabilities/orderer_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	cb "github.com/hyperledger/fabric/protos/common"
-
 	"github.com/stretchr/testify/assert"
 )
 

common/cauthdsl/cauthdsl_builder.go

@@ -17,12 +17,11 @@ limitations under the License.
 package cauthdsl
 
 import (
-	cb "github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/msp"
-
 	"sort"
 
 	"github.com/golang/protobuf/proto"
+	cb "github.com/hyperledger/fabric/protos/common"
+	"github.com/hyperledger/fabric/protos/msp"
 	"github.com/hyperledger/fabric/protos/utils"
 )
 

common/cauthdsl/policy.go

@@ -10,11 +10,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hyperledger/fabric/common/policies"
-	cb "github.com/hyperledger/fabric/protos/common"
-
 	"github.com/golang/protobuf/proto"
+	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/msp"
+	cb "github.com/hyperledger/fabric/protos/common"
 )
 
 type provider struct {