Go fmt -w

accounts/usbwallet/hub.go

@@ -22,10 +22,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/karalabe/hid"
 	"github.com/orangeAndSuns/go-ethereum/accounts"
 	"github.com/orangeAndSuns/go-ethereum/event"
 	"github.com/orangeAndSuns/go-ethereum/log"
-	"github.com/karalabe/hid"
 )
 
 // LedgerScheme is the protocol scheme prefixing account and wallet URLs.

accounts/usbwallet/trezor.go

@@ -27,13 +27,13 @@ import (
 	"io"
 	"math/big"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/orangeAndSuns/go-ethereum/accounts"
 	"github.com/orangeAndSuns/go-ethereum/accounts/usbwallet/internal/trezor"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/common/hexutil"
 	"github.com/orangeAndSuns/go-ethereum/core/types"
 	"github.com/orangeAndSuns/go-ethereum/log"
-	"github.com/golang/protobuf/proto"
 )
 
 // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In

accounts/usbwallet/wallet.go

@@ -25,12 +25,12 @@ import (
 	"sync"
 	"time"
 
+	"github.com/karalabe/hid"
 	ethereum "github.com/orangeAndSuns/go-ethereum"
 	"github.com/orangeAndSuns/go-ethereum/accounts"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/core/types"
 	"github.com/orangeAndSuns/go-ethereum/log"
-	"github.com/karalabe/hid"
 )
 
 // Maximum time between wallet health checks to detect USB unplugs.

cmd/geth/config.go

@@ -27,13 +27,13 @@ import (
 
 	cli "gopkg.in/urfave/cli.v1"
 
+	"github.com/naoina/toml"
 	"github.com/orangeAndSuns/go-ethereum/cmd/utils"
 	"github.com/orangeAndSuns/go-ethereum/dashboard"
 	"github.com/orangeAndSuns/go-ethereum/eth"
 	"github.com/orangeAndSuns/go-ethereum/node"
 	"github.com/orangeAndSuns/go-ethereum/params"
 	whisper "github.com/orangeAndSuns/go-ethereum/whisper/whisperv6"
-	"github.com/naoina/toml"
 )
 
 var (

cmd/geth/monitorcmd.go

@@ -25,10 +25,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gizak/termui"
 	"github.com/orangeAndSuns/go-ethereum/cmd/utils"
 	"github.com/orangeAndSuns/go-ethereum/node"
 	"github.com/orangeAndSuns/go-ethereum/rpc"
-	"github.com/gizak/termui"
 	"gopkg.in/urfave/cli.v1"
 )
 

cmd/puppeth/wizard_netstats.go

@@ -23,9 +23,9 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/olekukonko/tablewriter"
 	"github.com/orangeAndSuns/go-ethereum/core"
 	"github.com/orangeAndSuns/go-ethereum/log"
-	"github.com/olekukonko/tablewriter"
 )
 
 // networkStats verifies the status of network components and generates a protip

cmd/swarm/config.go

@@ -29,11 +29,11 @@ import (
 
 	cli "gopkg.in/urfave/cli.v1"
 
+	"github.com/naoina/toml"
 	"github.com/orangeAndSuns/go-ethereum/cmd/utils"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/node"
-	"github.com/naoina/toml"
 
 	bzzapi "github.com/orangeAndSuns/go-ethereum/swarm/api"
 )

cmd/swarm/fs_test.go

@@ -28,8 +28,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/orangeAndSuns/go-ethereum/log"
 	colorable "github.com/mattn/go-colorable"
+	"github.com/orangeAndSuns/go-ethereum/log"
 )
 
 func init() {

cmd/swarm/swarm-smoke/main.go

@@ -20,8 +20,8 @@ import (
 	"os"
 	"sort"
 
-	"github.com/orangeAndSuns/go-ethereum/log"
 	colorable "github.com/mattn/go-colorable"
+	"github.com/orangeAndSuns/go-ethereum/log"
 
 	cli "gopkg.in/urfave/cli.v1"
 )

cmd/swarm/upload_test.go

@@ -30,9 +30,9 @@ import (
 	"testing"
 	"time"
 
+	colorable "github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	swarm "github.com/orangeAndSuns/go-ethereum/swarm/api/client"
-	colorable "github.com/mattn/go-colorable"
 )
 
 var loglevel = flag.Int("loglevel", 3, "verbosity of logs")

consensus/clique/clique.go

@@ -25,6 +25,7 @@ import (
 	"sync"
 	"time"
 
+	lru "github.com/hashicorp/golang-lru"
 	"github.com/orangeAndSuns/go-ethereum/accounts"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/common/hexutil"
@@ -39,7 +40,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/params"
 	"github.com/orangeAndSuns/go-ethereum/rlp"
 	"github.com/orangeAndSuns/go-ethereum/rpc"
-	lru "github.com/hashicorp/golang-lru"
 )
 
 const (

consensus/clique/snapshot.go

@@ -21,11 +21,11 @@ import (
 	"encoding/json"
 	"sort"
 
+	lru "github.com/hashicorp/golang-lru"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/core/types"
 	"github.com/orangeAndSuns/go-ethereum/ethdb"
 	"github.com/orangeAndSuns/go-ethereum/params"
-	lru "github.com/hashicorp/golang-lru"
 )
 
 // Vote represents a single vote that an authorized signer made to modify the

consensus/ethash/ethash.go

@@ -33,11 +33,11 @@ import (
 	"unsafe"
 
 	mmap "github.com/edsrzf/mmap-go"
+	"github.com/hashicorp/golang-lru/simplelru"
 	"github.com/orangeAndSuns/go-ethereum/consensus"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/rpc"
-	"github.com/hashicorp/golang-lru/simplelru"
 )
 
 var ErrInvalidDumpMagic = errors.New("invalid dump magic")

console/console.go

@@ -28,10 +28,10 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/internal/jsre"
 	"github.com/orangeAndSuns/go-ethereum/internal/web3ext"
 	"github.com/orangeAndSuns/go-ethereum/rpc"
-	"github.com/mattn/go-colorable"
 	"github.com/peterh/liner"
 	"github.com/robertkrimen/otto"
 )

core/blockchain.go

@@ -27,6 +27,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hashicorp/golang-lru"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/common/mclock"
 	"github.com/orangeAndSuns/go-ethereum/consensus"
@@ -42,7 +43,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/params"
 	"github.com/orangeAndSuns/go-ethereum/rlp"
 	"github.com/orangeAndSuns/go-ethereum/trie"
-	"github.com/hashicorp/golang-lru"
 	"gopkg.in/karalabe/cookiejar.v2/collections/prque"
 )
 

core/headerchain.go

@@ -26,6 +26,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hashicorp/golang-lru"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/consensus"
 	"github.com/orangeAndSuns/go-ethereum/core/rawdb"
@@ -33,7 +34,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/ethdb"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/params"
-	"github.com/hashicorp/golang-lru"
 )
 
 const (

core/state/database.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"sync"
 
+	lru "github.com/hashicorp/golang-lru"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/ethdb"
 	"github.com/orangeAndSuns/go-ethereum/trie"
-	lru "github.com/hashicorp/golang-lru"
 )
 
 // Trie cache generation limit after which to evict trie nodes from memory.

dashboard/dashboard.go

@@ -35,12 +35,12 @@ import (
 	"io"
 
 	"github.com/elastic/gosigar"
+	"github.com/mohae/deepcopy"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/p2p"
 	"github.com/orangeAndSuns/go-ethereum/params"
 	"github.com/orangeAndSuns/go-ethereum/rpc"
-	"github.com/mohae/deepcopy"
 	"golang.org/x/net/websocket"
 )
 

dashboard/log.go

@@ -26,8 +26,8 @@ import (
 	"sort"
 	"time"
 
-	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/mohae/deepcopy"
+	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/rjeczalik/notify"
 )
 

internal/debug/flags.go

@@ -24,12 +24,12 @@ import (
 	"os"
 	"runtime"
 
+	"github.com/fjl/memsize/memsizeui"
+	colorable "github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/log/term"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/metrics/exp"
-	"github.com/fjl/memsize/memsizeui"
-	colorable "github.com/mattn/go-colorable"
 	"gopkg.in/urfave/cli.v1"
 )
 

light/lightchain.go

@@ -24,6 +24,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hashicorp/golang-lru"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/consensus"
 	"github.com/orangeAndSuns/go-ethereum/core"
@@ -35,7 +36,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/params"
 	"github.com/orangeAndSuns/go-ethereum/rlp"
-	"github.com/hashicorp/golang-lru"
 )
 
 var (

metrics/influxdb/influxdb.go

@@ -5,9 +5,9 @@ import (
 	uurl "net/url"
 	"time"
 
+	"github.com/influxdata/influxdb/client"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
-	"github.com/influxdata/influxdb/client"
 )
 
 type reporter struct {

p2p/dial_test.go

@@ -78,11 +78,11 @@ func runDialTest(t *testing.T, test dialtest) {
 
 type fakeTable []*discover.Node
 
-func (t fakeTable) Self() *discover.Node                     { return new(discover.Node) }
+func (t fakeTable) Self() *discover.Node                       { return new(discover.Node) }
-func (t fakeTable) Close()                                   {}
+func (t fakeTable) Close()                                     {}
-func (t fakeTable) Lookup(discover.ESSNodeID) []*discover.Node  { return nil }
+func (t fakeTable) Lookup(discover.ESSNodeID) []*discover.Node { return nil }
-func (t fakeTable) Resolve(discover.ESSNodeID) *discover.Node   { return nil }
+func (t fakeTable) Resolve(discover.ESSNodeID) *discover.Node  { return nil }
-func (t fakeTable) ReadRandomNodes(buf []*discover.Node) int { return copy(buf, t) }
+func (t fakeTable) ReadRandomNodes(buf []*discover.Node) int   { return copy(buf, t) }
 
 // This test checks that dynamic dials are launched from discovery results.
 func TestDialStateDynDial(t *testing.T) {
@@ -689,8 +689,8 @@ func (t *resolveMock) Resolve(id discover.ESSNodeID) *discover.Node {
 	return t.answer
 }
 
-func (t *resolveMock) Self() *discover.Node                     { return new(discover.Node) }
+func (t *resolveMock) Self() *discover.Node                       { return new(discover.Node) }
-func (t *resolveMock) Close()                                   {}
+func (t *resolveMock) Close()                                     {}
-func (t *resolveMock) Bootstrap([]*discover.Node)               {}
+func (t *resolveMock) Bootstrap([]*discover.Node)                 {}
-func (t *resolveMock) Lookup(discover.ESSNodeID) []*discover.Node  { return nil }
+func (t *resolveMock) Lookup(discover.ESSNodeID) []*discover.Node { return nil }
-func (t *resolveMock) ReadRandomNodes(buf []*discover.Node) int { return 0 }
+func (t *resolveMock) ReadRandomNodes(buf []*discover.Node) int   { return 0 }

p2p/discover/database.go

@@ -39,7 +39,7 @@ import (
 )
 
 var (
-	nodeDBNilESSNodeID      = ESSNodeID{}       // Special node ID to use as a nil element.
+	nodeDBNilESSNodeID   = ESSNodeID{}    // Special node ID to use as a nil element.
 	nodeDBNodeExpiration = 24 * time.Hour // Time after which an unseen node should be dropped.
 	nodeDBCleanupCycle   = time.Hour      // Time period for running the expiration task.
 	nodeDBVersion        = 5
@@ -48,7 +48,7 @@ var (
 // nodeDB stores all nodes we know about.
 type nodeDB struct {
 	lvl    *leveldb.DB   // Interface to the database itself
-	self   ESSNodeID        // Own node id to prevent adding it into the database
+	self   ESSNodeID     // Own node id to prevent adding it into the database
 	runner sync.Once     // Ensures we can start at most one expirer
 	quit   chan struct{} // Channel to signal the expiring thread to stop
 }

p2p/discover/node.go

@@ -41,8 +41,8 @@ const ESSNodeIDBits = 512
 // Node represents a host on the network.
 // The fields of Node may not be modified.
 type Node struct {
-	IP       net.IP // len 4 for IPv4 or 16 for IPv6
+	IP       net.IP    // len 4 for IPv4 or 16 for IPv6
-	UDP, TCP uint16 // port numbers
+	UDP, TCP uint16    // port numbers
 	ID       ESSNodeID // the node's public key
 
 	// This is a cached copy of sha3(ID) which is used for node

p2p/discover/table_test.go

@@ -570,7 +570,7 @@ func (tn *preminedTestnet) findnode(toid ESSNodeID, toaddr *net.UDPAddr, target
 	return result, nil
 }
 
-func (*preminedTestnet) close()                                      {}
+func (*preminedTestnet) close()                                         {}
 func (*preminedTestnet) waitping(from ESSNodeID) error                  { return nil }
 func (*preminedTestnet) ping(toid ESSNodeID, toaddr *net.UDPAddr) error { return nil }
 

p2p/discv5/database.go

@@ -40,7 +40,7 @@ import (
 )
 
 var (
-	nodeDBNilESSNodeID      = ESSNodeID{}       // Special node ID to use as a nil element.
+	nodeDBNilESSNodeID   = ESSNodeID{}    // Special node ID to use as a nil element.
 	nodeDBNodeExpiration = 24 * time.Hour // Time after which an unseen node should be dropped.
 	nodeDBCleanupCycle   = time.Hour      // Time period for running the expiration task.
 )
@@ -48,7 +48,7 @@ var (
 // nodeDB stores all nodes we know about.
 type nodeDB struct {
 	lvl    *leveldb.DB   // Interface to the database itself
-	self   ESSNodeID        // Own node id to prevent adding it into the database
+	self   ESSNodeID     // Own node id to prevent adding it into the database
 	runner sync.Once     // Ensures we can start at most one expirer
 	quit   chan struct{} // Channel to signal the expiring thread to stop
 }

p2p/discv5/node.go

@@ -37,8 +37,8 @@ import (
 // Node represents a host on the network.
 // The public fields of Node may not be modified.
 type Node struct {
-	IP       net.IP // len 4 for IPv4 or 16 for IPv6
+	IP       net.IP    // len 4 for IPv4 or 16 for IPv6
-	UDP, TCP uint16 // port numbers
+	UDP, TCP uint16    // port numbers
 	ID       ESSNodeID // the node's public key
 
 	// Network-related fields are contained in nodeNetGuts.

p2p/discv5/table_test.go

@@ -35,7 +35,7 @@ type nullTransport struct{}
 
 func (nullTransport) sendPing(remote *Node, remoteAddr *net.UDPAddr) []byte { return []byte{1} }
 func (nullTransport) sendPong(remote *Node, pingHash []byte)                {}
-func (nullTransport) sendFindnode(remote *Node, target ESSNodeID)              {}
+func (nullTransport) sendFindnode(remote *Node, target ESSNodeID)           {}
 func (nullTransport) sendNeighbours(remote *Node, nodes []*Node)            {}
 func (nullTransport) localAddr() *net.UDPAddr                               { return new(net.UDPAddr) }
 func (nullTransport) Close()                                                {}

p2p/nat/nat.go

@@ -25,8 +25,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/jackpal/go-nat-pmp"
+	"github.com/orangeAndSuns/go-ethereum/log"
 )
 
 // An implementation of nat.Interface can map local ports to ports

p2p/peer.go

@@ -90,12 +90,12 @@ const (
 // PeerEvent is an event emitted when peers are either added or dropped from
 // a p2p.Server or when a message is sent or received on a peer connection
 type PeerEvent struct {
-	Type     PeerEventType   `json:"type"`
+	Type     PeerEventType      `json:"type"`
 	Peer     discover.ESSNodeID `json:"peer"`
-	Error    string          `json:"error,omitempty"`
+	Error    string             `json:"error,omitempty"`
-	Protocol string          `json:"protocol,omitempty"`
+	Protocol string             `json:"protocol,omitempty"`
-	MsgCode  *uint64         `json:"msg_code,omitempty"`
+	MsgCode  *uint64            `json:"msg_code,omitempty"`
-	MsgSize  *uint32         `json:"msg_size,omitempty"`
+	MsgSize  *uint32            `json:"msg_size,omitempty"`
 }
 
 // Peer represents a connected remote node.

p2p/protocols/protocol.go

@@ -38,13 +38,13 @@ import (
 	"sync"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/p2p"
 	"github.com/orangeAndSuns/go-ethereum/rlp"
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
 	"github.com/orangeAndSuns/go-ethereum/swarm/tracing"
-	opentracing "github.com/opentracing/opentracing-go"
 )
 
 // error codes used by this  protocol scheme

p2p/rlpx.go

@@ -35,13 +35,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/golang/snappy"
 	"github.com/orangeAndSuns/go-ethereum/crypto"
 	"github.com/orangeAndSuns/go-ethereum/crypto/ecies"
 	"github.com/orangeAndSuns/go-ethereum/crypto/secp256k1"
 	"github.com/orangeAndSuns/go-ethereum/crypto/sha3"
 	"github.com/orangeAndSuns/go-ethereum/p2p/discover"
 	"github.com/orangeAndSuns/go-ethereum/rlp"
-	"github.com/golang/snappy"
 )
 
 const (

p2p/server.go

@@ -200,10 +200,10 @@ type conn struct {
 	fd net.Conn
 	transport
 	flags connFlag
-	cont  chan error      // The run loop uses cont to signal errors to SetupConn.
+	cont  chan error         // The run loop uses cont to signal errors to SetupConn.
 	id    discover.ESSNodeID // valid after the encryption handshake
-	caps  []Cap           // valid after the protocol handshake
+	caps  []Cap              // valid after the protocol handshake
-	name  string          // valid after the protocol handshake
+	name  string             // valid after the protocol handshake
 }
 
 type transport interface {

p2p/simulations/http.go

@@ -29,12 +29,12 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/julienschmidt/httprouter"
 	"github.com/orangeAndSuns/go-ethereum/event"
 	"github.com/orangeAndSuns/go-ethereum/p2p"
 	"github.com/orangeAndSuns/go-ethereum/p2p/discover"
 	"github.com/orangeAndSuns/go-ethereum/p2p/simulations/adapters"
 	"github.com/orangeAndSuns/go-ethereum/rpc"
-	"github.com/julienschmidt/httprouter"
 	"golang.org/x/net/websocket"
 )
 

p2p/simulations/network.go

@@ -598,9 +598,9 @@ func (c *Conn) String() string {
 type Msg struct {
 	One      discover.ESSNodeID `json:"one"`
 	Other    discover.ESSNodeID `json:"other"`
-	Protocol string          `json:"protocol"`
+	Protocol string             `json:"protocol"`
-	Code     uint64          `json:"code"`
+	Code     uint64             `json:"code"`
-	Received bool            `json:"received"`
+	Received bool               `json:"received"`
 }
 
 // String returns a log-friendly string

p2p/testing/protocolsession.go

@@ -56,25 +56,25 @@ type Exchange struct {
 // Trigger is part of the exchange, incoming message for the pivot node
 // sent by a peer
 type Trigger struct {
-	Msg     interface{}     // type of message to be sent
+	Msg     interface{}        // type of message to be sent
-	Code    uint64          // code of message is given
+	Code    uint64             // code of message is given
 	Peer    discover.ESSNodeID // the peer to send the message to
-	Timeout time.Duration   // timeout duration for the sending
+	Timeout time.Duration      // timeout duration for the sending
 }
 
 // Expect is part of an exchange, outgoing message from the pivot node
 // received by a peer
 type Expect struct {
-	Msg     interface{}     // type of message to expect
+	Msg     interface{}        // type of message to expect
-	Code    uint64          // code of message is now given
+	Code    uint64             // code of message is now given
 	Peer    discover.ESSNodeID // the peer that expects the message
-	Timeout time.Duration   // timeout duration for receiving
+	Timeout time.Duration      // timeout duration for receiving
 }
 
 // Disconnect represents a disconnect event, used and checked by TestDisconnected
 type Disconnect struct {
 	Peer  discover.ESSNodeID // discconnected peer
-	Error error           // disconnect reason
+	Error error              // disconnect reason
 }
 
 // trigger sends messages from peers

signer/storage/aes_gcm_storage_test.go

@@ -22,9 +22,9 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/log"
-	"github.com/mattn/go-colorable"
 )
 
 func TestEncryption(t *testing.T) {

swarm/api/api.go

@@ -31,6 +31,7 @@ import (
 	"path/filepath"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/contracts/ens"
 	"github.com/orangeAndSuns/go-ethereum/core/types"
@@ -40,7 +41,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage/mru"
-	opentracing "github.com/opentracing/opentracing-go"
 )
 
 var (

swarm/api/config.go

@@ -58,7 +58,7 @@ type Config struct {
 	Port              string
 	PublicKey         string
 	BzzKey            string
-	ESSNodeID            string
+	ESSNodeID         string
 	NetworkID         uint64
 	SwapEnabled       bool
 	SyncEnabled       bool

swarm/api/http/server.go

@@ -37,6 +37,7 @@ import (
 	"strings"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/swarm/api"
@@ -44,7 +45,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage/mru"
-	opentracing "github.com/opentracing/opentracing-go"
 
 	"github.com/pborman/uuid"
 	"github.com/rs/cors"

swarm/network/protocol.go

@@ -80,7 +80,7 @@ type Peer interface {
 
 // Conn interface represents an live peer connection
 type Conn interface {
-	ID() discover.ESSNodeID                                                                  // the key that uniquely identifies the Node for the peerPool
+	ID() discover.ESSNodeID                                                               // the key that uniquely identifies the Node for the peerPool
 	Handshake(context.Context, interface{}, func(interface{}) error) (interface{}, error) // can send messages
 	Send(context.Context, interface{}) error                                              // can send messages
 	Drop(error)                                                                           // disconnect this peer

swarm/network/simulation/simulation.go

@@ -43,13 +43,13 @@ type Simulation struct {
 	// of p2p/simulations.Network.
 	Net *simulations.Network
 
-	serviceNames []string
+	serviceNames   []string
-	cleanupFuncs []func()
+	cleanupFuncs   []func()
-	buckets      map[discover.ESSNodeID]*sync.Map
+	buckets        map[discover.ESSNodeID]*sync.Map
-	pivotESSNodeID  *discover.ESSNodeID
+	pivotESSNodeID *discover.ESSNodeID
-	shutdownWG   sync.WaitGroup
+	shutdownWG     sync.WaitGroup
-	done         chan struct{}
+	done           chan struct{}
-	mu           sync.RWMutex
+	mu             sync.RWMutex
 
 	httpSrv *http.Server        //attach a HTTP server via SimulationOptions
 	handler *simulations.Server //HTTP handler for the server

swarm/network/simulation/simulation_test.go

@@ -24,12 +24,12 @@ import (
 	"testing"
 	"time"
 
+	colorable "github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/node"
 	"github.com/orangeAndSuns/go-ethereum/p2p"
 	"github.com/orangeAndSuns/go-ethereum/p2p/simulations/adapters"
 	"github.com/orangeAndSuns/go-ethereum/rpc"
-	colorable "github.com/mattn/go-colorable"
 )
 
 var (

swarm/network/simulations/discovery/discovery_test.go

@@ -31,6 +31,7 @@ import (
 	"testing"
 	"time"
 
+	colorable "github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/node"
@@ -40,7 +41,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/p2p/simulations/adapters"
 	"github.com/orangeAndSuns/go-ethereum/swarm/network"
 	"github.com/orangeAndSuns/go-ethereum/swarm/state"
-	colorable "github.com/mattn/go-colorable"
 )
 
 // serviceName is used with the exec adapter so the exec'd binary knows which

swarm/network/simulations/overlay.go

@@ -27,6 +27,7 @@ import (
 	"sync"
 	"time"
 
+	colorable "github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/node"
 	"github.com/orangeAndSuns/go-ethereum/p2p/discover"
@@ -34,7 +35,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/p2p/simulations/adapters"
 	"github.com/orangeAndSuns/go-ethereum/swarm/network"
 	"github.com/orangeAndSuns/go-ethereum/swarm/state"
-	colorable "github.com/mattn/go-colorable"
 )
 
 var (

swarm/network/stream/common_test.go

@@ -29,6 +29,7 @@ import (
 	"testing"
 	"time"
 
+	colorable "github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/node"
@@ -42,7 +43,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage/mock"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage/mock/db"
-	colorable "github.com/mattn/go-colorable"
 )
 
 var (

swarm/network/stream/delivery.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/common"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/p2p/discover"
@@ -28,7 +29,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/swarm/network"
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
-	opentracing "github.com/opentracing/opentracing-go"
 )
 
 const (

swarm/network/stream/messages.go

@@ -23,12 +23,12 @@ import (
 	"sync"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/swarm/log"
 	bv "github.com/orangeAndSuns/go-ethereum/swarm/network/bitvector"
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
-	opentracing "github.com/opentracing/opentracing-go"
 )
 
 // Stream defines a unique stream identifier.

swarm/network/stream/peer.go

@@ -22,6 +22,7 @@ import (
 	"sync"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/p2p/protocols"
 	"github.com/orangeAndSuns/go-ethereum/swarm/log"
@@ -30,7 +31,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
 	"github.com/orangeAndSuns/go-ethereum/swarm/state"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
-	opentracing "github.com/opentracing/opentracing-go"
 )
 
 var sendTimeout = 30 * time.Second

swarm/network/stream/stream.go

@@ -23,6 +23,7 @@ import (
 	"sync"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/p2p"
 	"github.com/orangeAndSuns/go-ethereum/p2p/discover"
@@ -35,7 +36,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
 	"github.com/orangeAndSuns/go-ethereum/swarm/state"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
-	opentracing "github.com/opentracing/opentracing-go"
 )
 
 const (

swarm/network_test.go

@@ -28,6 +28,7 @@ import (
 	"testing"
 	"time"
 
+	colorable "github.com/mattn/go-colorable"
 	"github.com/orangeAndSuns/go-ethereum/crypto"
 	"github.com/orangeAndSuns/go-ethereum/log"
 	"github.com/orangeAndSuns/go-ethereum/node"
@@ -37,7 +38,6 @@ import (
 	"github.com/orangeAndSuns/go-ethereum/swarm/network"
 	"github.com/orangeAndSuns/go-ethereum/swarm/network/simulation"
 	"github.com/orangeAndSuns/go-ethereum/swarm/storage"
-	colorable "github.com/mattn/go-colorable"
 )
 
 var (

swarm/storage/chunker.go

@@ -24,11 +24,11 @@ import (
 	"sync"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
+	olog "github.com/opentracing/opentracing-go/log"
 	"github.com/orangeAndSuns/go-ethereum/metrics"
 	"github.com/orangeAndSuns/go-ethereum/swarm/log"
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
-	opentracing "github.com/opentracing/opentracing-go"
-	olog "github.com/opentracing/opentracing-go/log"
 )
 
 /*

swarm/storage/common_test.go

@@ -27,8 +27,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/orangeAndSuns/go-ethereum/log"
 	colorable "github.com/mattn/go-colorable"
+	"github.com/orangeAndSuns/go-ethereum/log"
 )
 
 var (

swarm/storage/netstore.go

@@ -20,9 +20,9 @@ import (
 	"context"
 	"time"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/orangeAndSuns/go-ethereum/swarm/log"
 	"github.com/orangeAndSuns/go-ethereum/swarm/spancontext"
-	opentracing "github.com/opentracing/opentracing-go"
 )
 
 var (

vendor/bazil.org/fuse/fuse.go

@@ -286,7 +286,7 @@ const RootID ESSNodeID = rootID
 type Header struct {
 	Conn *Conn     `json:"-"` // connection this request was received on
 	ID   RequestID // unique ID for request
-	Node ESSNodeID    // file or directory the request is about
+	Node ESSNodeID // file or directory the request is about
 	Uid  uint32    // user ID of process making request
 	Gid  uint32    // group ID of process making request
 	Pid  uint32    // process ID of process making request

vendor/github.com/uber/jaeger-client-go/thrift/protocol.go

@@ -89,8 +89,8 @@ func SkipDefaultDepth(prot TProtocol, typeId TType) (err error) {
 // Skips over the next data element from the provided input TProtocol object.
 func Skip(self TProtocol, fieldType TType, maxDepth int) (err error) {
 
-    if maxDepth <= 0 {
+	if maxDepth <= 0 {
-		return NewTProtocolExceptionWithType( DEPTH_LIMIT, errors.New("Depth limit exceeded"))
+		return NewTProtocolExceptionWithType(DEPTH_LIMIT, errors.New("Depth limit exceeded"))
 	}
 
 	switch fieldType {

vendor/github.com/uber/jaeger-client-go/thrift/protocol_exception.go

@@ -60,7 +60,7 @@ func NewTProtocolException(err error) TProtocolException {
 	if err == nil {
 		return nil
 	}
-	if e,ok := err.(TProtocolException); ok {
+	if e, ok := err.(TProtocolException); ok {
 		return e
 	}
 	if _, ok := err.(base64.CorruptInputError); ok {
@@ -75,4 +75,3 @@ func NewTProtocolExceptionWithType(errType int, err error) TProtocolException {
 	}
 	return &tProtocolException{errType, err.Error()}
 }
-

vendor/github.com/uber/jaeger-client-go/thrift/rich_transport.go

@@ -66,4 +66,3 @@ func writeByte(w io.Writer, c byte) error {
 	_, err := w.Write(v[0:1])
 	return err
 }
-

vendor/github.com/uber/jaeger-client-go/thrift/transport.go

@@ -34,7 +34,6 @@ type ReadSizeProvider interface {
 	RemainingBytes() (num_bytes uint64)
 }
 
-
 // Encapsulates the I/O layer
 type TTransport interface {
 	io.ReadWriteCloser
@@ -52,7 +51,6 @@ type stringWriter interface {
 	WriteString(s string) (n int, err error)
 }
 
-
 // This is "enchanced" transport with extra capabilities. You need to use one of these
 // to construct protocol.
 // Notably, TSocket does not implement this interface, and it is always a mistake to use
@@ -65,4 +63,3 @@ type TRichTransport interface {
 	Flusher
 	ReadSizeProvider
 }
-