d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-13 23:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

accounts: Move to instance methods, fix races and isolate tests (#1923)

Browse Source 
* Bybit: Fix race in TestUpdateAccountInfo and  TestWSHandleData

* DriveBy rename TestWSHandleData
* This doesn't address running with -race=2+ due to the singleton

* Accounts: Add account.GetService()

* exchange: Assertify TestSetupDefaults

* Exchanges: Add account.Service override for testing

* Exchanges: Remove duplicate IsWebsocketEnabled test from TestSetupDefaults

* Dispatch: Replace nil checks with NilGuard

* Engine: Remove deprecated printAccountHoldingsChangeSummary

* Dispatcher: Add EnsureRunning method

* Accounts: Move singleton accounts service to exchange Accounts

* Move singleton accounts service to exchange Accounts

This maintains the concept of a global store, whilst allowing exchanges
to override it when needed, particularly for testing.

APIServer:

* Remove getAllActiveAccounts from apiserver

Deprecated apiserver only thing using this, so remove it instead of
updating it

* Update comment for UpdateAccountBalances everywhere

* Docs: Add punctuation to function comments

* Bybit: Coverage for wsProcessWalletPushData Save
This commit is contained in:
Gareth Kirwan
2025-10-28 09:52:45 +07:00
committed by GitHub
parent bda9bbec66
commit 73e200e4e7
140 changed files with 3515 additions and 4025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
exchanges/credentials.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/thrasher-corp/gocryptotrader/common"
"github.com/thrasher-corp/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/exchanges/account"
"github.com/thrasher-corp/gocryptotrader/exchange/accounts"
"github.com/thrasher-corp/gocryptotrader/log"
)
@@ -67,7 +67,7 @@ func (a *API) SetSubAccount(sub string) {
// CheckCredentials checks to see if the required fields have been set before
// sending an authenticated API request
func (b *Base) CheckCredentials(creds *account.Credentials, isContext bool) error {
func (b *Base) CheckCredentials(creds *accounts.Credentials, isContext bool) error {
if b.SkipAuthCheck {
return nil
}
@@ -98,10 +98,10 @@ func (b *Base) AreCredentialsValid(ctx context.Context) bool {
// GetDefaultCredentials returns the exchange.Base api credentials loaded by
// config.json
func (b *Base) GetDefaultCredentials() *account.Credentials {
func (b *Base) GetDefaultCredentials() *accounts.Credentials {
b.API.credMu.RLock()
defer b.API.credMu.RUnlock()
if b.API.credentials == (account.Credentials{}) {
if b.API.credentials == (accounts.Credentials{}) {
return nil
}
creds := b.API.credentials
@@ -110,12 +110,12 @@ func (b *Base) GetDefaultCredentials() *account.Credentials {
// GetCredentials checks and validates current credentials, context credentials
// override default credentials, if no credentials found, will return an error.
func (b *Base) GetCredentials(ctx context.Context) (*account.Credentials, error) {
value := ctx.Value(account.ContextCredentialsFlag)
func (b *Base) GetCredentials(ctx context.Context) (*accounts.Credentials, error) {
value := ctx.Value(accounts.ContextCredentialsFlag)
if value != nil {
ctxCredStore, ok := value.(*account.ContextCredentialsStore)
ctxCredStore, ok := value.(*accounts.ContextCredentialsStore)
if !ok {
return nil, common.GetTypeAssertError("*account.ContextCredentialsStore", value)
return nil, common.GetTypeAssertError("*accounts.ContextCredentialsStore", value)
}
creds := ctxCredStore.Get()
@@ -133,7 +133,7 @@ func (b *Base) GetCredentials(ctx context.Context) (*account.Credentials, error)
return nil, fmt.Errorf("error checking credentials: %w", err)
}
if subAccountOverride, ok := ctx.Value(account.ContextSubAccountFlag).(string); ok {
if subAccountOverride, ok := ctx.Value(accounts.ContextSubAccountFlag).(string); ok {
creds.SubAccount = subAccountOverride
}
@@ -141,7 +141,7 @@ func (b *Base) GetCredentials(ctx context.Context) (*account.Credentials, error)
}
// VerifyAPICredentials verifies the exchanges API credentials
func (b *Base) VerifyAPICredentials(creds *account.Credentials) error {
func (b *Base) VerifyAPICredentials(creds *accounts.Credentials) error {
b.API.credMu.RLock()
defer b.API.credMu.RUnlock()
if creds.IsEmpty() {