From 8936da23acb06dc60b7c1f94845d5525f98665aa Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 22 Nov 2019 22:40:29 +0300 Subject: [PATCH] goimports invocation, xdr alias fixed --- src/cmd/nncp-bundle/main.go | 2 +- src/cmd/nncp-cfgenc/main.go | 2 +- src/cmd/nncp-pkt/main.go | 2 +- src/cmd/nncp-reass/main.go | 2 +- src/cmd/nncp-xfer/main.go | 2 +- src/ctx.go | 3 ++- src/eblob.go | 2 +- src/go.mod | 2 ++ src/jobs.go | 2 +- src/pkt.go | 2 +- src/pkt_test.go | 2 +- src/sp.go | 2 +- src/toss.go | 2 +- src/toss_test.go | 2 +- src/tx.go | 2 +- src/tx_test.go | 2 +- 16 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go index 4f5bca1..380b391 100644 --- 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 7adc6fa..055b644 100644 --- 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 1808e3a..cb9042a 100644 --- 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 77a5f13..d7d79b0 100644 --- 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 fde1117..cfe16b7 100644 --- 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 3793bbb..1cee1a2 100644 --- 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 6432790..0616c84 100644 --- 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 77ef98a..c7a3543 100644 --- 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 080ec4a..49df07b 100644 --- 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 2fab844..8324ffb 100644 --- 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 678cbf4..c69ba96 100644 --- 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 6dd724a..540e0e5 100644 --- 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 0ce446a..43b72f5 100644 --- 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 4ccf4ea..825ec09 100644 --- 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 a509207..0227899 100644 --- 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 bde218f..ca77d4c 100644 --- 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" ) -- 2.44.0