Merge pull request #1854 from OpenBazaar/v0.13.6-rc

placer14 · web-flow · commit 863d0fcb8613 · 2019-11-12T10:55:41.000-05:00
Add DHT extraction behavior to mobile build
diff --git a/mobile/node.go b/mobile/node.go
@@ -367,11 +367,8 @@ func (n *Node) start() error {
 	}
 	var dhtRouting *dht.IpfsDHT
 	for _, router := range tiered.Routers {
-		if r, ok := router.(*ipfs.CachingRouter); ok {
-			dhtRouting, err = r.DHT()
-			if err != nil {
-				return err
-			}
+		if r, ok := router.(*dht.IpfsDHT); ok {
+			dhtRouting = r
 		}
 	}
 	if dhtRouting == nil {

Original file line number	Diff line number	Diff line change
`@@ -367,11 +367,8 @@ func (n *Node) start() error {`
`367`	`367`	`}`
`368`	`368`	`var dhtRouting *dht.IpfsDHT`
`369`	`369`	`for _, router := range tiered.Routers {`
`370`		`- if r, ok := router.(*ipfs.CachingRouter); ok {`
`371`		`- dhtRouting, err = r.DHT()`
`372`		`- if err != nil {`
`373`		`- return err`
`374`		`- }`
	`370`	`+ if r, ok := router.(*dht.IpfsDHT); ok {`
	`371`	`+ dhtRouting = r`
`375`	`372`	`}`
`376`	`373`	`}`
`377`	`374`	`if dhtRouting == nil {`