goimports invocation, xdr alias fixed

diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go
index 4f5bca1b9d72890c25f33bc6069626c48e4a9c7c..380b3917e7e5706253a0cecbd43a4fbc416aac13 100644 (file)
--- a/src/cmd/nncp-bundle/main.go
+++ b/src/cmd/nncp-bundle/main.go
@@ -32,7 +32,7 @@ import (
        "strconv"
        "strings"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "go.cypherpunks.ru/nncp/v5"
        "golang.org/x/crypto/blake2b"
 )

diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go
index 7adc6fab94f9f1c350e54e7192e0d9fc0a048a04..055b6443c4c3a7e1ad511267ffb817c5c1e21713 100644 (file)
--- a/src/cmd/nncp-cfgenc/main.go
+++ b/src/cmd/nncp-cfgenc/main.go
@@ -27,7 +27,7 @@ import (
        "log"
        "os"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "go.cypherpunks.ru/nncp/v5"
        "golang.org/x/crypto/blake2b"
        "golang.org/x/crypto/ssh/terminal"

diff --git a/src/cmd/nncp-pkt/main.go b/src/cmd/nncp-pkt/main.go
index 1808e3a61d001d11bf49d3120fe317e70bb48c86..cb9042a5c53d28809df08d089e5d00c5991f2e9d 100644 (file)
--- a/src/cmd/nncp-pkt/main.go
+++ b/src/cmd/nncp-pkt/main.go
@@ -27,7 +27,7 @@ import (
        "log"
        "os"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/klauspost/compress/zstd"
        "go.cypherpunks.ru/nncp/v5"
 )

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index 77a5f139a879c986387aa877fc55638a98368fb4..d7d79b082d327d964fc514112bb0c0a2b11c8097 100644 (file)
--- a/src/cmd/nncp-reass/main.go
+++ b/src/cmd/nncp-reass/main.go
@@ -32,7 +32,7 @@ import (
        "strconv"
        "strings"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/dustin/go-humanize"
        "go.cypherpunks.ru/nncp/v5"
        "golang.org/x/crypto/blake2b"

diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index fde11174e9c19297aa573a8af86cd4c64d8848c3..cfe16b779c6bff49586e34e79808c12a969fba3e 100644 (file)
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/main.go
@@ -28,7 +28,7 @@ import (
        "path/filepath"
        "strconv"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "go.cypherpunks.ru/nncp/v5"
 )
 

diff --git a/src/ctx.go b/src/ctx.go
index 3793bbba6b6808b3c3b9d0630a788682b54e615b..1cee1a2ed7b16ee16464b7ca39c422cfdfc615d3 100644 (file)
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -24,8 +24,9 @@ import (
        "os"
        "path/filepath"
 
-       "golang.org/x/sys/unix"
        "syscall"
+
+       "golang.org/x/sys/unix"
 )
 
 type Ctx struct {

diff --git a/src/eblob.go b/src/eblob.go
index 64327901bd1f4455bf2deac59d65322bcbce2e66..0616c8402b87ffdfa6b8f3d335864902449c15a4 100644 (file)
--- a/src/eblob.go
+++ b/src/eblob.go
@@ -22,7 +22,7 @@ import (
        "crypto/rand"
        "hash"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "go.cypherpunks.ru/balloon"
        "golang.org/x/crypto/blake2b"
        "golang.org/x/crypto/chacha20poly1305"

diff --git a/src/go.mod b/src/go.mod
index 77ef98aab6641a0370b6594f84eea52eccf7982b..c7a3543f379d890d994ca197755343805544ef19 100644 (file)
--- a/src/go.mod
+++ b/src/go.mod
@@ -15,3 +15,5 @@ require (
        golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056
        gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 )
+
+go 1.10

diff --git a/src/jobs.go b/src/jobs.go
index 080ec4aabea25885fdceb83ac6d2b40634f221cd..49df07b96e8b8c1f56445a040851644ff7fa18e6 100644 (file)
--- a/src/jobs.go
+++ b/src/jobs.go
@@ -23,7 +23,7 @@ import (
        "path/filepath"
        "strconv"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
 )
 
 type TRxTx string

diff --git a/src/pkt.go b/src/pkt.go
index 2fab844422486793be179dd571ef5f77386a3e1c..8324ffbc0428450850779b9c1bdf215533fa9d33 100644 (file)
--- a/src/pkt.go
+++ b/src/pkt.go
@@ -25,7 +25,7 @@ import (
        "errors"
        "io"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "golang.org/x/crypto/blake2b"
        "golang.org/x/crypto/chacha20poly1305"
        "golang.org/x/crypto/curve25519"

diff --git a/src/pkt_test.go b/src/pkt_test.go
index 678cbf474a420fba1d7c9aa1becee2822ad17389..c69ba96e3b951b1ed1630799b3664a052c71c83e 100644 (file)
--- a/src/pkt_test.go
+++ b/src/pkt_test.go
@@ -22,7 +22,7 @@ import (
        "testing"
        "testing/quick"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
 )
 
 func TestPktEncWrite(t *testing.T) {

diff --git a/src/sp.go b/src/sp.go
index 6dd724a59807b744b404763d03f8991f4cdc556f..540e0e52a22a4f016114ca8a9fed71599802ed54 100644 (file)
--- a/src/sp.go
+++ b/src/sp.go
@@ -30,7 +30,7 @@ import (
        "sync"
        "time"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/flynn/noise"
 )
 

diff --git a/src/toss.go b/src/toss.go
index 0ce446ac807b39df6e6a067a2745b0631101ede2..43b72f5c1cffad94620dd8d0abbaaa0cad42510b 100644 (file)
--- a/src/toss.go
+++ b/src/toss.go
@@ -32,7 +32,7 @@ import (
        "strconv"
        "strings"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/dustin/go-humanize"
        "github.com/klauspost/compress/zstd"
        "golang.org/x/crypto/blake2b"

diff --git a/src/toss_test.go b/src/toss_test.go
index 4ccf4ead4ca656ff8738b6773b5cf385b56339ae..825ec09977611cccf1d49aade53e576bcdd4d6f4 100644 (file)
--- a/src/toss_test.go
+++ b/src/toss_test.go
@@ -30,7 +30,7 @@ import (
        "testing"
        "testing/quick"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "golang.org/x/crypto/blake2b"
 )
 

diff --git a/src/tx.go b/src/tx.go
index a509207422ccee4479b514b77c70736acc86e018..022789966197f4d799e72709d83adc993af411d1 100644 (file)
--- a/src/tx.go
+++ b/src/tx.go
@@ -30,7 +30,7 @@ import (
        "strconv"
        "strings"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/klauspost/compress/zstd"
        "golang.org/x/crypto/blake2b"
        "golang.org/x/crypto/chacha20poly1305"

diff --git a/src/tx_test.go b/src/tx_test.go
index bde218f99043413a8be2134b533567fe1172e6a5..ca77d4c553fb19e9d303dadef6e7a85d21058bf3 100644 (file)
--- a/src/tx_test.go
+++ b/src/tx_test.go
@@ -27,7 +27,7 @@ import (
        "testing"
        "testing/quick"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "golang.org/x/crypto/blake2b"
 )