yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Use API call rather than server-specific method in test code

Browse Source
This commit is contained in:
James Houlahan
2022-11-21 18:51:00 +01:00
parent fd09769ccc
commit 57e9310510
5 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/api_test.go
View File

@ -34,7 +34,6 @@ type API interface {
CreateAddress(userID, address string, password []byte) (string, error)
RemoveAddress(userID, addrID string) error
GetAddressKeyIDs(userID, addrID string) ([]string, error)
RemoveAddressKey(userID, addrID, keyID string) error
UpdateDraft(userID, draftID string, changes liteapi.DraftTemplate) error

20
tests/user_test.go
View File

@ -207,18 +207,20 @@ func (s *scenario) theAddressOfAccountHasNoKeys(address, username string) error
userID := s.t.getUserID(username)
addrID := s.t.getUserAddrID(userID, address)
keyIDs, err := s.t.api.GetAddressKeyIDs(userID, addrID)
if err != nil {
return err
}
for _, keyID := range keyIDs {
if err := s.t.api.RemoveAddressKey(userID, addrID, keyID); err != nil {
return s.t.withClient(context.Background(), username, func(ctx context.Context, client *liteapi.Client) error {
address, err := client.GetAddress(ctx, addrID)
if err != nil {
return err
}
}
return nil
for _, key := range address.Keys {
if err := s.t.api.RemoveAddressKey(userID, addrID, key.ID); err != nil {
return err
}
}
return nil
})
}
// accountDraftChanged changes the draft attributes, where draftIndex is