mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-07 07:26:48 +00:00
Feature: Implement funding rates, futures and coin margin (exchange API coverage) (#530)
* ALMOST THERE * more api wips * more api thingz * testing n more api wipz * more apiz * more wips * what is goin on * more wips * whip n testing * testing * testing no keys * remove log * kraken is broken ugh * still broken * fixing auth funcs + usdtm api docs * wip * api stuffs * whip * more wips * whip * more wip * api wip n testing * wip * wip * unsaved * wip n testing * wip * wip * wip * wip * wip * wip * wip * wip * wip * whip * wrapper authenticated functions * adding asset type and fixing dependencies * wip * binance auth wrapper start * wrapper functionality * wip * wip * wip * wrapper cancel functions * order submission for wrappers * wip * more error fixing and nits * websocket beginning n error fix * wip * WOW * glorious n shazzy nits * useless nits * wip * fixing things * merge stuffs * crapveyor * crapveyor rebuild * probably broke more things than he fixed * rm lns n other thangs * hope * please * stop it * done * ofcourse * rm vb * fix lbank * appveyor please * float lev * DONT ASK RYAN FOR HELP EVER * wip * wip * endpoint upgrades continued * path upgrade * NeeeNeeeNeeeNeeeNING * fix stuffs * fixing time issue * fixing broken funcs * glorious nits * shaz changes * fixing errors for fundmon * more error fixing for fundmon * test running past 30s * basic changes * THX AGAIN SHAZBERT * path system upgrade * config upgrade * unsaved stuffs * broken wip config upgrade * path system upgrade contd. * path system upgrade contd * path upgrade ready for review * testing verbose removed * linter stuffs * appveyor stuffs * appveyor stuff * fixed? * bugfix * wip * broken stuff * fix test * wierd hack fix * appveyor pls stop * error found * more useless nits * bitmex err * broken wip * broken wip path upgrade change to uint32 * changed url lookups to uint * WOW * ready4review * config fixed HOPEFULLY * config fix and glorious changes * efficient way of getting orders and open orders * binance wrapper logic fixing * testing, adding tests and fixing lot of errrrrs * merge master * appveyor stuffs * appveyor stuffs * fmt * test * octalLiteral issue fix? * octalLiteral fix? * rm vb * prnt ln to restart * adding testz * test fixzzz * READY FOR REVIEW * Actually ready now * FORMATTING * addressing shazzy n glorious nits * crapveyor * rm vb * small change * fixing err * shazbert nits * review changes * requested changes * more requested changes * noo * last nit fixes * restart appveyor * improving test cov * Update .golangci.yml * shazbert changes * moving pair formatting * format pair update wip * path upgrade complete * error fix * appveyor linters * more linters * remove testexch * more formatting changes * changes * shazbert changes * checking older requested changes to ensure completion * wip * fixing broken code * error fix * all fixed * additional changes * more changes * remove commented code * ftx margin api * appveyor fixes * more appveyor issues + test addition * more appveyor issues + test addition * remove unnecessary * testing * testing, fixing okex api, error fix * git merge fix * go sum * glorious changes and error fix * rm vb * more glorious changes and go mod tidy * fixed now * okex testing upgrade * old config migration and batch fetching fix * added test * glorious requested changes WIP * tested and fixed * go fmted * go fmt and test fix * additional funcs and tests for fundingRates * OKEX tested and fixed * appveyor fixes * ineff assign * 1 glorious change * error fix * typo * shazbert changes * glorious code changes and path fixing huobi WIP * adding assetType to accountinfo functions * fixing panic * panic fix and updating account info wrappers WIP * updateaccountinfo updated * testing WIP binance USDT n Coin Margined and Kraken Futures * auth functions tested and fixed * added test * config reverted * shazbert and glorious changes * shazbert and glorious changes * latest changes and portfolio update * go fmt change: * remove commented codes * improved error checking * index out of range fix * rm ln * critical nit * glorious latest changes * appveyor changes * shazbert change * easier readability * latest glorious changes * shadow dec * assetstore updated * last change * another last change * merge changes * go mod tidy * thrasher requested changes wip * improving struct layouts * appveyor go fmt * remove unnecessary code * shazbert changes * small change * oopsie * tidy * configtest reverted * error fix * oopsie * for what * test patch fix * insecurities * fixing tests * fix config
This commit is contained in:
@@ -832,13 +832,6 @@ func (c *Config) CheckExchangeConfigValues() error {
|
||||
c.Exchanges[i].API.Credentials.ClientID = *c.Exchanges[i].ClientID
|
||||
}
|
||||
|
||||
if c.Exchanges[i].WebsocketURL != nil {
|
||||
c.Exchanges[i].API.Endpoints.WebsocketURL = *c.Exchanges[i].WebsocketURL
|
||||
}
|
||||
|
||||
c.Exchanges[i].API.Endpoints.URL = *c.Exchanges[i].APIURL
|
||||
c.Exchanges[i].API.Endpoints.URLSecondary = *c.Exchanges[i].APIURLSecondary
|
||||
|
||||
// Flush settings
|
||||
c.Exchanges[i].AuthenticatedAPISupport = nil
|
||||
c.Exchanges[i].AuthenticatedWebsocketAPISupport = nil
|
||||
@@ -867,26 +860,6 @@ func (c *Config) CheckExchangeConfigValues() error {
|
||||
c.Exchanges[i].Websocket = nil
|
||||
}
|
||||
|
||||
if c.Exchanges[i].API.Endpoints.URL != APIURLNonDefaultMessage {
|
||||
if c.Exchanges[i].API.Endpoints.URL == "" {
|
||||
// Set default if nothing set
|
||||
c.Exchanges[i].API.Endpoints.URL = APIURLNonDefaultMessage
|
||||
}
|
||||
}
|
||||
|
||||
if c.Exchanges[i].API.Endpoints.URLSecondary != APIURLNonDefaultMessage {
|
||||
if c.Exchanges[i].API.Endpoints.URLSecondary == "" {
|
||||
// Set default if nothing set
|
||||
c.Exchanges[i].API.Endpoints.URLSecondary = APIURLNonDefaultMessage
|
||||
}
|
||||
}
|
||||
|
||||
if c.Exchanges[i].API.Endpoints.WebsocketURL != WebsocketURLNonDefaultMessage {
|
||||
if c.Exchanges[i].API.Endpoints.WebsocketURL == "" {
|
||||
c.Exchanges[i].API.Endpoints.WebsocketURL = WebsocketURLNonDefaultMessage
|
||||
}
|
||||
}
|
||||
|
||||
// Check if see if the new currency pairs format is empty and flesh it out if so
|
||||
if c.Exchanges[i].CurrencyPairs == nil {
|
||||
c.Exchanges[i].CurrencyPairs = new(currency.PairsManager)
|
||||
|
||||
@@ -1312,10 +1312,7 @@ func TestCheckExchangeConfigValues(t *testing.T) {
|
||||
!strings.Contains(cfg.Exchanges[0].API.Credentials.PEMKey, "ASDF") ||
|
||||
!cfg.Exchanges[0].API.PEMKeySupport ||
|
||||
!cfg.Exchanges[0].API.AuthenticatedSupport ||
|
||||
!cfg.Exchanges[0].API.AuthenticatedWebsocketSupport ||
|
||||
cfg.Exchanges[0].API.Endpoints.WebsocketURL != "wss://1337" ||
|
||||
cfg.Exchanges[0].API.Endpoints.URL != APIURLNonDefaultMessage ||
|
||||
cfg.Exchanges[0].API.Endpoints.URLSecondary != APIURLNonDefaultMessage {
|
||||
!cfg.Exchanges[0].API.AuthenticatedWebsocketSupport {
|
||||
t.Error("unexpected values")
|
||||
}
|
||||
|
||||
@@ -1336,9 +1333,6 @@ func TestCheckExchangeConfigValues(t *testing.T) {
|
||||
cfg.Exchanges[0].Features = nil
|
||||
cfg.Exchanges[0].SupportsAutoPairUpdates = convert.BoolPtr(true)
|
||||
cfg.Exchanges[0].Websocket = convert.BoolPtr(true)
|
||||
cfg.Exchanges[0].API.Endpoints.URL = ""
|
||||
cfg.Exchanges[0].API.Endpoints.URLSecondary = ""
|
||||
cfg.Exchanges[0].API.Endpoints.WebsocketURL = ""
|
||||
|
||||
err = cfg.CheckExchangeConfigValues()
|
||||
if err != nil {
|
||||
@@ -1351,12 +1345,6 @@ func TestCheckExchangeConfigValues(t *testing.T) {
|
||||
t.Error("unexpected values")
|
||||
}
|
||||
|
||||
if cfg.Exchanges[0].API.Endpoints.URL != APIURLNonDefaultMessage ||
|
||||
cfg.Exchanges[0].API.Endpoints.URLSecondary != APIURLNonDefaultMessage ||
|
||||
cfg.Exchanges[0].API.Endpoints.WebsocketURL != WebsocketURLNonDefaultMessage {
|
||||
t.Error("unexpected values")
|
||||
}
|
||||
|
||||
p1, err := currency.NewPairDelimiter(testPair, "-")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
@@ -375,9 +375,10 @@ type APIConfig struct {
|
||||
AuthenticatedWebsocketSupport bool `json:"authenticatedWebsocketApiSupport"`
|
||||
PEMKeySupport bool `json:"pemKeySupport,omitempty"`
|
||||
|
||||
Endpoints APIEndpointsConfig `json:"endpoints"`
|
||||
Credentials APICredentialsConfig `json:"credentials"`
|
||||
CredentialsValidator *APICredentialsValidatorConfig `json:"credentialsValidator,omitempty"`
|
||||
OldEndPoints *APIEndpointsConfig `json:"endpoints,omitempty"`
|
||||
Endpoints map[string]string `json:"urlEndpoints"`
|
||||
}
|
||||
|
||||
// OrderbookConfig stores the orderbook configuration variables
|
||||
|
||||
Reference in New Issue
Block a user