Make import order consistent

1. golang packages
2. third-party packages
3. packages with aliases
4. _ imports

Author: Rob Percival

server/trillian_log_server/main.go

@@ -20,17 +20,12 @@ import (
 	"context"
 	"flag"
 
-	// Register key ProtoHandlers
-	_ "github.com/google/trillian/crypto/keys/der/proto"
-	_ "github.com/google/trillian/crypto/keys/pem/proto"
-	_ "github.com/google/trillian/crypto/keys/pkcs11/proto"
-	"github.com/google/trillian/crypto/keyspb"
-
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/trillian"
 	"github.com/google/trillian/cmd"
 	"github.com/google/trillian/crypto/keys/der"
+	"github.com/google/trillian/crypto/keyspb"
 	"github.com/google/trillian/extension"
 	"github.com/google/trillian/monitoring"
 	"github.com/google/trillian/monitoring/prometheus"
@@ -40,13 +35,19 @@ import (
 	"github.com/google/trillian/util"
 	"google.golang.org/grpc"
 
-	_ "net/http/pprof" // Register pprof HTTP handlers
-
-	_ "github.com/go-sql-driver/mysql"              // Load MySQL driver
-	_ "github.com/google/trillian/merkle/objhasher" // Load hashers
-	_ "github.com/google/trillian/merkle/rfc6962"   // Load hashers
-
 	mysqlq "github.com/google/trillian/quota/mysql"
+
+	// Register pprof HTTP handlers
+	_ "net/http/pprof"
+	// Load MySQL driver
+	_ "github.com/go-sql-driver/mysql"
+	// Register key ProtoHandlers
+	_ "github.com/google/trillian/crypto/keys/der/proto"
+	_ "github.com/google/trillian/crypto/keys/pem/proto"
+	_ "github.com/google/trillian/crypto/keys/pkcs11/proto"
+	// Load hashers
+	_ "github.com/google/trillian/merkle/objhasher"
+	_ "github.com/google/trillian/merkle/rfc6962"
 )
 
 var (

server/trillian_log_signer/main.go

@@ -22,11 +22,6 @@ import (
 	"os"
 	"time"
 
-	// Register key ProtoHandlers
-	_ "github.com/google/trillian/crypto/keys/der/proto"
-	_ "github.com/google/trillian/crypto/keys/pem/proto"
-	_ "github.com/google/trillian/crypto/keys/pkcs11/proto"
-
 	"github.com/golang/glog"
 	"github.com/google/trillian/cmd"
 	"github.com/google/trillian/extension"
@@ -40,9 +35,15 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"golang.org/x/net/context"
 
-	_ "github.com/go-sql-driver/mysql"              // Load MySQL driver
-	_ "github.com/google/trillian/merkle/objhasher" // Load hashers
-	_ "github.com/google/trillian/merkle/rfc6962"   // Load hashers
+	// Load MySQL driver
+	_ "github.com/go-sql-driver/mysql"
+	// Register key ProtoHandlers
+	_ "github.com/google/trillian/crypto/keys/der/proto"
+	_ "github.com/google/trillian/crypto/keys/pem/proto"
+	_ "github.com/google/trillian/crypto/keys/pkcs11/proto"
+	// Load hashers
+	_ "github.com/google/trillian/merkle/objhasher"
+	_ "github.com/google/trillian/merkle/rfc6962"
 )
 
 var (

server/trillian_map_server/main.go

@@ -35,16 +35,17 @@ import (
 
 	mysqlq "github.com/google/trillian/quota/mysql"
 
-	_ "net/http/pprof" // Register pprof HTTP handlers
-
-	_ "github.com/go-sql-driver/mysql"              // Load MySQL driver
-	_ "github.com/google/trillian/merkle/coniks"    // Make hashers available
-	_ "github.com/google/trillian/merkle/maphasher" // Make hashers available
-
+	// Register pprof HTTP handlers
+	_ "net/http/pprof"
+	// Load MySQL driver
+	_ "github.com/go-sql-driver/mysql"
 	// Register key ProtoHandlers
 	_ "github.com/google/trillian/crypto/keys/der/proto"
 	_ "github.com/google/trillian/crypto/keys/pem/proto"
 	_ "github.com/google/trillian/crypto/keys/pkcs11/proto"
+	// Load hashers
+	_ "github.com/google/trillian/merkle/coniks"
+	_ "github.com/google/trillian/merkle/maphasher"
 )
 
 var (