Merge pull request #75 from lbryio/replace-v2

nikooo777 · web-flow · commit ef1b10b601db · 2019-10-25T16:49:59.000+02:00
V2 update
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
diff --git 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{}) {
@@ -640,7 +640,7 @@ func TestClient_WalletList(t *testing.T) {
 	if err == nil {
 		t.Fatalf("wallet %v was unexpectedly found", id)
 	}
-	if err.Error() != fmt.Sprintf("Error in daemon: Couldn't find wallet: %v.", id) {
+	if !strings.Contains(err.Error(), fmt.Sprintf("Couldn't find wallet: %v.", id)) {
 		t.Fatal(err)
 	}
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/go.sum b/go.sum
diff --git a/lbrycrd/address.go b/lbrycrd/address.go
diff --git a/lbrycrd/blockchain_test.go b/lbrycrd/blockchain_test.go
diff --git a/lbrycrd/channel.go b/lbrycrd/channel.go
diff --git a/lbrycrd/claim.go b/lbrycrd/claim.go
diff --git a/lbrycrd/client.go b/lbrycrd/client.go
diff --git a/lbrycrd/finder.go b/lbrycrd/finder.go
diff --git a/lbrycrd/script.go b/lbrycrd/script.go
diff --git a/main.go b/main.go
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
diff --git a/stream/blob.go b/stream/blob.go
diff --git a/stream/json.go b/stream/json.go
diff --git a/stream/stream.go b/stream/stream.go

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/lbryio/lbry.go/extras/errors"`
	`10`	`+ "github.com/lbryio/lbry.go/v2/extras/errors"`
`11`	`11`
`12`	`12`	`"github.com/lyoshenka/bencode"`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package bits`
`3`	`3`	`import (`
`4`	`4`	`"math/big"`
`5`	`5`
`6`		`- "github.com/lbryio/lbry.go/extras/errors"`
	`6`	`+ "github.com/lbryio/lbry.go/v2/extras/errors"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// Range has a start and end`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"sync"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/lbryio/lbry.go/dht/bits"`
	`9`	`+ "github.com/lbryio/lbry.go/v2/dht/bits"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"net"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/lbryio/lbry.go/dht/bits"`
	`7`	`+ "github.com/lbryio/lbry.go/v2/dht/bits"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func TestBootstrapPing(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"sort"`
`7`	`7`	`"strconv"`
`8`	`8`
`9`		`- "github.com/lbryio/lbry.go/dht/bits"`
`10`		`- "github.com/lbryio/lbry.go/extras/errors"`
	`9`	`+ "github.com/lbryio/lbry.go/v2/dht/bits"`
	`10`	`+ "github.com/lbryio/lbry.go/v2/extras/errors"`
`11`	`11`
`12`	`12`	`"github.com/lyoshenka/bencode"`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"reflect"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/lbryio/lbry.go/dht/bits"`
	`8`	`+ "github.com/lbryio/lbry.go/v2/dht/bits"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestCompactEncoding(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"sync"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- "github.com/lbryio/lbry.go/dht/bits"`
`11`		`- "github.com/lbryio/lbry.go/extras/errors"`
	`10`	`+ "github.com/lbryio/lbry.go/v2/dht/bits"`
	`11`	`+ "github.com/lbryio/lbry.go/v2/extras/errors"`
`12`	`12`
`13`	`13`	`"golang.org/x/time/rate"`
`14`	`14`	`)`