Split imports into logical groups

addrmanager.go

@@ -11,7 +11,6 @@ import (
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
-	"github.com/conformal/btcwire"
 	"io"
 	"math"
 	"math/rand"
@@ -23,6 +22,8 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/conformal/btcwire"
 )
 
 const (

addrmanager_test.go

@@ -5,10 +5,11 @@
 package main
 
 import (
-	"github.com/conformal/btcwire"
 	"net"
 	"testing"
 	"time"
+
+	"github.com/conformal/btcwire"
 )
 
 // naTest is used to describe a test to be perfomed against the NetAddressKey

blockmanager.go

@@ -6,17 +6,18 @@ package main
 
 import (
 	"container/list"
-	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
-	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
 	"net"
 	"os"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/conformal/btcchain"
+	"github.com/conformal/btcdb"
+	"github.com/conformal/btcnet"
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
 )
 
 const (

btcd.go

@@ -6,13 +6,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/conformal/btcd/limits"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
 	"runtime"
 	"runtime/pprof"
+
+	"github.com/conformal/btcd/limits"
 )
 
 var (

config.go

@@ -7,13 +7,6 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
-	_ "github.com/conformal/btcdb/memdb"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
-	"github.com/conformal/go-flags"
-	"github.com/conformal/go-socks"
 	"net"
 	"os"
 	"path/filepath"
@@ -22,6 +15,14 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/conformal/btcdb"
+	_ "github.com/conformal/btcdb/ldb"
+	_ "github.com/conformal/btcdb/memdb"
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
+	flags "github.com/conformal/go-flags"
+	socks "github.com/conformal/go-socks"
 )
 
 const (

cpuminer.go

@@ -6,13 +6,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/conformal/btcchain"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
 	"math/rand"
 	"runtime"
 	"sync"
 	"time"
+
+	"github.com/conformal/btcchain"
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
 )
 
 const (

log.go

@@ -6,14 +6,15 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"time"
+
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btclog"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwire"
 	"github.com/conformal/seelog"
-	"os"
-	"time"
 )
 
 const (

mempool.go

@@ -8,15 +8,16 @@ import (
 	"container/list"
 	"crypto/rand"
 	"fmt"
+	"math"
+	"math/big"
+	"sync"
+	"time"
+
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"math"
-	"math/big"
-	"sync"
-	"time"
 )
 
 // TxRuleError identifies a rule violation.  It is used to indicate that

mining.go

@@ -8,12 +8,13 @@ import (
 	"container/heap"
 	"container/list"
 	"fmt"
+	"time"
+
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"time"
 )
 
 const (

mruinvmap.go

@@ -7,6 +7,7 @@ package main
 import (
 	"container/list"
 	"fmt"
+
 	"github.com/conformal/btcwire"
 )
 

mruinvmap_test.go

@@ -6,8 +6,9 @@ package main
 
 import (
 	"crypto/rand"
-	"github.com/conformal/btcwire"
 	"testing"
+
+	"github.com/conformal/btcwire"
 )
 
 // BenchmarkMruInventoryList performs basic benchmarks on the most recently

peer.go

@@ -8,17 +8,18 @@ import (
 	"bytes"
 	"container/list"
 	"fmt"
-	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
-	"github.com/conformal/go-socks"
-	"github.com/davecgh/go-spew/spew"
 	"net"
 	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/conformal/btcchain"
+	"github.com/conformal/btcdb"
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
+	socks "github.com/conformal/go-socks"
+	"github.com/davecgh/go-spew/spew"
 )
 
 const (

rpcserver.go

@@ -13,16 +13,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
-	"github.com/conformal/btcjson"
-	"github.com/conformal/btcnet"
-	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
-	"github.com/conformal/btcws"
-	"github.com/conformal/fastsha256"
-	"github.com/conformal/websocket"
 	"io"
 	"io/ioutil"
 	"math/big"
@@ -34,6 +24,17 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/conformal/btcchain"
+	"github.com/conformal/btcdb"
+	"github.com/conformal/btcjson"
+	"github.com/conformal/btcnet"
+	"github.com/conformal/btcscript"
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
+	"github.com/conformal/btcws"
+	"github.com/conformal/fastsha256"
+	"github.com/conformal/websocket"
 )
 
 const (

rpcwebsocket.go

@@ -6,7 +6,6 @@ package main
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/ripemd160"
 	"container/list"
 	"crypto/subtle"
 	"encoding/base64"
@@ -14,6 +13,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"sync"
+	"time"
+
+	"code.google.com/p/go.crypto/ripemd160"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcutil"
@@ -21,9 +25,6 @@ import (
 	"github.com/conformal/btcws"
 	"github.com/conformal/fastsha256"
 	"github.com/conformal/websocket"
-	"io"
-	"sync"
-	"time"
 )
 
 const (

server.go

@@ -10,10 +10,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/conformal/btcdb"
-	"github.com/conformal/btcjson"
-	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 	"math"
 	"net"
 	"runtime"
@@ -21,6 +17,11 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/conformal/btcdb"
+	"github.com/conformal/btcjson"
+	"github.com/conformal/btcnet"
+	"github.com/conformal/btcwire"
 )
 
 const (

service_windows.go

@@ -6,12 +6,13 @@ package main
 
 import (
 	"fmt"
-	"github.com/conformal/winsvc/eventlog"
-	"github.com/conformal/winsvc/mgr"
-	"github.com/conformal/winsvc/svc"
 	"os"
 	"path/filepath"
 	"time"
+
+	"github.com/conformal/winsvc/eventlog"
+	"github.com/conformal/winsvc/mgr"
+	"github.com/conformal/winsvc/svc"
 )
 
 const (

util/addblock/addblock.go

@@ -5,14 +5,15 @@
 package main
 
 import (
+	"os"
+	"path/filepath"
+	"runtime"
+
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/limits"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btclog"
-	"os"
-	"path/filepath"
-	"runtime"
 )
 
 const (

util/addblock/config.go

@@ -6,14 +6,15 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"github.com/conformal/go-flags"
+	flags "github.com/conformal/go-flags"
-	"os"
-	"path/filepath"
 )
 
 const (

util/addblock/import.go

@@ -7,14 +7,15 @@ package main
 import (
 	"encoding/binary"
 	"fmt"
+	"io"
+	"sync"
+	"time"
+
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"io"
-	"sync"
-	"time"
 )
 
 var zeroHash = btcwire.ShaHash{}

util/btcctl/btcctl.go

@@ -5,15 +5,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/conformal/btcjson"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcws"
-	"github.com/conformal/go-flags"
-	"github.com/davecgh/go-spew/spew"
 	"io/ioutil"
 	"os"
 	"sort"
 	"strconv"
+
+	"github.com/conformal/btcjson"
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcws"
+	flags "github.com/conformal/go-flags"
+	"github.com/davecgh/go-spew/spew"
 )
 
 // conversionHandler is a handler that is used to convert parameters from the

util/btcctl/config.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	"fmt"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/go-flags"
 	"net"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/conformal/btcutil"
+	flags "github.com/conformal/go-flags"
 )
 
 var (

util/dropafter/dropafter.go

@@ -7,15 +7,16 @@ package main
 import (
 	"errors"
 	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btclog"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"github.com/conformal/go-flags"
+	flags "github.com/conformal/go-flags"
-	"os"
-	"path/filepath"
-	"strconv"
 )
 
 type ShaHash btcwire.ShaHash

util/findcheckpoint/config.go

@@ -6,14 +6,15 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"github.com/conformal/go-flags"
+	flags "github.com/conformal/go-flags"
-	"os"
-	"path/filepath"
 )
 
 const (

util/findcheckpoint/findcheckpoint.go

@@ -6,13 +6,14 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwire"
-	"os"
-	"path/filepath"
 )
 
 const blockDbNamePrefix = "blocks"

util/gencerts/gencerts.go

@@ -6,13 +6,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/go-flags"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/conformal/btcutil"
+	flags "github.com/conformal/go-flags"
 )
 
 type config struct {

util/showblock/showblock.go

@@ -7,17 +7,18 @@ package main
 import (
 	"encoding/binary"
 	"errors"
+	"io"
+	"os"
+	"path/filepath"
+	"strconv"
+
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btclog"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"github.com/conformal/go-flags"
+	flags "github.com/conformal/go-flags"
 	"github.com/davecgh/go-spew/spew"
-	"io"
-	"os"
-	"path/filepath"
-	"strconv"
 )
 
 type ShaHash btcwire.ShaHash