From dd2171172d40af3fe681d999e07464239b594d7e Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Thu, 10 Oct 2019 05:07:33 +0200 Subject: [PATCH] update to v2 --- blobex/server.go | 2 +- dht/bits/bitmap.go | 2 +- dht/bits/range.go | 2 +- dht/bootstrap.go | 2 +- dht/bootstrap_test.go | 2 +- dht/config.go | 2 +- dht/contact.go | 4 ++-- dht/contact_test.go | 2 +- dht/dht.go | 6 +++--- dht/dht_announce.go | 4 ++-- dht/dht_test.go | 2 +- dht/message.go | 4 ++-- dht/message_test.go | 2 +- dht/node.go | 8 ++++---- dht/node_finder.go | 8 ++++---- dht/node_test.go | 2 +- dht/routing_table.go | 6 +++--- dht/routing_table_test.go | 2 +- dht/rpc.go | 4 ++-- dht/store.go | 2 +- dht/testing.go | 4 ++-- dht/token_cache.go | 4 ++-- dht/token_manager.go | 4 ++-- extras/api/server.go | 6 +++--- extras/crypto/crypto.go | 2 +- extras/jsonrpc/daemon.go | 4 ++-- extras/jsonrpc/daemon_test.go | 4 ++-- extras/jsonrpc/daemon_types.go | 4 ++-- extras/query/query.go | 4 ++-- extras/travis/travis.go | 2 +- extras/util/pointer.go | 2 +- extras/util/slack.go | 2 +- go.mod | 12 +++++++++--- go.sum | 23 +++++++++++++++++++++++ lbrycrd/address.go | 2 +- lbrycrd/blockchain_test.go | 2 +- lbrycrd/channel.go | 2 +- lbrycrd/claim.go | 2 +- lbrycrd/client.go | 2 +- lbrycrd/finder.go | 2 +- lbrycrd/script.go | 2 +- main.go | 2 +- stream/blob.go | 2 +- stream/json.go | 2 +- stream/stream.go | 2 +- 45 files changed, 98 insertions(+), 69 deletions(-) diff --git a/blobex/server.go b/blobex/server.go index 4df3010..7d04b94 100644 --- a/blobex/server.go +++ b/blobex/server.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/dht/bits/bitmap.go b/dht/bits/bitmap.go index f9f67d4..24f2f6e 100644 --- a/dht/bits/bitmap.go +++ b/dht/bits/bitmap.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/lyoshenka/bencode" ) diff --git a/dht/bits/range.go b/dht/bits/range.go index d8c7365..e4a0c6c 100644 --- a/dht/bits/range.go +++ b/dht/bits/range.go @@ -3,7 +3,7 @@ package bits import ( "math/big" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" ) // Range has a start and end diff --git a/dht/bootstrap.go b/dht/bootstrap.go index 3fa0b4f..f6e9e2c 100644 --- a/dht/bootstrap.go +++ b/dht/bootstrap.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" ) const ( diff --git a/dht/bootstrap_test.go b/dht/bootstrap_test.go index 4802d13..c77bd97 100644 --- a/dht/bootstrap_test.go +++ b/dht/bootstrap_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" ) func TestBootstrapPing(t *testing.T) { diff --git a/dht/config.go b/dht/config.go index c5c095c..2adb5be 100644 --- a/dht/config.go +++ b/dht/config.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" ) const ( diff --git a/dht/contact.go b/dht/contact.go index f4b1a53..79434e4 100644 --- a/dht/contact.go +++ b/dht/contact.go @@ -6,8 +6,8 @@ import ( "sort" "strconv" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/lyoshenka/bencode" ) diff --git a/dht/contact_test.go b/dht/contact_test.go index d534bf5..7b23644 100644 --- a/dht/contact_test.go +++ b/dht/contact_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" ) func TestCompactEncoding(t *testing.T) { diff --git a/dht/dht.go b/dht/dht.go index b94de5c..3ab2c48 100644 --- a/dht/dht.go +++ b/dht/dht.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" - "github.com/lbryio/lbry.go/extras/stop" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/stop" "github.com/sirupsen/logrus" "github.com/spf13/cast" diff --git a/dht/dht_announce.go b/dht/dht_announce.go index 34b48fe..60bd9ca 100644 --- a/dht/dht_announce.go +++ b/dht/dht_announce.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" "golang.org/x/time/rate" ) diff --git a/dht/dht_test.go b/dht/dht_test.go index 99939a9..b1feab7 100644 --- a/dht/dht_test.go +++ b/dht/dht_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" ) func TestNodeFinder_FindNodes(t *testing.T) { diff --git a/dht/message.go b/dht/message.go index e23c35d..bdd3dc2 100644 --- a/dht/message.go +++ b/dht/message.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/lyoshenka/bencode" "github.com/spf13/cast" diff --git a/dht/message_test.go b/dht/message_test.go index 0237a84..81ba598 100644 --- a/dht/message_test.go +++ b/dht/message_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" "github.com/davecgh/go-spew/spew" "github.com/lyoshenka/bencode" diff --git a/dht/node.go b/dht/node.go index 0e3ea9c..a5b1761 100644 --- a/dht/node.go +++ b/dht/node.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" - "github.com/lbryio/lbry.go/extras/stop" - "github.com/lbryio/lbry.go/extras/util" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/stop" + "github.com/lbryio/lbry.go/v2/extras/util" "github.com/davecgh/go-spew/spew" "github.com/lyoshenka/bencode" diff --git a/dht/node_finder.go b/dht/node_finder.go index 264e311..13fd844 100644 --- a/dht/node_finder.go +++ b/dht/node_finder.go @@ -4,10 +4,10 @@ import ( "sync" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/crypto" - "github.com/lbryio/lbry.go/extras/errors" - "github.com/lbryio/lbry.go/extras/stop" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/crypto" + "github.com/lbryio/lbry.go/v2/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/stop" "github.com/sirupsen/logrus" "github.com/uber-go/atomic" diff --git a/dht/node_test.go b/dht/node_test.go index d7eb8d3..7a567c8 100644 --- a/dht/node_test.go +++ b/dht/node_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" "github.com/lyoshenka/bencode" ) diff --git a/dht/routing_table.go b/dht/routing_table.go index f7a61ae..9e0c108 100644 --- a/dht/routing_table.go +++ b/dht/routing_table.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" - "github.com/lbryio/lbry.go/extras/stop" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/stop" ) // TODO: if routing table is ever empty (aka the node is isolated), it should re-bootstrap diff --git a/dht/routing_table_test.go b/dht/routing_table_test.go index 19f4f51..43f319a 100644 --- a/dht/routing_table_test.go +++ b/dht/routing_table_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" "github.com/sebdah/goldie" ) diff --git a/dht/rpc.go b/dht/rpc.go index ae67847..0fc66c7 100644 --- a/dht/rpc.go +++ b/dht/rpc.go @@ -7,8 +7,8 @@ import ( "strconv" "sync" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/gorilla/mux" rpc2 "github.com/gorilla/rpc/v2" diff --git a/dht/store.go b/dht/store.go index f38bfd6..e36f9ea 100644 --- a/dht/store.go +++ b/dht/store.go @@ -3,7 +3,7 @@ package dht import ( "sync" - "github.com/lbryio/lbry.go/dht/bits" + "github.com/lbryio/lbry.go/v2/dht/bits" ) // TODO: expire stored data after tExpire time diff --git a/dht/testing.go b/dht/testing.go index f089c1b..b05ca37 100644 --- a/dht/testing.go +++ b/dht/testing.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/errors" ) var testingDHTIP = "127.0.0.1" diff --git a/dht/token_cache.go b/dht/token_cache.go index a30ddb4..a02010c 100644 --- a/dht/token_cache.go +++ b/dht/token_cache.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/stop" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/stop" ) // TODO: this should be moved out of dht and into node, and it should be completely hidden inside node. dht should not need to know about tokens diff --git a/dht/token_manager.go b/dht/token_manager.go index a6c0416..ea8be5f 100644 --- a/dht/token_manager.go +++ b/dht/token_manager.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/lbryio/lbry.go/dht/bits" - "github.com/lbryio/lbry.go/extras/stop" + "github.com/lbryio/lbry.go/v2/dht/bits" + "github.com/lbryio/lbry.go/v2/extras/stop" ) type tokenManager struct { diff --git a/extras/api/server.go b/extras/api/server.go index d14a9bb..3cec8e2 100644 --- a/extras/api/server.go +++ b/extras/api/server.go @@ -6,9 +6,9 @@ import ( "reflect" "strings" - "github.com/lbryio/lbry.go/extras/errors" - "github.com/lbryio/lbry.go/extras/util" - "github.com/lbryio/lbry.go/extras/validator" + "github.com/lbryio/lbry.go/v2/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/util" + "github.com/lbryio/lbry.go/v2/extras/validator" v "github.com/lbryio/ozzo-validation" "github.com/spf13/cast" diff --git a/extras/crypto/crypto.go b/extras/crypto/crypto.go index 840d9a8..74a2ec9 100644 --- a/extras/crypto/crypto.go +++ b/extras/crypto/crypto.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/btcsuite/btcutil/base58" "golang.org/x/crypto/sha3" diff --git a/extras/jsonrpc/daemon.go b/extras/jsonrpc/daemon.go index 3e83110..4d40777 100644 --- a/extras/jsonrpc/daemon.go +++ b/extras/jsonrpc/daemon.go @@ -11,7 +11,7 @@ import ( "time" "github.com/fatih/structs" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/mitchellh/mapstructure" "github.com/shopspring/decimal" log "github.com/sirupsen/logrus" @@ -436,7 +436,7 @@ func (d *Client) StreamList(account *string) (*StreamListResponse, error) { "include_protobuf": true, }) if err != nil { - return nil, err + return nil, err2 } return response, nil } diff --git a/extras/jsonrpc/daemon_test.go b/extras/jsonrpc/daemon_test.go index 29a8785..353fa45 100644 --- a/extras/jsonrpc/daemon_test.go +++ b/extras/jsonrpc/daemon_test.go @@ -12,9 +12,9 @@ import ( "github.com/shopspring/decimal" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" - "github.com/lbryio/lbry.go/extras/util" + "github.com/lbryio/lbry.go/v2/extras/util" ) func prettyPrint(i interface{}) { diff --git a/extras/jsonrpc/daemon_types.go b/extras/jsonrpc/daemon_types.go index 34c06ad..9c1584d 100644 --- a/extras/jsonrpc/daemon_types.go +++ b/extras/jsonrpc/daemon_types.go @@ -8,8 +8,8 @@ import ( "os" "reflect" - "github.com/lbryio/lbry.go/extras/errors" - "github.com/lbryio/lbry.go/stream" + "github.com/lbryio/lbry.go/v2/extras/errors" + "github.com/lbryio/lbry.go/v2/stream" schema "github.com/lbryio/lbryschema.go/claim" lbryschema "github.com/lbryio/types/v2/go" diff --git a/extras/query/query.go b/extras/query/query.go index 4d8c16b..4e39737 100644 --- a/extras/query/query.go +++ b/extras/query/query.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/lbryio/lbry.go/extras/errors" - "github.com/lbryio/lbry.go/extras/null" + "github.com/lbryio/lbry.go/v2/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/null" ) func InterpolateParams(query string, args ...interface{}) (string, error) { diff --git a/extras/travis/travis.go b/extras/travis/travis.go index abe6a57..820bdd5 100644 --- a/extras/travis/travis.go +++ b/extras/travis/travis.go @@ -23,7 +23,7 @@ import ( "encoding/pem" "net/http" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" ) func publicKey(isPrivateRepo bool) (*rsa.PublicKey, error) { diff --git a/extras/util/pointer.go b/extras/util/pointer.go index 302f34f..289b7fb 100644 --- a/extras/util/pointer.go +++ b/extras/util/pointer.go @@ -6,7 +6,7 @@ package util import ( "time" - "github.com/lbryio/lbry.go/extras/null" + "github.com/lbryio/lbry.go/v2/extras/null" ) func PtrToBool(b bool) *bool { return &b } diff --git a/extras/util/slack.go b/extras/util/slack.go index 5c8ab08..7da35b0 100644 --- a/extras/util/slack.go +++ b/extras/util/slack.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/nlopes/slack" log "github.com/sirupsen/logrus" diff --git a/go.mod b/go.mod index 24f9491..5729a57 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,16 @@ require ( github.com/fatih/structs v1.1.0 github.com/go-errors/errors v1.0.1 github.com/go-ini/ini v1.38.2 + github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect github.com/golang/protobuf v1.3.0 github.com/gorilla/mux v1.6.2 github.com/gorilla/rpc v1.1.0 - github.com/lbryio/lbry.go v1.1.2 + github.com/gorilla/websocket v1.4.1 // indirect + github.com/lbryio/lbry.go v1.1.2 // indirect github.com/lbryio/lbryschema.go v0.0.0-20190602173230-6d2f69a36f46 github.com/lbryio/ozzo-validation v0.0.0-20170323141101-d1008ad1fd04 github.com/lbryio/types v0.0.0-20190422033210-321fb2abda9c + github.com/lusis/slack-test v0.0.0-20190426140909-c40012f20018 // indirect github.com/lyoshenka/bencode v0.0.0-20180323155644-b7abd7672df5 github.com/mitchellh/mapstructure v0.0.0-20180511142126-bb74f1db0675 github.com/nlopes/slack v0.5.0 @@ -21,14 +24,17 @@ require ( github.com/sergi/go-diff v1.0.0 github.com/shopspring/decimal v0.0.0-20180607144847-19e3cb6c2930 github.com/sirupsen/logrus v1.2.0 + github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect github.com/spf13/cast v1.2.0 github.com/stretchr/testify v1.3.0 github.com/uber-go/atomic v1.3.2 github.com/ybbus/jsonrpc v0.0.0-20180411222309-2a548b7d822d - golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 - golang.org/x/net v0.0.0-20181114220301-adae6a3d119a + go.uber.org/atomic v1.4.0 // indirect + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 + golang.org/x/net v0.0.0-20190311183353-d8887717615a golang.org/x/time v0.0.0-20181108054448-85acf8d2951c google.golang.org/grpc v1.17.0 + gopkg.in/ini.v1 v1.48.0 // indirect gopkg.in/nullbio/null.v6 v6.0.0-20161116030900-40264a2e6b79 ) diff --git a/go.sum b/go.sum index 63904a7..3bea8db 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,8 @@ github.com/go-ini/ini v1.38.2 h1:6Hl/z3p3iFkA0dlDfzYxuFuUGD+kaweypF6btsR2/Q4= github.com/go-ini/ini v1.38.2/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-ozzo/ozzo-validation v3.5.0+incompatible h1:sUy/in/P6askYr16XJgTKq/0SZhiWsdg4WZGaLsGQkM= github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= +github.com/go-ozzo/ozzo-validation v3.6.0+incompatible h1:msy24VGS42fKO9K1vLz82/GeYW1cILu7Nuuj1N3BBkE= +github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -43,6 +45,7 @@ github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= @@ -53,6 +56,8 @@ github.com/gorilla/rpc v1.1.0 h1:marKfvVP0Gpd/jHlVBKCQ8RAoUPdX7K1Nuh6l1BNh7A= github.com/gorilla/rpc v1.1.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= github.com/gorilla/websocket v1.2.0 h1:VJtLvh6VQym50czpZzx07z/kw9EgAxI3x1ZB8taTMQQ= github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89 h1:12K8AlpT0/6QUXSfV0yi4Q0jkbq8NDtIKFtF61AoqV0= @@ -61,11 +66,14 @@ github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= 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/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c h1:BhdcWGsuKif/XoSZnqVGNqJ1iEmH0czWR5upj+AuR8M= github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c/go.mod h1:muH7wpUqE8hRA3OrYYosw9+Sl681BF9cwcjzE+OCNK8= github.com/lbryio/lbry.go v1.1.2 h1:Dyxc+glT/rVWJwHfIf7vjlPYYbjzrQz5ARmJd5Hp69c= github.com/lbryio/lbry.go v1.1.2/go.mod h1:JtyI30bU51rm0LZ/po3mQuzf++14OWb6kR/6mMRAmKU= @@ -80,6 +88,8 @@ github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 h1:AsEBgzv3DhuYH github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5/go.mod h1:c2mYKRyMb1BPkO5St0c/ps62L4S0W2NAkaTXj9qEI+0= github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6 h1:iOAVXzZyXtW408TMYejlUPo6BIn92HmOacWtIfNyYns= github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6/go.mod h1:sFlOUpQL1YcjhFVXhg1CG8ZASEs/Mf1oVb6H75JL/zg= +github.com/lusis/slack-test v0.0.0-20190426140909-c40012f20018 h1:MNApn+Z+fIT4NPZopPfCc1obT6aY3SVM6DOctz1A9ZU= +github.com/lusis/slack-test v0.0.0-20190426140909-c40012f20018/go.mod h1:sFlOUpQL1YcjhFVXhg1CG8ZASEs/Mf1oVb6H75JL/zg= github.com/lyoshenka/bencode v0.0.0-20180323155644-b7abd7672df5 h1:mG83tLXWSRdcXMWfkoumVwhcCbf3jHF9QKv/m37BkM0= github.com/lyoshenka/bencode v0.0.0-20180323155644-b7abd7672df5/go.mod h1:H0aPCWffGOaDcjkw1iB7W9DVLp6GXmfcJY/7YZCWPA4= github.com/mitchellh/mapstructure v0.0.0-20180511142126-bb74f1db0675 h1:/rdJjIiKG5rRdwG5yxHmSE/7ZREjpyC0kL7GxGT/qJw= @@ -108,6 +118,8 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykE github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8= +github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg= github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -121,9 +133,13 @@ github.com/ybbus/jsonrpc v0.0.0-20180411222309-2a548b7d822d h1:tQo6hjclyv3RHUgZO github.com/ybbus/jsonrpc v0.0.0-20180411222309-2a548b7d822d/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +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= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -131,6 +147,8 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -141,6 +159,7 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190520201301-c432e742b0af h1:NXfmMfXz6JqGfG3ikSxcz2N93j6DgScr19Oo2uwFu88= golang.org/x/sys v0.0.0-20190520201301-c432e742b0af/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= @@ -148,8 +167,10 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f h1:FU37niK8AQ59mHcskRyQL7H0ErSeNh650vdcj8HqdSI= google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -161,6 +182,8 @@ gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.41.0 h1:Ka3ViY6gNYSKiVy71zXBEqKplnV35ImDLVG+8uoIklE= gopkg.in/ini.v1 v1.41.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.48.0 h1:URjZc+8ugRY5mL5uUeQH/a63JcHwdX9xZaWvmNWD7z8= +gopkg.in/ini.v1 v1.48.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/nullbio/null.v6 v6.0.0-20161116030900-40264a2e6b79 h1:FpCr9V8wuOei4BAen+93HtVJ+XSi+KPbaPKm0Vj5R64= gopkg.in/nullbio/null.v6 v6.0.0-20161116030900-40264a2e6b79/go.mod h1:gWkaRU7CoXpezCBWfWjm3999QqS+1pYPXGbqQCTMzo8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/lbrycrd/address.go b/lbrycrd/address.go index 90d8916..a12494c 100644 --- a/lbrycrd/address.go +++ b/lbrycrd/address.go @@ -3,7 +3,7 @@ package lbrycrd import ( "encoding/hex" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcutil" diff --git a/lbrycrd/blockchain_test.go b/lbrycrd/blockchain_test.go index b9986f6..e4b0be9 100644 --- a/lbrycrd/blockchain_test.go +++ b/lbrycrd/blockchain_test.go @@ -3,7 +3,7 @@ package lbrycrd_test import ( "testing" - "github.com/lbryio/lbry.go/lbrycrd" + "github.com/lbryio/lbry.go/v2/lbrycrd" ) var claimIdTests = []struct { diff --git a/lbrycrd/channel.go b/lbrycrd/channel.go index f8282a9..a86ee31 100644 --- a/lbrycrd/channel.go +++ b/lbrycrd/channel.go @@ -2,7 +2,7 @@ package lbrycrd import ( "github.com/btcsuite/btcd/btcec" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" c "github.com/lbryio/lbryschema.go/claim" pb "github.com/lbryio/types/v2/go" ) diff --git a/lbrycrd/claim.go b/lbrycrd/claim.go index b63c19c..4480e9c 100644 --- a/lbrycrd/claim.go +++ b/lbrycrd/claim.go @@ -3,7 +3,7 @@ package lbrycrd import ( "encoding/hex" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" c "github.com/lbryio/lbryschema.go/claim" pb "github.com/lbryio/types/v2/go" diff --git a/lbrycrd/client.go b/lbrycrd/client.go index 71b3571..953c14f 100644 --- a/lbrycrd/client.go +++ b/lbrycrd/client.go @@ -6,7 +6,7 @@ import ( "os" "strconv" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" c "github.com/lbryio/lbryschema.go/claim" "github.com/btcsuite/btcd/btcec" diff --git a/lbrycrd/finder.go b/lbrycrd/finder.go index 771a70c..d8c4bf8 100644 --- a/lbrycrd/finder.go +++ b/lbrycrd/finder.go @@ -1,7 +1,7 @@ package lbrycrd import ( - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/btcsuite/btcd/btcjson" ) diff --git a/lbrycrd/script.go b/lbrycrd/script.go index 9d92872..33c8262 100644 --- a/lbrycrd/script.go +++ b/lbrycrd/script.go @@ -3,7 +3,7 @@ package lbrycrd import ( "encoding/hex" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcutil" diff --git a/main.go b/main.go index ec16b28..e7f420f 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ import ( "math/rand" "time" - "github.com/lbryio/lbry.go/claim" + "github.com/lbryio/lbry.go/v2/claim" log "github.com/sirupsen/logrus" ) diff --git a/stream/blob.go b/stream/blob.go index 1cbd8c9..e422bab 100644 --- a/stream/blob.go +++ b/stream/blob.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "strconv" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" ) const ( diff --git a/stream/json.go b/stream/json.go index 34aeeac..def2e37 100644 --- a/stream/json.go +++ b/stream/json.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "encoding/json" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" ) // inspired by https://blog.gopheracademy.com/advent-2016/advanced-encoding-decoding/ diff --git a/stream/stream.go b/stream/stream.go index 13d4bd9..c9aac39 100644 --- a/stream/stream.go +++ b/stream/stream.go @@ -5,7 +5,7 @@ import ( "math" "strings" - "github.com/lbryio/lbry.go/extras/errors" + "github.com/lbryio/lbry.go/v2/extras/errors" ) type Stream []Blob