diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go index dfcc5ac4bf16735e3d20b8b1cfcd0e07b59074f5..66005b04e986024055d5332190a9dd6a71b37002 100644 --- a/accounts/scwallet/hub.go +++ b/accounts/scwallet/hub.go @@ -41,11 +41,11 @@ import ( "sync" "time" + pcsc "github.com/gballet/go-libpcsclite" "github.com/maticnetwork/bor/accounts" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/event" "github.com/maticnetwork/bor/log" - pcsc "github.com/gballet/go-libpcsclite" ) // Scheme is the URI prefix for smartcard wallets. diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go index 3d0be4728ea2161a4b24c8174efcb77c84c7feef..7f0a8df4ac9a7fb4f636bcff734ed50f86d58b94 100644 --- a/accounts/scwallet/securechannel.go +++ b/accounts/scwallet/securechannel.go @@ -25,8 +25,8 @@ import ( "crypto/sha512" "fmt" - "github.com/maticnetwork/bor/crypto" pcsc "github.com/gballet/go-libpcsclite" + "github.com/maticnetwork/bor/crypto" "github.com/wsddn/go-ecdh" "golang.org/x/crypto/pbkdf2" "golang.org/x/text/unicode/norm" diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go index 540bcc1a60dffe9e528545c62529387c1c523d70..6b986ff946c34a4d3b447a91111944947ae21f28 100644 --- a/accounts/scwallet/wallet.go +++ b/accounts/scwallet/wallet.go @@ -33,13 +33,13 @@ import ( "sync" "time" + pcsc "github.com/gballet/go-libpcsclite" ethereum "github.com/maticnetwork/bor" "github.com/maticnetwork/bor/accounts" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/core/types" "github.com/maticnetwork/bor/crypto" "github.com/maticnetwork/bor/log" - pcsc "github.com/gballet/go-libpcsclite" "github.com/status-im/keycard-go/derivationpath" ) diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index a80eff5a93a95e5b96a4792f46de5b9419701f5a..e742e49fe01b3818d5f62d3baef15f706e94b3bf 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -23,10 +23,10 @@ import ( "sync/atomic" "time" + "github.com/karalabe/usb" "github.com/maticnetwork/bor/accounts" "github.com/maticnetwork/bor/event" "github.com/maticnetwork/bor/log" - "github.com/karalabe/usb" ) // LedgerScheme is the protocol scheme prefixing account and wallet URLs. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index f88501e32f503c3f471f5917fe228486daf784ac..49c71cb0283b1550bf035c57c0c3a4f4e5afc9f7 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,13 +27,13 @@ import ( "io" "math/big" + "github.com/golang/protobuf/proto" "github.com/maticnetwork/bor/accounts" "github.com/maticnetwork/bor/accounts/usbwallet/trezor" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/common/hexutil" "github.com/maticnetwork/bor/core/types" "github.com/maticnetwork/bor/log" - "github.com/golang/protobuf/proto" ) // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 09a140a756441555a170fa8a9b3b62f1cab23a2f..29f7cf661e9c8291665584b1b3cf273abb8e8d26 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,13 +25,13 @@ import ( "sync" "time" + "github.com/karalabe/usb" ethereum "github.com/maticnetwork/bor" "github.com/maticnetwork/bor/accounts" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/core/types" "github.com/maticnetwork/bor/crypto" "github.com/maticnetwork/bor/log" - "github.com/karalabe/usb" ) // Maximum time between wallet health checks to detect USB unplugs. diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index b90f61176647554ead76da13b30215d89416a91d..799ee16b2dac4521c6459dab1269fc4158ed4a5f 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -26,6 +26,7 @@ import ( "sync" "time" + lru "github.com/hashicorp/golang-lru" "github.com/maticnetwork/bor/accounts" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/common/hexutil" @@ -39,7 +40,6 @@ import ( "github.com/maticnetwork/bor/params" "github.com/maticnetwork/bor/rlp" "github.com/maticnetwork/bor/rpc" - lru "github.com/hashicorp/golang-lru" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 593dfe8b997b17c9c8b8100e02d309cdb47bde53..a4063e351695ac59dd7d1c1706b0a5810299f951 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -22,12 +22,12 @@ import ( "sort" "time" + lru "github.com/hashicorp/golang-lru" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/core/types" "github.com/maticnetwork/bor/ethdb" "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/params" - lru "github.com/hashicorp/golang-lru" ) // Vote represents a single vote that an authorized signer made to modify the diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 999d92012ac5532558521468dc95b4e960d895e0..08a80ae8195d11a1d6628018e7d11be26c3d2ed3 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -34,13 +34,13 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" + "github.com/hashicorp/golang-lru/simplelru" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/consensus" "github.com/maticnetwork/bor/core/types" "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/metrics" "github.com/maticnetwork/bor/rpc" - "github.com/hashicorp/golang-lru/simplelru" ) var ErrInvalidDumpMagic = errors.New("invalid dump magic") diff --git a/core/headerchain.go b/core/headerchain.go index 95634891fe7d3d2a523aeb5a6a1b55b48c9e907e..07775a228ac43cf27ce384004574773f93dd7547 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,6 +26,7 @@ import ( "sync/atomic" "time" + lru "github.com/hashicorp/golang-lru" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/consensus" "github.com/maticnetwork/bor/core/rawdb" @@ -33,7 +34,6 @@ import ( "github.com/maticnetwork/bor/ethdb" "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/params" - lru "github.com/hashicorp/golang-lru" ) const ( diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go index 868d81f6a518bf704629931f52c6a4538a736ab8..33c1ca8b34a2b7278a5a0b6ce9bb78cd0aafc818 100644 --- a/core/rawdb/freezer_table.go +++ b/core/rawdb/freezer_table.go @@ -26,10 +26,10 @@ import ( "sync" "sync/atomic" + "github.com/golang/snappy" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/metrics" - "github.com/golang/snappy" ) var ( diff --git a/core/state/database.go b/core/state/database.go index 834e8ad96b45145932884a9387800cb6f5a8b347..33ab998c611e1277799b2a6fec8ca3059df54777 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -19,10 +19,10 @@ package state import ( "fmt" + lru "github.com/hashicorp/golang-lru" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/ethdb" "github.com/maticnetwork/bor/trie" - lru "github.com/hashicorp/golang-lru" ) const ( diff --git a/graphql/service.go b/graphql/service.go index 473e01b250aacd39715a0f96093252d4dedf10d2..6b2626d927000140133a5705220402a4de58a81a 100644 --- a/graphql/service.go +++ b/graphql/service.go @@ -21,12 +21,12 @@ import ( "net" "net/http" + "github.com/graph-gophers/graphql-go" + "github.com/graph-gophers/graphql-go/relay" "github.com/maticnetwork/bor/internal/ethapi" "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/p2p" "github.com/maticnetwork/bor/rpc" - "github.com/graph-gophers/graphql-go" - "github.com/graph-gophers/graphql-go/relay" ) // Service encapsulates a GraphQL service. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 8bd64b9bb939dbd1ef1033df4915e680ea12652c..469dd8dff2a8adbb9d4e6782963913f17505a110 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,10 +24,10 @@ import ( "os" "runtime" + "github.com/fjl/memsize/memsizeui" "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/metrics" "github.com/maticnetwork/bor/metrics/exp" - "github.com/fjl/memsize/memsizeui" colorable "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" "gopkg.in/urfave/cli.v1" diff --git a/light/lightchain.go b/light/lightchain.go index cfa684e84624bd81221bcb0b5651d21d02660094..99f14ee3caa60140b78404fd3b3c9a865a570838 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -26,6 +26,7 @@ import ( "sync/atomic" "time" + lru "github.com/hashicorp/golang-lru" "github.com/maticnetwork/bor/common" "github.com/maticnetwork/bor/consensus" "github.com/maticnetwork/bor/core" @@ -37,7 +38,6 @@ import ( "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/params" "github.com/maticnetwork/bor/rlp" - lru "github.com/hashicorp/golang-lru" ) var ( diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index 5971c50aa3b525b54582897c4f89d3070534d717..d4452bc6d35fcc63080976900c415a5fe7a6ee6d 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,9 +5,9 @@ import ( uurl "net/url" "time" + "github.com/influxdata/influxdb/client" "github.com/maticnetwork/bor/log" "github.com/maticnetwork/bor/metrics" - "github.com/influxdata/influxdb/client" ) type reporter struct { diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 08b7a39ddaf91ea2305f64cff4e53055e66191ba..0f5cd07c050515a47794c2bf9d8127a0fae6484b 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/maticnetwork/bor/log" "github.com/jackpal/go-nat-pmp" + "github.com/maticnetwork/bor/log" ) // An implementation of nat.Interface can map local ports to ports diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 1513ed9d09fb95883a75fc1e737cb439990d6d85..36f845332fb5ea144d93e5cf8cc080b4427a2731 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,11 +35,11 @@ import ( "sync" "time" + "github.com/golang/snappy" "github.com/maticnetwork/bor/common/bitutil" "github.com/maticnetwork/bor/crypto" "github.com/maticnetwork/bor/crypto/ecies" "github.com/maticnetwork/bor/rlp" - "github.com/golang/snappy" "golang.org/x/crypto/sha3" ) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index c42f2e8a0c67f37df7aa08b166ae1844ae843814..55119851f289e29d0be3c2f8106f0d1bdca45592 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,12 +29,12 @@ import ( "strings" "sync" + "github.com/julienschmidt/httprouter" "github.com/maticnetwork/bor/event" "github.com/maticnetwork/bor/p2p" "github.com/maticnetwork/bor/p2p/enode" "github.com/maticnetwork/bor/p2p/simulations/adapters" "github.com/maticnetwork/bor/rpc" - "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" )