Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

credentials: Refactor GetCredentials and CheckCredentials #1683

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

credentials: Refactor GetCredentials and CheckCredentials #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion exchanges/btcmarkets/btcmarkets_websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,18 @@ func (b *BTCMarkets) wsHandleData(respRaw []byte) error {
}
}

clientID := ""
if creds != nil {
clientID = creds.ClientID
}

b.Websocket.DataHandler <- &order.Detail{
Price: price,
Amount: originalAmount,
RemainingAmount: orderData.OpenVolume,
Exchange: b.Name,
OrderID: orderID,
ClientID: creds.ClientID,
ClientID: clientID,
Type: oType,
Side: oSide,
Status: oStatus,
Expand Down
23 changes: 12 additions & 11 deletions exchanges/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ func (b *Base) GetCredentials(ctx context.Context) (*account.Credentials, error)
if !ok {
// NOTE: Return empty credentials on error to limit panic on
// websocket handling.
return &account.Credentials{}, errContextCredentialsFailure
return nil, fmt.Errorf("context credentials store type assertion failed for %T: %w",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returning nil causes panics in the CI builds, can you please rectify them. Can also change the error wrapping to fmt.Errorf("%w: %w", common.GetTypeAssertError(params...),errContextCredentialsFailure)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, crap I wasn't supposed to return nil (since the comment mentioned that)

*** I should remove tabnine from my IDE

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can leave it as nil but you will need to do a bit more work. What you have done is more correct on what should happen. I will leave it up to you on what you want to do.

value, errContextCredentialsFailure)
}

creds := ctxCredStore.Get()
Expand All @@ -127,19 +128,19 @@ func (b *Base) GetCredentials(ctx context.Context) (*account.Credentials, error)
return creds, nil
}

// Fallback to default credentials
creds := b.API.credentials
err := b.CheckCredentials(&creds, false)
if err != nil {
// NOTE: Return empty credentials on error to limit panic on websocket
// handling.
return &account.Credentials{}, err
if err := b.CheckCredentials(&creds, false); err != nil {
return nil, err
}
subAccountOverride, ok := ctx.Value(account.ContextSubAccountFlag).(string)
b.API.credMu.RLock()
defer b.API.credMu.RUnlock()
if ok {
creds.SubAccount = subAccountOverride

// Sub account override if set
if SubAccountOverride, ok := ctx.Value(account.ContextSubAccountFlag).(string); ok {
b.API.credMu.RLock()
creds.SubAccount = SubAccountOverride
b.API.credMu.RUnlock()
}
Comment on lines +138 to 142
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if SubAccountOverride, ok := ctx.Value(account.ContextSubAccountFlag).(string); ok {
b.API.credMu.RLock()
creds.SubAccount = SubAccountOverride
b.API.credMu.RUnlock()
}
if subAccountOverride, ok := ctx.Value(account.ContextSubAccountFlag).(string); ok {
b.API.credMu.RLock()
creds.SubAccount = subAccountOverride
b.API.credMu.RUnlock()
}


return &creds, nil
}

Expand Down
Loading