update lbryschema imports

extras/jsonrpc/daemon_test.go

@@ -304,7 +304,7 @@ func TestClient_StreamList(t *testing.T) {
 func TestClient_TransactionList(t *testing.T) {
 	_ = os.Setenv("BLOCKCHAIN_NAME", "lbrycrd_regtest")
 	d := NewClient("")
-	got, err := d.TransactionList(nil, 1, 20)
+	got, err := d.TransactionList(nil, nil, 1, 20)
 	if err != nil {
 		t.Error(err)
 		return

extras/jsonrpc/daemon_types.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	"github.com/lbryio/lbry.go/v2/stream"
 
-	schema "github.com/lbryio/lbryschema.go/claim"
+	schema "github.com/lbryio/lbry.go/v2/schema/claim"
 	lbryschema "github.com/lbryio/types/v2/go"
 
 	"github.com/shopspring/decimal"

go.mod

@@ -20,7 +20,6 @@ require (
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lbryio/lbry.go v1.1.2
-	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-20191009145016-1bb8107e04f8
 	github.com/lyoshenka/bencode v0.0.0-20180323155644-b7abd7672df5
@@ -43,13 +42,13 @@ require (
 	golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f // indirect
 	golang.org/x/text v0.3.2 // indirect
 	golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
-	google.golang.org/appengine v1.4.0 // indirect
 	google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 // indirect
 	google.golang.org/grpc v1.24.0
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/ini.v1 v1.48.0 // indirect
 	gopkg.in/nullbio/null.v6 v6.0.0-20161116030900-40264a2e6b79
 	gopkg.in/yaml.v2 v2.2.4 // indirect
+	gotest.tools v2.2.0+incompatible
 )
 
 go 1.13

go.sum

@@ -84,10 +84,9 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 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=
+github.com/lbryio/lbrycrd.go v0.0.0-20200203050410-e1076f12bf19 h1:/zWD8dVIl7bV1TdJWqPqy9tpqixzX2Qxgit48h3hQcY=
 github.com/lbryio/lbrycrd.go v0.0.0-20200203050410-e1076f12bf19/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/lbryio/lbryschema.go v0.0.0-20190428231007-c54836bca002/go.mod h1:dAzPCBj3CKKWBGYBZxK6tKBP5SCgY2tqd9SnQd/OyKo=
-github.com/lbryio/lbryschema.go v0.0.0-20190602173230-6d2f69a36f46 h1:LemfR+rMxhf7nnOrzy2HqS7Me7SZ5gEwOcNFzKC8ySQ=
-github.com/lbryio/lbryschema.go v0.0.0-20190602173230-6d2f69a36f46/go.mod h1:dAzPCBj3CKKWBGYBZxK6tKBP5SCgY2tqd9SnQd/OyKo=
 github.com/lbryio/ozzo-validation v0.0.0-20170323141101-d1008ad1fd04 h1:Nze+C2HbeKvhjI/kVn+9Poj/UuEW5sOQxcsxqO7L3GI=
 github.com/lbryio/ozzo-validation v0.0.0-20170323141101-d1008ad1fd04/go.mod h1:fbG/dzobG8r95KzMwckXiLMHfFjZaBRQqC9hPs2XAQ4=
 github.com/lbryio/types v0.0.0-20190422033210-321fb2abda9c/go.mod h1:CG3wsDv5BiVYQd5i1Jp7wGsaVyjZTJshqXeWMVKsISE=

lbrycrd/channel.go

@@ -3,7 +3,7 @@ package lbrycrd
 import (
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/lbryio/lbry.go/v2/extras/errors"
-	c "github.com/lbryio/lbryschema.go/claim"
+	c "github.com/lbryio/lbry.go/v2/schema/claim"
 	pb "github.com/lbryio/types/v2/go"
 )
 

lbrycrd/claim.go

@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
-	c "github.com/lbryio/lbryschema.go/claim"
+	c "github.com/lbryio/lbry.go/v2/schema/claim"
 	pb "github.com/lbryio/types/v2/go"
 
 	"github.com/btcsuite/btcd/btcec"

lbrycrd/client.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
-	c "github.com/lbryio/lbryschema.go/claim"
+	c "github.com/lbryio/lbry.go/v2/schema/claim"
 
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/btcsuite/btcd/btcjson"

schema/address/decode.go

@@ -2,7 +2,7 @@ package address
 
 import (
 	"github.com/lbryio/lbry.go/extras/errors"
-	"github.com/lbryio/lbryschema.go/address/base58"
+	"github.com/lbryio/lbry.go/v2/schema/address/base58"
 )
 
 func DecodeAddress(address string, blockchainName string) ([addressLength]byte, error) {

schema/address/encode.go

@@ -1,7 +1,7 @@
 package address
 
 import (
-	"github.com/lbryio/lbryschema.go/address/base58"
+	"github.com/lbryio/lbry.go/v2/schema/address/base58"
 )
 
 func EncodeAddress(address [addressLength]byte, blockchainName string) (string, error) {

schema/address/validate.go

@@ -2,7 +2,7 @@ package address
 
 import (
 	"github.com/lbryio/lbry.go/extras/errors"
-	"github.com/lbryio/lbryschema.go/address/base58"
+	"github.com/lbryio/lbry.go/v2/schema/address/base58"
 )
 
 const lbrycrdMainPubkeyPrefix = byte(85)

schema/claim/claim.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"github.com/lbryio/lbry.go/extras/errors"
-	"github.com/lbryio/lbryschema.go/address"
+	"github.com/lbryio/lbry.go/v2/schema/address"
 	legacy_pb "github.com/lbryio/types/v1/go"
 	pb "github.com/lbryio/types/v2/go"
 

schema/claim/migration_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/lbryio/lbryschema.go/address"
+	"github.com/lbryio/lbry.go/v2/schema/address"
 
 	"github.com/btcsuite/btcutil/base58"
 	"gotest.tools/assert"

schema/claim/sign.go

@@ -5,7 +5,7 @@ import (
 	"encoding/hex"
 
 	"github.com/lbryio/lbry.go/extras/errors"
-	"github.com/lbryio/lbryschema.go/address"
+	"github.com/lbryio/lbry.go/v2/schema/address"
 
 	"github.com/btcsuite/btcd/btcec"
 )

schema/claim/validator.go

@@ -10,7 +10,7 @@ import (
 	"math/big"
 
 	"github.com/lbryio/lbry.go/extras/errors"
-	"github.com/lbryio/lbryschema.go/address"
+	"github.com/lbryio/lbry.go/v2/schema/address"
 )
 
 type publicKeyInfo struct {

schema/cli/lbryschema-cli.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/lbryio/lbryschema.go/claim"
 	"os"
+
+	"github.com/lbryio/lbry.go/v2/schema/claim"
 )
 
 func main() {