mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-05 07:26:47 +00:00
Currency package update (#247)
* Initial currency overhaul before service system implementation * Remove redundant currency string in orderbook.Base Unexport lastupdated field in orderbook.Base as it was being instantiated multiple times Add error handling for process orderbook * Remove redundant currency string in ticker.Price Unexport lastupdated field in ticker.Price Add error handling for process ticker function and fix tests * Phase Two Update * Update translations to use map type - thankyou to kempeng for spotting this * Change pair method name from Display -> Format for better readability * Fixes misspelling and tests * Implement requested changes from GloriousCode * Remove reduntant function and streamlined return in currency_translation.go * Revert pair method naming conventions * Change currency naming conventions * Changed code type to exported Item type with underlying string to reduce complexity * Added interim orderbook process method to orderbook.Base type * Changed feebuilder struct field to currency.Pair * Adds fall over system for backup fx providers * deprecate function and children and fix linter issue with btcmarkets * Fixed requested changes * Fix bug and move mtx for rates * Fixed after rebase oopsies * Fix linter issues * Fixes race conditions in testing functions * Final phase coinmarketcap update * fix linter issues * Implement requested changes * Adds configuration variables to increase/decrease time durations between updating currency file and fetching new currency rates * Add a collection of tests to improve codecov * After rebase oopsy fixes for btse * Fix requested changes * fix after rebase oopsies and add more efficient comparison checks within currency pair * Fix linter issues
This commit is contained in:
committed by
Adrian Gallagher
parent
ed760e184e
commit
0990f9d118
@@ -29,7 +29,7 @@ package events
|
||||
// func TestAddEvent(t *testing.T) {
|
||||
// testSetup(t)
|
||||
//
|
||||
// pair := pair.NewCurrencyPair("BTC", "USD")
|
||||
// pair := currency.NewPairFromStrings("BTC", "USD")
|
||||
// eventID, err := AddEvent("ANX", "price", ">,==", pair, "SPOT", actionTest)
|
||||
// if err != nil && eventID != 0 {
|
||||
// t.Errorf("Test Failed. AddEvent: Error, %s", err)
|
||||
@@ -59,7 +59,7 @@ package events
|
||||
// func TestRemoveEvent(t *testing.T) {
|
||||
// testSetup(t)
|
||||
//
|
||||
// pair := pair.NewCurrencyPair("BTC", "USD")
|
||||
// pair := currency.NewPairFromStrings("BTC", "USD")
|
||||
// eventID, err := AddEvent("ANX", "price", ">,==", pair, "SPOT", actionTest)
|
||||
// if err != nil && eventID != 0 {
|
||||
// t.Errorf("Test Failed. RemoveEvent: Error, %s", err)
|
||||
@@ -75,7 +75,7 @@ package events
|
||||
// func TestGetEventCounter(t *testing.T) {
|
||||
// testSetup(t)
|
||||
//
|
||||
// pair := pair.NewCurrencyPair("BTC", "USD")
|
||||
// pair := currency.NewPairFromStrings("BTC", "USD")
|
||||
// one, err := AddEvent("ANX", "price", ">,==", pair, "SPOT", actionTest)
|
||||
// if err != nil {
|
||||
// t.Errorf("Test Failed. GetEventCounter: Error, %s", err)
|
||||
@@ -114,7 +114,7 @@ package events
|
||||
// func TestExecuteAction(t *testing.T) {
|
||||
// testSetup(t)
|
||||
//
|
||||
// pair := pair.NewCurrencyPair("BTC", "USD")
|
||||
// pair := currency.NewPairFromStrings("BTC", "USD")
|
||||
// one, err := AddEvent("ANX", "price", ">,==", pair, "SPOT", actionTest)
|
||||
// if err != nil {
|
||||
// t.Fatalf("Test Failed. ExecuteAction: Error, %s", err)
|
||||
@@ -160,7 +160,7 @@ package events
|
||||
// func TestEventToString(t *testing.T) {
|
||||
// testSetup(t)
|
||||
//
|
||||
// pair := pair.NewCurrencyPair("BTC", "USD")
|
||||
// pair := currency.NewPairFromStrings("BTC", "USD")
|
||||
// one, err := AddEvent("ANX", "price", ">,==", pair, "SPOT", actionTest)
|
||||
// if err != nil {
|
||||
// t.Errorf("Test Failed. EventToString: Error, %s", err)
|
||||
@@ -180,7 +180,7 @@ package events
|
||||
// testSetup(t)
|
||||
//
|
||||
// // Test invalid currency pair
|
||||
// newPair := pair.NewCurrencyPair("A", "B")
|
||||
// newPair := currency.NewPairFromStrings("A", "B")
|
||||
// one, err := AddEvent("ANX", "price", ">=,10", newPair, "SPOT", actionTest)
|
||||
// if err != nil {
|
||||
// t.Errorf("Test Failed. CheckCondition: Error, %s", err)
|
||||
@@ -193,7 +193,7 @@ package events
|
||||
// // Test last price == 0
|
||||
// var tickerNew ticker.Price
|
||||
// tickerNew.Last = 0
|
||||
// newPair = pair.NewCurrencyPair("BTC", "USD")
|
||||
// newPair = currency.NewPairFromStrings("BTC", "USD")
|
||||
// ticker.ProcessTicker("ANX", newPair, tickerNew, ticker.Spot)
|
||||
// Events[one].Pair = newPair
|
||||
// conditionBool = Events[one].CheckCondition()
|
||||
@@ -287,7 +287,7 @@ package events
|
||||
// func TestCheckEvents(t *testing.T) {
|
||||
// testSetup(t)
|
||||
//
|
||||
// pair := pair.NewCurrencyPair("BTC", "USD")
|
||||
// pair := currency.NewPairFromStrings("BTC", "USD")
|
||||
// _, err := AddEvent("ANX", "price", ">=,10", pair, "SPOT", actionTest)
|
||||
// if err != nil {
|
||||
// t.Fatal("Test failed. TestChcheckEvents add event")
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
"github.com/thrasher-/gocryptotrader/communications"
|
||||
"github.com/thrasher-/gocryptotrader/communications/base"
|
||||
"github.com/thrasher-/gocryptotrader/config"
|
||||
"github.com/thrasher-/gocryptotrader/currency/pair"
|
||||
"github.com/thrasher-/gocryptotrader/currency"
|
||||
"github.com/thrasher-/gocryptotrader/exchanges/ticker"
|
||||
log "github.com/thrasher-/gocryptotrader/logger"
|
||||
)
|
||||
@@ -42,7 +42,7 @@ type Event struct {
|
||||
Exchange string
|
||||
Item string
|
||||
Condition string
|
||||
Pair pair.CurrencyPair
|
||||
Pair currency.Pair
|
||||
Asset string
|
||||
Action string
|
||||
Executed bool
|
||||
@@ -60,7 +60,7 @@ func SetComms(commsP *communications.Communications) {
|
||||
|
||||
// AddEvent adds an event to the Events chain and returns an index/eventID
|
||||
// and an error
|
||||
func AddEvent(exchange, item, condition string, currencyPair pair.CurrencyPair, asset, action string) (int, error) {
|
||||
func AddEvent(exchange, item, condition string, currencyPair currency.Pair, asset, action string) (int, error) {
|
||||
err := IsValidEvent(exchange, item, condition, action)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
@@ -129,8 +129,13 @@ func (e *Event) ExecuteAction() bool {
|
||||
func (e *Event) String() string {
|
||||
condition := common.SplitStrings(e.Condition, ",")
|
||||
return fmt.Sprintf(
|
||||
"If the %s%s [%s] %s on %s is %s then %s.", e.Pair.FirstCurrency.String(),
|
||||
e.Pair.SecondCurrency.String(), e.Asset, e.Item, e.Exchange, condition[0]+" "+condition[1], e.Action,
|
||||
"If the %s%s [%s] %s on %s is %s then %s.", e.Pair.Base.String(),
|
||||
e.Pair.Quote.String(),
|
||||
e.Asset,
|
||||
e.Item,
|
||||
e.Exchange,
|
||||
condition[0]+" "+condition[1],
|
||||
e.Action,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user