update dht imports

dht/bits/bitmap.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lbryio/lbry.go/errors"
+	"github.com/lbryio/lbry.go/extras/errors"
 
 	"github.com/lyoshenka/bencode"
 )

dht/bootstrap.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
 )
 
 const (

dht/bootstrap_test.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
 )
 
 func TestBootstrapPing(t *testing.T) {

dht/config.go

@@ -4,13 +4,13 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/lbryio/reflector.go/dht/bits"
-	peerproto "github.com/lbryio/reflector.go/peer"
+	"github.com/lbryio/lbry.go/dht/bits"
 )
 
 const (
-	Network     = "udp4"
-	DefaultPort = 4444
+	Network         = "udp4"
+	DefaultPort     = 4444
+	DefaultPeerPort = 3333
 
 	DefaultAnnounceRate   = 10               // send at most this many announces per second
 	DefaultReannounceTime = 50 * time.Minute // should be a bit less than hash expiration time
@@ -69,7 +69,7 @@ func NewStandardConfig() *Config {
 			"lbrynet2.lbry.io:4444",
 			"lbrynet3.lbry.io:4444",
 		},
-		PeerProtocolPort: peerproto.DefaultPort,
+		PeerProtocolPort: DefaultPeerPort,
 		ReannounceTime:   DefaultReannounceTime,
 		AnnounceRate:     DefaultAnnounceRate,
 	}

dht/contact.go

@@ -6,8 +6,8 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/errors"
 
 	"github.com/lyoshenka/bencode"
 )

dht/contact_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
 )
 
 func TestCompactEncoding(t *testing.T) {

dht/dht.go

@@ -6,10 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lbryio/reflector.go/dht/bits"
-
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/lbry.go/stop"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/errors"
+	"github.com/lbryio/lbry.go/extras/stop"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cast"

dht/dht_announce.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/errors"
 
 	"golang.org/x/time/rate"
 )

dht/dht_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
 )
 
 func TestNodeFinder_FindNodes(t *testing.T) {

dht/message.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/errors"
 
 	"github.com/lyoshenka/bencode"
 	"github.com/spf13/cast"

dht/message_test.go

@@ -8,8 +8,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/lbryio/lbry.go/dht/bits"
+
 	"github.com/davecgh/go-spew/spew"
-	"github.com/lbryio/reflector.go/dht/bits"
 	"github.com/lyoshenka/bencode"
 )
 

dht/node.go

@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/errors.go"
-	"github.com/lbryio/lbry.go/stop"
-	"github.com/lbryio/lbry.go/util"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"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/davecgh/go-spew/spew"
 	"github.com/lyoshenka/bencode"

dht/node_finder.go

@@ -4,10 +4,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/lbry.go/crypto"
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/lbry.go/stop"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"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/sirupsen/logrus"
 	"github.com/uber-go/atomic"

dht/node_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
 	"github.com/lyoshenka/bencode"
 )
 

dht/routing_table.go

@@ -9,9 +9,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/lbry.go/stop"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/errors"
+	"github.com/lbryio/lbry.go/extras/stop"
 )
 
 // TODO: if routing table is ever empty (aka the node is isolated), it should re-bootstrap

dht/routing_table_test.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
 
 	"github.com/sebdah/goldie"
 )

dht/rpc.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/errors"
 
 	"github.com/gorilla/mux"
 	rpc2 "github.com/gorilla/rpc/v2"

dht/store.go

@@ -3,7 +3,7 @@ package dht
 import (
 	"sync"
 
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
 )
 
 // TODO: expire stored data after tExpire time

dht/testing.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lbryio/lbry.go/errors"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/errors"
 )
 
 var testingDHTIP = "127.0.0.1"

dht/token_cache.go

@@ -4,9 +4,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/reflector.go/dht/bits"
-
-	"github.com/lbryio/lbry.go/stop"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/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

dht/token_manager.go

@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/lbry.go/stop"
-	"github.com/lbryio/reflector.go/dht/bits"
+	"github.com/lbryio/lbry.go/dht/bits"
+	"github.com/lbryio/lbry.go/extras/stop"
 )
 
 type tokenManager struct {