Skip to content

Commit

Permalink
chore: Fix go imports
Browse files Browse the repository at this point in the history
  • Loading branch information
LBeernaertProton committed Jun 27, 2023
1 parent c042847 commit f43eebd
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 12 deletions.
3 changes: 2 additions & 1 deletion db/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package db

import (
"context"
"github.com/ProtonMail/gluon/imap"
"path/filepath"

"github.com/ProtonMail/gluon/imap"
)

const ChunkLimit = 1000
Expand Down
2 changes: 1 addition & 1 deletion internal/db_impl/sqlite3/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"database/sql"
"errors"
"fmt"
"github.com/ProtonMail/gluon/imap"
"io/fs"
"os"
"path/filepath"
"sync"

"github.com/ProtonMail/gluon/db"
"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
gluon_utils "github.com/ProtonMail/gluon/internal/utils"
"github.com/ProtonMail/gluon/reporter"
Expand Down
7 changes: 4 additions & 3 deletions internal/db_impl/sqlite3/migration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import (
"database/sql"
"errors"
"fmt"
"strings"
"testing"
"time"

"github.com/ProtonMail/gluon/db"
"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
Expand All @@ -13,9 +17,6 @@ import (
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"golang.org/x/exp/slices"
"strings"
"testing"
"time"
)

func TestMigration_VersionTooHigh(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/db_impl/sqlite3/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"errors"
"fmt"
"github.com/ProtonMail/gluon/imap"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"

"github.com/ProtonMail/gluon/db"
"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
v0 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v0"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/db_impl/sqlite3/read_ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"database/sql"
"errors"
"fmt"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"
"strings"
"time"

"github.com/ProtonMail/gluon/db"
"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"
"github.com/bradenaw/juniper/xmaps"
"github.com/bradenaw/juniper/xslices"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/db_impl/sqlite3/v0/migration.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v0
import (
"context"
"fmt"
"github.com/ProtonMail/gluon/imap"

"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
"github.com/bradenaw/juniper/xmaps"
"github.com/bradenaw/juniper/xslices"
Expand Down
3 changes: 2 additions & 1 deletion internal/db_impl/sqlite3/v1/mailbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package v1
import (
"context"
"fmt"
"strings"

"github.com/ProtonMail/gluon/db"
"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
v0 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v0"
"github.com/bradenaw/juniper/xslices"
"strings"
)

type mailboxV0 struct {
Expand Down
3 changes: 2 additions & 1 deletion internal/db_impl/sqlite3/v1/migration.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package v1
import (
"context"
"fmt"
"strings"

"github.com/ProtonMail/gluon/db"
"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
v0 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v0"
"github.com/bradenaw/juniper/xslices"
"strings"
)

type Migration struct{}
Expand Down
2 changes: 1 addition & 1 deletion internal/db_impl/sqlite3/write_ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"errors"
"fmt"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"
"strings"

"github.com/ProtonMail/gluon/db"
"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"
"github.com/bradenaw/juniper/xslices"
)

Expand Down

0 comments on commit f43eebd

Please sign in to comment.