strip dhtup for now

config/config.go

@@ -16,7 +16,6 @@ import (
 	"github.com/getsentry/sentry-go"
 	"gopkg.in/yaml.v3"
 
-	"github.com/getlantern/dhtup"
 	"github.com/getlantern/golog"
 	"github.com/getlantern/rot13"
 
@@ -109,8 +108,6 @@ type options struct {
 	// dictate whether the fetcher will use dual fetching (from fronted and
 	// chained URLs) or not.
 	rt http.RoundTripper
-
-	dhtupContext *dhtup.Context
 }
 
 var globalConfigDhtTarget krpc.ID
@@ -207,40 +204,6 @@ func pipeConfig(opts *options) (stop func()) {
 				dispatch(cfg, Fetched)
 			}, fetcher, opts.sleep,
 			golog.LoggerFor(fmt.Sprintf("%v.%v.fetcher.http", packageLogPrefix, opts.name)))
-
-		if opts.dhtupContext != nil {
-			dhtFetcher := dhtFetcher{
-				dhtupResource: dhtup.NewResource(dhtup.ResourceInput{
-					DhtTarget:  globalConfigDhtTarget,
-					DhtContext: opts.dhtupContext,
-					FilePath:   opts.name,
-					// Empty this to force data to be obtained through peers.
-					WebSeedUrls: []string{
-						"https://globalconfig.flashlightproxy.com/dhtup/",
-						// For the same reason as with MetainfoUrls, if there's a config change, the
-						// wrong data is present if you go through globalconfig.flashlightproxy.com.
-						// This results in the webseeding code in anacrolix/torrent getting angry,
-						// and everyone piling onto the bootstrap seeders.
-						"https://s3.ap-northeast-1.amazonaws.com/globalconfig.flashlightproxy.com/dhtup/",
-					},
-					Salt: []byte("globalconfig"),
-					// Empty this to force metainfo to be obtained via peers.
-					MetainfoUrls: []string{
-						// This won't work for changes until the CloudFlare caches are flushed as part of updates.
-						"https://globalconfig.flashlightproxy.com/dhtup/globalconfig.torrent",
-						// Bypass CloudFlare cache.
-						"https://s3.ap-northeast-1.amazonaws.com/globalconfig.flashlightproxy.com/dhtup/globalconfig.torrent",
-					},
-				}),
-			}
-			go conf.configFetcher(
-				stopCh,
-				func(cfg interface{}) {
-					dispatch(cfg, Dht)
-				},
-				dhtFetcher, opts.sleep,
-				golog.LoggerFor(fmt.Sprintf("%v.%v.fetcher.dht", packageLogPrefix, opts.name)))
-		}
 	} else {
 		log.Debugf("Using sticky config")
 	}

config/initializer.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	commonconfig "github.com/getlantern/common/config"
-	"github.com/getlantern/dhtup"
 	"github.com/getlantern/golog"
 	"github.com/getlantern/yaml"
 
@@ -38,16 +37,15 @@ func Init(
 	configDir string, flags map[string]interface{}, userConfig common.UserConfig,
 	proxiesDispatch func(interface{}, Source), onProxiesSaveError func(error),
 	origGlobalDispatch func(interface{}, Source), onGlobalSaveError func(error),
-	rt http.RoundTripper, dhtupContext *dhtup.Context) (stop func()) {
+	rt http.RoundTripper) (stop func()) {
 
 	staging := isStaging(flags)
 	proxyConfigURL := checkOverrides(flags, getProxyURL(staging), "proxies.yaml.gz")
 	globalConfigURL := checkOverrides(flags, getGlobalURL(staging), "global.yaml.gz")
 
 	return InitWithURLs(
 		configDir, flags, userConfig, proxiesDispatch, onProxiesSaveError,
-		origGlobalDispatch, onGlobalSaveError, proxyConfigURL, globalConfigURL, rt,
-		dhtupContext)
+		origGlobalDispatch, onGlobalSaveError, proxyConfigURL, globalConfigURL, rt)
 }
 
 type cfgWithSource struct {
@@ -63,8 +61,7 @@ func InitWithURLs(
 	configDir string, flags map[string]interface{}, userConfig common.UserConfig,
 	origProxiesDispatch func(interface{}, Source), onProxiesSaveError func(error),
 	origGlobalDispatch func(interface{}, Source), onGlobalSaveError func(error),
-	proxyURL string, globalURL string, rt http.RoundTripper,
-	dhtupContext *dhtup.Context) (stop func()) {
+	proxyURL string, globalURL string, rt http.RoundTripper) (stop func()) {
 
 	var mx sync.RWMutex
 	globalConfigPollInterval := DefaultGlobalConfigPollInterval
@@ -151,9 +148,8 @@ func InitWithURLs(
 			defer mx.RUnlock()
 			return globalConfigPollInterval
 		},
-		sticky:       isSticky(flags),
-		rt:           rt,
-		dhtupContext: dhtupContext,
+		sticky: isSticky(flags),
+		rt:     rt,
 	}
 
 	stopGlobal := pipeConfig(globalOptions)

config/initializer_test.go

@@ -43,7 +43,7 @@ func TestInit(t *testing.T) {
 				req.Header.Add(common.CfgSvrAuthTokenHeader, "staging-token")
 				return nil, nil
 			},
-		}, nil)
+		})
 	defer stop()
 
 	_, valid := gotProxies.Get(time.Second * 12)
@@ -86,7 +86,7 @@ func TestInitWithURLs(t *testing.T) {
 			inTempDir("."), flags, newTestUserConfig(),
 			proxiesDispatch, nil,
 			globalDispatch, nil,
-			proxyConfigURL, globalConfigURL, &http.Transport{}, nil)
+			proxyConfigURL, globalConfigURL, &http.Transport{})
 		defer stop()
 
 		// sleep some amount

config_v7/config.go

@@ -16,7 +16,6 @@ import (
 	"github.com/getsentry/sentry-go"
 	"gopkg.in/yaml.v3"
 
-	"github.com/getlantern/dhtup"
 	"github.com/getlantern/golog"
 	"github.com/getlantern/rot13"
 
@@ -109,8 +108,6 @@ type options struct {
 	// dictate whether the fetcher will use dual fetching (from fronted and
 	// chained URLs) or not.
 	rt http.RoundTripper
-
-	dhtupContext *dhtup.Context
 }
 
 var globalConfigDhtTarget krpc.ID
@@ -207,33 +204,6 @@ func pipeConfig(opts *options) (stop func()) {
 				dispatch(cfg, Fetched)
 			}, fetcher, opts.sleep,
 			golog.LoggerFor(fmt.Sprintf("%v.%v.fetcher.http", packageLogPrefix, opts.name)))
-
-		if opts.dhtupContext != nil {
-			dhtFetcher := dhtFetcher{
-				dhtupResource: dhtup.NewResource(dhtup.ResourceInput{
-					DhtTarget:  globalConfigDhtTarget,
-					DhtContext: opts.dhtupContext,
-					FilePath:   opts.name,
-					// Empty this to force data to be obtained through peers.
-					WebSeedUrls: []string{"https://globalconfig.flashlightproxy.com/dhtup/"},
-					Salt:        []byte("globalconfig"),
-					// Empty this to force metainfo to be obtained via peers.
-					MetainfoUrls: []string{
-						// This won't work for changes until the CloudFlare caches are flushed as part of updates.
-						"https://globalconfig.flashlightproxy.com/dhtup/globalconfig.torrent",
-						// Bypass CloudFlare cache.
-						"https://s3.ap-northeast-1.amazonaws.com/globalconfig.flashlightproxy.com/dhtup/globalconfig.torrent",
-					},
-				}),
-			}
-			go conf.configFetcher(
-				stopCh,
-				func(cfg interface{}) {
-					dispatch(cfg, Dht)
-				},
-				dhtFetcher, opts.sleep,
-				golog.LoggerFor(fmt.Sprintf("%v.%v.fetcher.dht", packageLogPrefix, opts.name)))
-		}
 	} else {
 		log.Debugf("Using sticky config")
 	}

config_v7/initializer.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	commonconfig "github.com/getlantern/common/config"
-	"github.com/getlantern/dhtup"
 	"github.com/getlantern/golog"
 	"github.com/getlantern/yaml"
 
@@ -38,16 +37,15 @@ func Init(
 	configDir string, flags map[string]interface{}, userConfig common.UserConfig,
 	proxiesDispatch func(interface{}, Source), onProxiesSaveError func(error),
 	origGlobalDispatch func(interface{}, Source), onGlobalSaveError func(error),
-	rt http.RoundTripper, dhtupContext *dhtup.Context) (stop func()) {
+	rt http.RoundTripper) (stop func()) {
 
 	staging := isStaging(flags)
 	proxyConfigURL := checkOverrides(flags, getProxyURL(staging), "proxies.yaml.gz")
 	globalConfigURL := checkOverrides(flags, getGlobalURL(staging), "global.yaml.gz")
 
 	return InitWithURLs(
 		configDir, flags, userConfig, proxiesDispatch, onProxiesSaveError,
-		origGlobalDispatch, onGlobalSaveError, proxyConfigURL, globalConfigURL, rt,
-		dhtupContext)
+		origGlobalDispatch, onGlobalSaveError, proxyConfigURL, globalConfigURL, rt)
 }
 
 type cfgWithSource struct {
@@ -63,8 +61,7 @@ func InitWithURLs(
 	configDir string, flags map[string]interface{}, userConfig common.UserConfig,
 	origProxiesDispatch func(interface{}, Source), onProxiesSaveError func(error),
 	origGlobalDispatch func(interface{}, Source), onGlobalSaveError func(error),
-	proxyURL string, globalURL string, rt http.RoundTripper,
-	dhtupContext *dhtup.Context) (stop func()) {
+	proxyURL string, globalURL string, rt http.RoundTripper) (stop func()) {
 
 	var mx sync.RWMutex
 	globalConfigPollInterval := DefaultGlobalConfigPollInterval
@@ -151,9 +148,8 @@ func InitWithURLs(
 			defer mx.RUnlock()
 			return globalConfigPollInterval
 		},
-		sticky:       isSticky(flags),
-		rt:           rt,
-		dhtupContext: dhtupContext,
+		sticky: isSticky(flags),
+		rt:     rt,
 	}
 
 	stopGlobal := pipeConfig(globalOptions)

config_v7/initializer_test.go

@@ -43,7 +43,7 @@ func TestInit(t *testing.T) {
 				req.Header.Add(common.CfgSvrAuthTokenHeader, "staging-token")
 				return nil, nil
 			},
-		}, nil)
+		})
 	defer stop()
 
 	_, valid := gotProxies.Get(time.Second * 12)
@@ -86,7 +86,7 @@ func TestInitWithURLs(t *testing.T) {
 			inTempDir("."), flags, newTestUserConfig(),
 			proxiesDispatch, nil,
 			globalDispatch, nil,
-			proxyConfigURL, globalConfigURL, &http.Transport{}, nil)
+			proxyConfigURL, globalConfigURL, &http.Transport{})
 		defer stop()
 
 		// sleep some amount

flashlight.go

@@ -9,7 +9,6 @@ import (
 
 	commonconfig "github.com/getlantern/common/config"
 	"github.com/getlantern/detour"
-	"github.com/getlantern/dhtup"
 	"github.com/getlantern/dnsgrab"
 	"github.com/getlantern/errors"
 	"github.com/getlantern/eventual"
@@ -95,7 +94,6 @@ type Flashlight struct {
 	client            *client.Client
 	op                *fops.Op
 	errorHandler      func(HandledErrorType, error)
-	dhtupContext      *dhtup.Context
 	mxProxyListeners  sync.RWMutex
 	proxyListeners    []func(map[string]*commonconfig.ProxyConfig, config.Source)
 }
@@ -276,7 +274,7 @@ func (f *Flashlight) startConfigFetch() func() {
 	stopConfig := config.Init(
 		f.configDir, f.flagsAsMap, f.userConfig,
 		proxiesDispatch, onProxiesSaveError,
-		globalDispatch, onConfigSaveError, rt, f.dhtupContext)
+		globalDispatch, onConfigSaveError, rt)
 	return stopConfig
 }
 
@@ -326,7 +324,6 @@ func New(
 	reverseDNS func(host string) (string, error),
 	adTrackUrl func() string,
 	eventWithLabel func(category, action, label string),
-	dhtupContext *dhtup.Context,
 ) (*Flashlight, error) {
 	log.Debugf("Running in app: %v", appName)
 	log.Debugf("Using configdir: %v", configDir)
@@ -357,7 +354,6 @@ func New(
 		errorHandler: func(t HandledErrorType, err error) {
 			log.Errorf("%v: %v", t, err)
 		},
-		dhtupContext:   dhtupContext,
 		proxyListeners: make([]func(map[string]*commonconfig.ProxyConfig, config.Source), 0),
 	}