cosmetic: goimports -w .

ipam/allocate.go

@@ -2,6 +2,7 @@ package ipam
 
 import (
 	"fmt"
+
 	"github.com/weaveworks/weave/ipam/address"
 )
 

ipam/paxos/paxos.go

@@ -2,6 +2,7 @@ package paxos
 
 import (
 	"fmt"
+
 	"github.com/weaveworks/weave/router"
 )
 

ipam/paxos/paxos_test.go

@@ -2,10 +2,11 @@ package paxos
 
 import (
 	"fmt"
-	"github.com/weaveworks/weave/router"
 	"math/rand"
 	"testing"
 	"time"
+
+	"github.com/weaveworks/weave/router"
 )
 
 type TestNode struct {

router/crypto.go

@@ -1,15 +1,16 @@
 package router
 
 import (
-	"code.google.com/p/go-bit/bit"
-	"code.google.com/p/go.crypto/nacl/box"
-	"code.google.com/p/go.crypto/nacl/secretbox"
 	"crypto/rand"
 	"crypto/sha256"
 	"encoding/binary"
 	"encoding/gob"
 	"fmt"
 	"sync"
+
+	"code.google.com/p/go-bit/bit"
+	"code.google.com/p/go.crypto/nacl/box"
+	"code.google.com/p/go.crypto/nacl/secretbox"
 )
 
 func GenerateKeyPair() (publicKey, privateKey *[32]byte, err error) {

router/ethernet_decoder.go

@@ -2,10 +2,11 @@ package router
 
 import (
 	"bytes"
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/layers"
 	"log"
 	"net"
+
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
 type EthernetDecoder struct {

router/forwarder.go

@@ -1,10 +1,11 @@
 package router
 
 import (
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/layers"
 	"syscall"
 	"time"
+
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
 type ForwardedFrame struct {

router/handshake_test.go

@@ -1,8 +1,9 @@
 package router
 
 import (
-	wt "github.com/weaveworks/weave/testing"
 	"testing"
+
+	wt "github.com/weaveworks/weave/testing"
 )
 
 func TestFieldValidator(t *testing.T) {

router/mocks_test.go

@@ -6,8 +6,9 @@
 package router
 
 import (
-	wt "github.com/weaveworks/weave/testing"
 	"testing"
+
+	wt "github.com/weaveworks/weave/testing"
 )
 
 // Add to peers a connection from peers.ourself to p

router/pcap.go

@@ -2,6 +2,7 @@ package router
 
 import (
 	"fmt"
+
 	"github.com/google/gopacket/pcap"
 )
 

router/peers_test.go

@@ -2,9 +2,10 @@ package router
 
 import (
 	"fmt"
-	wt "github.com/weaveworks/weave/testing"
 	"math/rand"
 	"testing"
+
+	wt "github.com/weaveworks/weave/testing"
 )
 
 // TODO we should also test:

router/udp_sender.go

@@ -1,11 +1,12 @@
 package router
 
 import (
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/layers"
 	"log"
 	"net"
 	"syscall"
+
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
 type UDPSender interface {