Optimisation: large structs/huge param fixes (part 2) (thrasher-corp#262

) * updated golangci config to enable hugeparam linter * ModifyOrder struct usage converted to a pointer * OrderBook conversion to struct * More conversion of large structs to pointers * updated golangci config to enable hugeparam linter * ModifyOrder struct usage converted to a pointer * OrderBook conversion to struct * More conversion of large structs to pointers * disabled hugeParam check for golang again * changed based on suggested feedback and fix for no default provider * fixed typing
fpk7660837 · Mar 26, 2019 · dc236c2 · dc236c2
1 parent 5683fdd
commit dc236c2
Show file tree

Hide file tree

Showing 87 changed files with 234 additions and 232 deletions.
diff --git a/currency/code.go b/currency/code.go
@@ -347,7 +347,7 @@ func (b *BaseCodes) RegisterFiat(c string) (Code, error) {
 }
 
 // LoadItem sets item data
-func (b *BaseCodes) LoadItem(item Item) error {
+func (b *BaseCodes) LoadItem(item *Item) error {
 	b.mtx.Lock()
 	defer b.mtx.Unlock()
 	for i := range b.Items {
@@ -386,7 +386,7 @@ func (b *BaseCodes) LoadItem(item Item) error {
 		}
 	}
 
-	b.Items = append(b.Items, &item)
+	b.Items = append(b.Items, item)
 	return nil
 }
 
@@ -414,7 +414,7 @@ type Item struct {
 }
 
 // String conforms to the stringer interface
-func (i Item) String() string {
+func (i *Item) String() string {
 	return i.FullName
 }
 

diff --git a/currency/code_test.go b/currency/code_test.go
@@ -213,7 +213,7 @@ func TestBaseCode(t *testing.T) {
 			true)
 	}
 
-	err = main.LoadItem(Item{
+	err = main.LoadItem(&Item{
 		ID:       0,
 		FullName: "Cardano",
 		Role:     Cryptocurrency,
@@ -421,6 +421,6 @@ func TestItemString(t *testing.T) {
 	if newItem.String() != expected {
 		t.Errorf("Test Failed - Item String() error expected %s but recieved %s",
 			expected,
-			newItem)
+			&newItem)
 	}
 }
diff --git a/currency/forexprovider/forexprovider.go b/currency/forexprovider/forexprovider.go
@@ -130,7 +130,7 @@ func StartFXService(fxProviders []base.Settings) (*ForexProviders, error) {
 	}
 
 	if handler.Primary.Provider == nil {
-		return nil, errors.New("no foreign exchange providers enabled")
+		return nil, errors.New("no primary forex provider enabled")
 	}
 
 	return handler, nil

diff --git a/currency/storage.go b/currency/storage.go
@@ -316,7 +316,7 @@ func (s *Storage) SeedCurrencyAnalysisData() error {
 		return err
 	}
 
-	err = s.LoadFileCurrencyData(fromFile)
+	err = s.LoadFileCurrencyData(&fromFile)
 	if err != nil {
 		return err
 	}
@@ -369,37 +369,38 @@ func (s *Storage) WriteCurrencyDataToFile(path string, mainUpdate bool) error {
 }
 
 // LoadFileCurrencyData loads currencies into the currency codes
-func (s *Storage) LoadFileCurrencyData(f File) error {
-	for _, contract := range f.Contracts {
-		err := s.currencyCodes.LoadItem(contract)
+func (s *Storage) LoadFileCurrencyData(f *File) error {
+
+	for i := range f.Contracts {
+		err := s.currencyCodes.LoadItem(&f.Contracts[i])
 		if err != nil {
 			return err
 		}
 	}
 
-	for _, crypto := range f.Cryptocurrency {
-		err := s.currencyCodes.LoadItem(crypto)
+	for i := range f.Cryptocurrency {
+		err := s.currencyCodes.LoadItem(&f.Cryptocurrency[i])
 		if err != nil {
 			return err
 		}
 	}
 
-	for _, fiat := range f.FiatCurrency {
-		err := s.currencyCodes.LoadItem(fiat)
+	for i := range f.Token {
+		err := s.currencyCodes.LoadItem(&f.Token[i])
 		if err != nil {
 			return err
 		}
 	}
 
-	for _, token := range f.Token {
-		err := s.currencyCodes.LoadItem(token)
+	for i := range f.FiatCurrency {
+		err := s.currencyCodes.LoadItem(&f.FiatCurrency[i])
 		if err != nil {
 			return err
 		}
 	}
 
-	for _, unset := range f.UnsetCurrency {
-		err := s.currencyCodes.LoadItem(unset)
+	for i := range f.UnsetCurrency {
+		err := s.currencyCodes.LoadItem(&f.UnsetCurrency[i])
 		if err != nil {
 			return err
 		}

diff --git a/exchanges/alphapoint/alphapoint_test.go b/exchanges/alphapoint/alphapoint_test.go
@@ -619,7 +619,7 @@ func TestModifyOrder(t *testing.T) {
 	a := &Alphapoint{}
 	a.SetDefaults()
 
-	_, err := a.ModifyOrder(exchange.ModifyOrder{})
+	_, err := a.ModifyOrder(&exchange.ModifyOrder{})
 	if err == nil {
 		t.Error("Test failed - ModifyOrder() error")
 	}

diff --git a/exchanges/alphapoint/alphapoint_wrapper.go b/exchanges/alphapoint/alphapoint_wrapper.go
@@ -152,7 +152,7 @@ func (a *Alphapoint) SubmitOrder(p currency.Pair, side exchange.OrderSide, order
 
 // ModifyOrder will allow of changing orderbook placement and limit to
 // market conversion
-func (a *Alphapoint) ModifyOrder(_ exchange.ModifyOrder) (string, error) {
+func (a *Alphapoint) ModifyOrder(_ *exchange.ModifyOrder) (string, error) {
 	return "", common.ErrNotYetImplemented
 }
 

diff --git a/exchanges/anx/anx_test.go b/exchanges/anx/anx_test.go
@@ -355,7 +355,7 @@ func TestGetAccountInfo(t *testing.T) {
 }
 
 func TestModifyOrder(t *testing.T) {
-	_, err := a.ModifyOrder(exchange.ModifyOrder{})
+	_, err := a.ModifyOrder(&exchange.ModifyOrder{})
 	if err == nil {
 		t.Error("Test failed - ModifyOrder() error")
 	}

diff --git a/exchanges/anx/anx_wrapper.go b/exchanges/anx/anx_wrapper.go
@@ -289,7 +289,7 @@ func (a *ANX) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderType ex
 
 // ModifyOrder will allow of changing orderbook placement and limit to
 // market conversion
-func (a *ANX) ModifyOrder(action exchange.ModifyOrder) (string, error) {
+func (a *ANX) ModifyOrder(action *exchange.ModifyOrder) (string, error) {
 	return "", common.ErrFunctionNotSupported
 }
 

diff --git a/exchanges/binance/binance.go b/exchanges/binance/binance.go
@@ -437,7 +437,7 @@ func (b *Binance) GetBestPrice(symbol string) (BestPrice, error) {
 }
 
 // NewOrder sends a new order to Binance
-func (b *Binance) NewOrder(o NewOrderRequest) (NewOrderResponse, error) {
+func (b *Binance) NewOrder(o *NewOrderRequest) (NewOrderResponse, error) {
 	var resp NewOrderResponse
 
 	path := fmt.Sprintf("%s%s", b.APIUrl, newOrder)

diff --git a/exchanges/binance/binance_test.go b/exchanges/binance/binance_test.go
@@ -143,7 +143,7 @@ func TestNewOrder(t *testing.T) {
 	if testAPIKey == "" || testAPISecret == "" {
 		t.Skip()
 	}
-	_, err := b.NewOrder(NewOrderRequest{
+	_, err := b.NewOrder(&NewOrderRequest{
 		Symbol:      "BTCUSDT",
 		Side:        BinanceRequestParamsSideSell,
 		TradeType:   BinanceRequestParamsOrderLimit,
@@ -466,7 +466,7 @@ func TestGetAccountInfo(t *testing.T) {
 }
 
 func TestModifyOrder(t *testing.T) {
-	_, err := b.ModifyOrder(exchange.ModifyOrder{})
+	_, err := b.ModifyOrder(&exchange.ModifyOrder{})
 	if err == nil {
 		t.Error("Test failed - ModifyOrder() error")
 	}

diff --git a/exchanges/binance/binance_websocket.go b/exchanges/binance/binance_websocket.go
@@ -61,11 +61,11 @@ func (b *Binance) SeedLocalCache(p currency.Pair) error {
 	newOrderBook.Pair = currency.NewPairFromString(formattedPair.String())
 	newOrderBook.AssetType = ticker.Spot
 
-	return b.Websocket.Orderbook.LoadSnapshot(newOrderBook, b.GetName(), false)
+	return b.Websocket.Orderbook.LoadSnapshot(&newOrderBook, b.GetName(), false)
 }
 
 // UpdateLocalCache updates and returns the most recent iteration of the orderbook
-func (b *Binance) UpdateLocalCache(ob WebsocketDepthStream) error {
+func (b *Binance) UpdateLocalCache(ob *WebsocketDepthStream) error {
 	m.Lock()
 	ID, ok := lastUpdateID[ob.Pair]
 	if !ok {
@@ -323,7 +323,7 @@ func (b *Binance) WsHandleData() {
 						continue
 					}
 
-					err = b.UpdateLocalCache(depth)
+					err = b.UpdateLocalCache(&depth)
 					if err != nil {
 						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - UpdateLocalCache error: %s",
 							err)

diff --git a/exchanges/binance/binance_wrapper.go b/exchanges/binance/binance_wrapper.go
@@ -232,7 +232,7 @@ func (b *Binance) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderTyp
 		TimeInForce: BinanceRequestParamsTimeGTC,
 	}
 
-	response, err := b.NewOrder(orderRequest)
+	response, err := b.NewOrder(&orderRequest)
 
 	if response.OrderID > 0 {
 		submitOrderResponse.OrderID = fmt.Sprintf("%v", response.OrderID)
@@ -247,7 +247,7 @@ func (b *Binance) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderTyp
 
 // ModifyOrder will allow of changing orderbook placement and limit to
 // market conversion
-func (b *Binance) ModifyOrder(action exchange.ModifyOrder) (string, error) {
+func (b *Binance) ModifyOrder(action *exchange.ModifyOrder) (string, error) {
 	return "", common.ErrFunctionNotSupported
 }
 

diff --git a/exchanges/bitfinex/bitfinex_test.go b/exchanges/bitfinex/bitfinex_test.go
@@ -823,7 +823,7 @@ func TestCancelAllExchangeOrdera(t *testing.T) {
 }
 
 func TestModifyOrder(t *testing.T) {
-	_, err := b.ModifyOrder(exchange.ModifyOrder{})
+	_, err := b.ModifyOrder(&exchange.ModifyOrder{})
 	if err == nil {
 		t.Error("Test failed - ModifyOrder() error")
 	}

diff --git a/exchanges/bitfinex/bitfinex_websocket.go b/exchanges/bitfinex/bitfinex_websocket.go
@@ -522,13 +522,13 @@ func (b *Bitfinex) WsInsertSnapshot(p currency.Pair, assetType string, books []W
 		return errors.New("bitfinex.go error - no orderbooks in item lists")
 	}
 
-	var newOrderbook orderbook.Base
-	newOrderbook.Asks = ask
-	newOrderbook.AssetType = assetType
-	newOrderbook.Bids = bid
-	newOrderbook.Pair = p
+	var newOrderBook orderbook.Base
+	newOrderBook.Asks = ask
+	newOrderBook.AssetType = assetType
+	newOrderBook.Bids = bid
+	newOrderBook.Pair = p
 
-	err := b.Websocket.Orderbook.LoadSnapshot(newOrderbook, b.GetName(), false)
+	err := b.Websocket.Orderbook.LoadSnapshot(&newOrderBook, b.GetName(), false)
 	if err != nil {
 		return fmt.Errorf("bitfinex.go error - %s", err)
 	}

diff --git a/exchanges/bitfinex/bitfinex_wrapper.go b/exchanges/bitfinex/bitfinex_wrapper.go
@@ -216,7 +216,7 @@ func (b *Bitfinex) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderTy
 
 // ModifyOrder will allow of changing orderbook placement and limit to
 // market conversion
-func (b *Bitfinex) ModifyOrder(action exchange.ModifyOrder) (string, error) {
+func (b *Bitfinex) ModifyOrder(action *exchange.ModifyOrder) (string, error) {
 	return "", common.ErrFunctionNotSupported
 }
 

diff --git a/exchanges/bitflyer/bitflyer_test.go b/exchanges/bitflyer/bitflyer_test.go
@@ -369,7 +369,7 @@ func TestWithdraw(t *testing.T) {
 }
 
 func TestModifyOrder(t *testing.T) {
-	_, err := b.ModifyOrder(exchange.ModifyOrder{})
+	_, err := b.ModifyOrder(&exchange.ModifyOrder{})
 	if err == nil {
 		t.Error("Test failed - ModifyOrder() error")
 	}

diff --git a/exchanges/bitflyer/bitflyer_wrapper.go b/exchanges/bitflyer/bitflyer_wrapper.go
@@ -173,7 +173,7 @@ func (b *Bitflyer) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderTy
 
 // ModifyOrder will allow of changing orderbook placement and limit to
 // market conversion
-func (b *Bitflyer) ModifyOrder(action exchange.ModifyOrder) (string, error) {
+func (b *Bitflyer) ModifyOrder(action *exchange.ModifyOrder) (string, error) {
 	return "", common.ErrFunctionNotSupported
 }
 

diff --git a/exchanges/bithumb/bithumb_test.go b/exchanges/bithumb/bithumb_test.go
@@ -421,7 +421,7 @@ func TestGetAccountInfo(t *testing.T) {
 
 func TestModifyOrder(t *testing.T) {
 	curr := currency.NewPairFromString("BTCUSD")
-	_, err := b.ModifyOrder(exchange.ModifyOrder{OrderID: "1337",
+	_, err := b.ModifyOrder(&exchange.ModifyOrder{OrderID: "1337",
 		Price:        100,
 		Amount:       1000,
 		OrderSide:    exchange.SellOrderSide,

diff --git a/exchanges/bithumb/bithumb_wrapper.go b/exchanges/bithumb/bithumb_wrapper.go
@@ -215,7 +215,7 @@ func (b *Bithumb) SubmitOrder(p currency.Pair, side exchange.OrderSide, _ exchan
 
 // ModifyOrder will allow of changing orderbook placement and limit to
 // market conversion
-func (b *Bithumb) ModifyOrder(action exchange.ModifyOrder) (string, error) {
+func (b *Bithumb) ModifyOrder(action *exchange.ModifyOrder) (string, error) {
 	order, err := b.ModifyTrade(action.OrderID,
 		action.CurrencyPair.Base.String(),
 		common.StringToLower(action.OrderSide.ToString()),