From 277b117d9f299b58eb68a899266e6a372565a36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Fri, 5 Jul 2019 16:36:08 +0200 Subject: [PATCH] gofmt, mod tidy --- chain/address/address.go | 2 +- chain/address/address_test.go | 2 +- chain/address/constants.go | 3 +-- chain/address/testing.go | 2 +- chain/blocksync.go | 1 - chain/buf_bstore.go | 2 +- chain/chain.go | 3 +-- chain/statetree.go | 1 - chain/sync.go | 3 +-- chain/types.go | 2 +- chain/vm.go | 2 +- chain/wallet.go | 3 +-- go.mod | 26 +++++++++++++++++--------- go.sum | 7 ++++++- 14 files changed, 33 insertions(+), 26 deletions(-) diff --git a/chain/address/address.go b/chain/address/address.go index e8e53da80..b6b3cb4e2 100644 --- a/chain/address/address.go +++ b/chain/address/address.go @@ -312,4 +312,4 @@ func hash(ingest []byte, cfg *blake2b.Config) []byte { panic(fmt.Sprintf("blake2b is unable to process hashes: %v", err)) } return hasher.Sum(nil) -} \ No newline at end of file +} diff --git a/chain/address/address_test.go b/chain/address/address_test.go index 2ac63458a..766ca7db8 100644 --- a/chain/address/address_test.go +++ b/chain/address/address_test.go @@ -445,4 +445,4 @@ func TestAddressFormat(t *testing.T) { assert.Equal("", fmt.Sprintf("%X", Undef)) assert.Equal(UndefAddressString, Undef.String()) assert.Equal(UndefAddressString, fmt.Sprintf("%v", Undef)) -} \ No newline at end of file +} diff --git a/chain/address/constants.go b/chain/address/constants.go index b0c011eea..641386886 100644 --- a/chain/address/constants.go +++ b/chain/address/constants.go @@ -1,6 +1,5 @@ package address - import ( "encoding/base32" @@ -85,4 +84,4 @@ var checksumHashConfig = &blake2b.Config{Size: ChecksumHashLength} const encodeStd = "abcdefghijklmnopqrstuvwxyz234567" // AddressEncoding defines the base32 config used for address encoding and decoding. -var AddressEncoding = base32.NewEncoding(encodeStd) \ No newline at end of file +var AddressEncoding = base32.NewEncoding(encodeStd) diff --git a/chain/address/testing.go b/chain/address/testing.go index 77be6477a..9bc41376d 100644 --- a/chain/address/testing.go +++ b/chain/address/testing.go @@ -17,4 +17,4 @@ func NewForTestGetter() func() Address { } return newAddr } -} \ No newline at end of file +} diff --git a/chain/blocksync.go b/chain/blocksync.go index 3c1420ad3..cc77176e7 100644 --- a/chain/blocksync.go +++ b/chain/blocksync.go @@ -1,6 +1,5 @@ package chain - import ( "bufio" "context" diff --git a/chain/buf_bstore.go b/chain/buf_bstore.go index dab05834d..3df152901 100644 --- a/chain/buf_bstore.go +++ b/chain/buf_bstore.go @@ -114,4 +114,4 @@ func (bs *BufferedBS) HashOnRead(hor bool) { func (bs *BufferedBS) PutMany(blks []block.Block) error { return bs.write.PutMany(blks) -} \ No newline at end of file +} diff --git a/chain/chain.go b/chain/chain.go index da811a144..509b2e6bd 100644 --- a/chain/chain.go +++ b/chain/chain.go @@ -13,8 +13,8 @@ import ( bstore "github.com/ipfs/go-ipfs-blockstore" logging "github.com/ipfs/go-log" "github.com/pkg/errors" - sharray "github.com/whyrusleeping/sharray" pubsub "github.com/whyrusleeping/pubsub" + sharray "github.com/whyrusleeping/sharray" ) const ForkLengthThreshold = 20 @@ -456,4 +456,3 @@ func (cs *ChainStore) LoadMessagesFromCids(cids []cid.Cid) ([]*SignedMessage, er return msgs, nil } - diff --git a/chain/statetree.go b/chain/statetree.go index 636c288ef..3fdc3e9b7 100644 --- a/chain/statetree.go +++ b/chain/statetree.go @@ -1,6 +1,5 @@ package chain - import ( "context" "fmt" diff --git a/chain/sync.go b/chain/sync.go index 75e92a20a..d70a66172 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -1,6 +1,5 @@ package chain - import ( "context" "fmt" @@ -693,4 +692,4 @@ func (syncer *Syncer) collectChainCaughtUp(fts *FullTipSet) ([]*FullTipSet, erro } return chain, nil -} \ No newline at end of file +} diff --git a/chain/types.go b/chain/types.go index 0581a317b..1fd076f9e 100644 --- a/chain/types.go +++ b/chain/types.go @@ -590,4 +590,4 @@ func (bm *BlockMsg) Cid() cid.Cid { func (bm *BlockMsg) Serialize() ([]byte, error) { return cbor.DumpObject(bm) -} \ No newline at end of file +} diff --git a/chain/vm.go b/chain/vm.go index 7979f3f6a..d69f12650 100644 --- a/chain/vm.go +++ b/chain/vm.go @@ -204,4 +204,4 @@ func (vm *VM) TransferFunds(from, to address.Address, amt BigInt) error { func (vm *VM) Invoke(act *Actor, vmctx *VMContext, method uint64, params []byte) ([]byte, byte, error) { panic("Implement me") -} \ No newline at end of file +} diff --git a/chain/wallet.go b/chain/wallet.go index e66af72fb..73ef7e343 100644 --- a/chain/wallet.go +++ b/chain/wallet.go @@ -1,6 +1,5 @@ package chain - import ( "encoding/binary" "fmt" @@ -193,4 +192,4 @@ func (ki *KeyInfo) Address() address.Address { default: panic("unsupported key type") } -} \ No newline at end of file +} diff --git a/go.mod b/go.mod index c6fdf3a63..d1306fbb8 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,21 @@ go 1.12 require ( github.com/BurntSushi/toml v0.3.1 - github.com/filecoin-project/go-filecoin v0.0.1 // indirect + github.com/filecoin-project/go-filecoin v0.0.1 + github.com/filecoin-project/go-leb128 v0.0.0-20190212224330-8d79a5489543 github.com/golang/protobuf v1.3.1 // indirect + github.com/ipfs/go-bitswap v0.0.2 + github.com/ipfs/go-block-format v0.0.2 + github.com/ipfs/go-blockservice v0.0.2 + github.com/ipfs/go-cid v0.0.2 github.com/ipfs/go-datastore v0.0.5 + github.com/ipfs/go-hamt-ipld v0.0.1 + github.com/ipfs/go-ipfs-blockstore v0.0.1 github.com/ipfs/go-ipfs-routing v0.1.0 - github.com/ipfs/go-ipld-cbor v0.0.2 // indirect - github.com/ipfs/go-ipld-format v0.0.2 // indirect + github.com/ipfs/go-ipld-cbor v0.0.2 + github.com/ipfs/go-ipld-format v0.0.2 github.com/ipfs/go-log v0.0.2-0.20190703113630-0c3cfb1eccc4 + github.com/ipfs/go-merkledag v0.0.2 github.com/libp2p/go-libp2p v0.2.0 github.com/libp2p/go-libp2p-circuit v0.1.0 github.com/libp2p/go-libp2p-connmgr v0.1.0 @@ -18,6 +26,7 @@ require ( github.com/libp2p/go-libp2p-discovery v0.1.0 github.com/libp2p/go-libp2p-kad-dht v0.1.1 github.com/libp2p/go-libp2p-mplex v0.2.1 + github.com/libp2p/go-libp2p-peer v0.2.0 github.com/libp2p/go-libp2p-peerstore v0.1.1 github.com/libp2p/go-libp2p-pnet v0.1.0 github.com/libp2p/go-libp2p-pubsub v0.1.0 @@ -28,18 +37,17 @@ require ( github.com/libp2p/go-libp2p-tls v0.1.0 github.com/libp2p/go-libp2p-yamux v0.2.1 github.com/libp2p/go-maddr-filter v0.0.4 + github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 github.com/multiformats/go-multiaddr v0.0.4 github.com/multiformats/go-multihash v0.0.5 - github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14 // indirect + github.com/pkg/errors v0.8.1 + github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14 github.com/stretchr/testify v1.3.0 github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 - github.com/whyrusleeping/pubsub v0.0.0-20131020042734-02de8aa2db3d // indirect - github.com/whyrusleeping/sharray v0.0.0-20190520213710-bd32aab369f8 // indirect + github.com/whyrusleeping/pubsub v0.0.0-20131020042734-02de8aa2db3d + github.com/whyrusleeping/sharray v0.0.0-20190520213710-bd32aab369f8 go.uber.org/dig v1.7.0 // indirect go.uber.org/fx v1.9.0 go.uber.org/goleak v0.10.0 // indirect - golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f // indirect - golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 // indirect - golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 // indirect gopkg.in/urfave/cli.v2 v2.0.0-20180128182452-d3ae77c26ac8 ) diff --git a/go.sum b/go.sum index f2bbaa2ff..dd658b8d9 100644 --- a/go.sum +++ b/go.sum @@ -123,6 +123,7 @@ github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -179,6 +180,7 @@ github.com/ipfs/go-hamt-ipld v0.0.1 h1:dOS1Bp9hyZUozI4Y7rC+FJqitur00tWlIFmLLgNev github.com/ipfs/go-hamt-ipld v0.0.1/go.mod h1:WrX60HHX2SeMb602Z1s9Ztnf/4fzNHzwH9gxNTVpEmk= github.com/ipfs/go-ipfs-blockstore v0.0.1 h1:O9n3PbmTYZoNhkgkEyrXTznbmktIXif62xLX+8dPHzc= github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08= +github.com/ipfs/go-ipfs-blocksutil v0.0.1 h1:Eh/H4pc1hsvhzsQoMEP3Bke/aW5P5rVM1IWFJMcGIPQ= github.com/ipfs/go-ipfs-blocksutil v0.0.1/go.mod h1:Yq4M86uIOmxmGPUHv/uI7uKqZNtLb449gwKqXjIsnRk= github.com/ipfs/go-ipfs-chunker v0.0.1 h1:cHUUxKFQ99pozdahi+uSC/3Y6HeRpi9oTeUHbE27SEw= github.com/ipfs/go-ipfs-chunker v0.0.1/go.mod h1:tWewYK0we3+rMbOh7pPFGDyypCtvGcBFymgY4rSDLAw= @@ -252,6 +254,7 @@ github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZl github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -524,7 +527,9 @@ github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxr github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA= github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU= github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a h1:/eS3yfGjQKG+9kayBkj0ip1BGhq6zJ3eaVksphxAaek= github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0= @@ -549,6 +554,7 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e h1:T5PdfK/M1xyrHwynxMIVMWLS7f/qHwfslZphxtGnw7s= github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436 h1:qOpVTI+BrstcjTZLm2Yz/3sOnqkzj3FQoh0g+E5s3Gc= github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc h1:BCPnHtcboadS0DvysUuJXZ4lWVv5Bh5i7+tbIyi+ck4= github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod h1:r45hJU7yEoA81k6MWNhpMj/kms0n14dkzkxYHoB96UM= @@ -584,7 +590,6 @@ go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A= go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M= go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/dig v1.7.0 h1:E5/L92iQTNJTjfgJF2KgU+/JpMaiuvK2DHLBj0+kSZk=