Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: Fix all linter errors

Browse Source
This commit is contained in:
Leander Beernaert
2022-10-18 13:54:12 +02:00
committed by James Houlahan
parent b36972ce71
commit 7c62312220
45 changed files with 206 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/ctx_test.go
View File

@ -241,17 +241,3 @@ func (t *testCtx) close(ctx context.Context) error {
return nil
}
func chToType[In, Out any](inCh <-chan In, done any) <-chan Out {
outCh := make(chan Out)
go func() {
defer close(outCh)
for in := range inCh {
outCh <- any(in).(Out)
}
}()
return outCh
}

45
tests/imap_test.go
View File

@ -150,9 +150,7 @@ func (s *scenario) imapClientSeesTheFollowingMailboxInfo(clientID string, table
return err
}
haveMailboxes := xslices.Map(status, func(status *imap.MailboxStatus) Mailbox {
return newMailboxFromIMAP(status)
})
haveMailboxes := xslices.Map(status, newMailboxFromIMAP)
wantMailboxes, err := unmarshalTable[Mailbox](table)
if err != nil {
@ -182,9 +180,7 @@ func (s *scenario) imapClientSeesTheFollowingMailboxInfoForMailbox(clientID, mai
return status.Name == mailbox
})
haveMailboxes := xslices.Map(status, func(info *imap.MailboxStatus) Mailbox {
return newMailboxFromIMAP(info)
})
haveMailboxes := xslices.Map(status, newMailboxFromIMAP)
wantMailboxes, err := unmarshalTable[Mailbox](table)
if err != nil {
@ -197,10 +193,7 @@ func (s *scenario) imapClientSeesTheFollowingMailboxInfoForMailbox(clientID, mai
func (s *scenario) imapClientSeesTheFollowingMailboxes(clientID string, table *godog.Table) error {
_, client := s.t.getIMAPClient(clientID)
mailboxes, err := clientList(client)
if err != nil {
return err
}
mailboxes := clientList(client)
have := xslices.Map(mailboxes, func(info *imap.MailboxInfo) string {
return info.Name
@ -220,10 +213,7 @@ func (s *scenario) imapClientSeesTheFollowingMailboxes(clientID string, table *g
func (s *scenario) imapClientSeesMailbox(clientID, mailbox string) error {
_, client := s.t.getIMAPClient(clientID)
mailboxes, err := clientList(client)
if err != nil {
return err
}
mailboxes := clientList(client)
if !slices.Contains(xslices.Map(mailboxes, func(info *imap.MailboxInfo) string { return info.Name }), mailbox) {
return fmt.Errorf("expected %v to contain %v but it doesn't", mailboxes, mailbox)
@ -235,10 +225,7 @@ func (s *scenario) imapClientSeesMailbox(clientID, mailbox string) error {
func (s *scenario) imapClientDoesNotSeeMailbox(clientID, mailbox string) error {
_, client := s.t.getIMAPClient(clientID)
mailboxes, err := clientList(client)
if err != nil {
return err
}
mailboxes := clientList(client)
if slices.Contains(xslices.Map(mailboxes, func(info *imap.MailboxInfo) string { return info.Name }), mailbox) {
return fmt.Errorf("expected %v to not contain %v but it does", mailboxes, mailbox)
@ -250,10 +237,7 @@ func (s *scenario) imapClientDoesNotSeeMailbox(clientID, mailbox string) error {
func (s *scenario) imapClientCountsMailboxesUnder(clientID string, count int, parent string) error {
_, client := s.t.getIMAPClient(clientID)
mailboxes, err := clientList(client)
if err != nil {
return err
}
mailboxes := clientList(client)
mailboxes = xslices.Filter(mailboxes, func(info *imap.MailboxInfo) bool {
return strings.HasPrefix(info.Name, parent) && info.Name != parent
@ -304,9 +288,7 @@ func (s *scenario) imapClientSeesTheFollowingMessagesInMailbox(clientID, mailbox
return err
}
haveMessages := xslices.Map(fetch, func(msg *imap.Message) Message {
return newMessageFromIMAP(msg)
})
haveMessages := xslices.Map(fetch, newMessageFromIMAP)
wantMessages, err := unmarshalTable[Message](table)
if err != nil {
@ -405,7 +387,7 @@ func (s *scenario) imapClientExpunges(clientID string) error {
return client.Expunge(nil)
}
func clientList(client *client.Client) ([]*imap.MailboxInfo, error) {
func clientList(client *client.Client) []*imap.MailboxInfo {
resCh := make(chan *imap.MailboxInfo)
go func() {
@ -414,16 +396,13 @@ func clientList(client *client.Client) ([]*imap.MailboxInfo, error) {
}
}()
return iterator.Collect(iterator.Chan(resCh)), nil
return iterator.Collect(iterator.Chan(resCh))
}
func clientStatus(client *client.Client) ([]*imap.MailboxStatus, error) {
var status []*imap.MailboxStatus
list := clientList(client)
list, err := clientList(client)
if err != nil {
return nil, err
}
status := make([]*imap.MailboxStatus, 0, len(list))
for _, info := range list {
res, err := client.Status(info.Name, []imap.StatusItem{imap.StatusMessages, imap.StatusRecent, imap.StatusUidNext, imap.StatusUidValidity, imap.StatusUnseen})
@ -502,7 +481,7 @@ func clientCopy(client *client.Client, from, to string, uid ...uint32) error {
return client.UidCopy(seqset, to)
}
func clientStore(client *client.Client, from, to int, item imap.StoreItem, flags ...string) ([]*imap.Message, error) {
func clientStore(client *client.Client, from, to int, item imap.StoreItem, flags ...string) ([]*imap.Message, error) { //nolint:unparam
resCh := make(chan *imap.Message)
go func() {

6
tests/types_test.go
View File

@ -166,7 +166,7 @@ func matchMailboxes(have, want []Mailbox) error {
return nil
}
func eventually(condition func() error, waitFor, tick time.Duration) error {
func eventually(condition func() error, waitFor, tick time.Duration) error { //nolint:unparam
ch := make(chan error, 1)
timer := time.NewTimer(waitFor)
@ -200,7 +200,7 @@ func unmarshalTable[T any](table *messages.PickleTable) ([]T, error) {
return nil, fmt.Errorf("empty table")
}
var res []T
res := make([]T, 0, len(table.Rows))
for _, row := range table.Rows[1:] {
var v T
@ -227,7 +227,7 @@ func unmarshalRow(header, row *messages.PickleTableRow, v any) error {
continue
}
switch field.Type.Kind() {
switch field.Type.Kind() { //nolint:exhaustive
case reflect.String:
reflect.ValueOf(v).Elem().Field(idx).SetString(cell)