Move ExchangeRate impl inside wallet

cmd/spvwallet/main.go

@@ -9,7 +9,6 @@ import (
 	"github.com/OpenBazaar/spvwallet/api"
 	"github.com/OpenBazaar/spvwallet/cli"
 	"github.com/OpenBazaar/spvwallet/db"
-	"github.com/OpenBazaar/spvwallet/exchangerates"
 	"github.com/OpenBazaar/spvwallet/gui"
 	"github.com/OpenBazaar/spvwallet/gui/bootstrap"
 	wi "github.com/OpenBazaar/wallet-interface"
@@ -304,8 +303,6 @@ func (x *Start) Execute(args []string) error {
 	if x.Gui {
 		go wallet.Start()
 
-		exchangeRates := exchangerates.NewBitcoinPriceFetcher(nil)
-
 		type Stats struct {
 			Confirmed    int64  `json:"confirmed"`
 			Fiat         string `json:"fiat"`
@@ -366,7 +363,7 @@ func (x *Start) Execute(args []string) error {
 						astilog.Errorf(err.Error())
 						return
 					}
-					rate, err := exchangeRates.GetExchangeRate(p.CurrencyCode)
+					rate, err := wallet.ExchangeRates().GetExchangeRate(p.CurrencyCode)
 					if err != nil {
 						astilog.Errorf("Failed to get exchange rate")
 						return

wallet.go

@@ -16,6 +16,7 @@ import (
 	"io"
 	"sync"
 	"time"
+	"github.com/OpenBazaar/spvwallet/exchangerates"
 )
 
 type SPVWallet struct {
@@ -45,6 +46,8 @@ type SPVWallet struct {
 	running bool
 
 	config *PeerManagerConfig
+
+	exchangeRates wallet.ExchangeRates
 }
 
 var log = logging.MustGetLogger("bitcoin")
@@ -77,6 +80,7 @@ func NewSPVWallet(config *Config) (*SPVWallet, error) {
 	if err != nil {
 		return nil, err
 	}
+	er := exchangerates.NewBitcoinPriceFetcher(config.Proxy)
 	w := &SPVWallet{
 		repoPath:         config.RepoPath,
 		masterPrivateKey: mPrivKey,
@@ -95,6 +99,7 @@ func NewSPVWallet(config *Config) (*SPVWallet, error) {
 		fPositives:    make(chan *peer.Peer),
 		fpAccumulator: make(map[int32]int32),
 		mutex:         new(sync.RWMutex),
+		exchangeRates: er,
 	}
 
 	w.keyManager, err = NewKeyManager(config.DB.Keys(), w.params, w.masterPrivateKey)
@@ -432,3 +437,7 @@ func (w *SPVWallet) ReSyncBlockchain(fromDate time.Time) {
 	w.txstore.PopulateAdrs()
 	w.wireService.Resync()
 }
+
+func (w *SPVWallet) ExchangeRates() wallet.ExchangeRates {
+	return w.exchangeRates
+}