Initialize but do not run exchange rates when disabled

exchangerates/bitcoinprices.go

@@ -59,7 +59,6 @@ func NewBitcoinPriceFetcher(dialer proxy.Dialer) *BitcoinPriceFetcher {
 		{"https://blockchain.info/ticker", b.cache, client, BlockchainInfoDecoder{}},
 		{"https://api.bitcoincharts.com/v1/weighted_prices.json", b.cache, client, BitcoinChartsDecoder{}},
 	}
-	go b.run()
 	return &b
 }
 
@@ -141,7 +140,7 @@ func (provider *ExchangeRateProvider) fetch() (err error) {
 	return provider.decoder.decode(dataMap, provider.cache)
 }
 
-func (b *BitcoinPriceFetcher) run() {
+func (b *BitcoinPriceFetcher) Run() {
 	b.fetchCurrentRates()
 	ticker := time.NewTicker(time.Minute * 15)
 	for range ticker.C {

peers.go

@@ -93,11 +93,11 @@ func NewPeerManager(config *PeerManagerConfig) (*PeerManager, error) {
 	}
 
 	pm := &PeerManager{
-		addrManager: addrmgr.New(config.AddressCacheDir, nil),
-		peerMutex:   new(sync.RWMutex),
-		sourceAddr:  wire.NewNetAddressIPPort(net.ParseIP("0.0.0.0"), defaultPort, 0),
-		trustedPeer: config.TrustedPeer,
-		proxy:       config.Proxy,
+		addrManager:            addrmgr.New(config.AddressCacheDir, nil),
+		peerMutex:              new(sync.RWMutex),
+		sourceAddr:             wire.NewNetAddressIPPort(net.ParseIP("0.0.0.0"), defaultPort, 0),
+		trustedPeer:            config.TrustedPeer,
+		proxy:                  config.Proxy,
 		recentlyTriedAddresses: make(map[string]bool),
 		connectedPeers:         make(map[uint64]*peer.Peer),
 		msgChan:                config.MsgChan,

wallet.go

@@ -100,8 +100,10 @@ func NewSPVWallet(config *Config) (*SPVWallet, error) {
 		mutex:         new(sync.RWMutex),
 	}
 
+	bpf := exchangerates.NewBitcoinPriceFetcher(config.Proxy)
+	w.exchangeRates = bpf
 	if !config.DisableExchangeRates {
-		w.exchangeRates = exchangerates.NewBitcoinPriceFetcher(config.Proxy)
+		go bpf.Run()
 	}
 
 	w.keyManager, err = NewKeyManager(config.DB.Keys(), w.params, w.masterPrivateKey)