Skip to content

Commit

Permalink
Fix module name
Browse files Browse the repository at this point in the history
  • Loading branch information
elffjs committed Sep 17, 2024
1 parent 50d0bdf commit cf36fbf
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 151 deletions.
9 changes: 4 additions & 5 deletions cmd/accounts-api/main.go
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
package main

import (
"accounts-api/internal/config"
"accounts-api/internal/services"
"context"
"database/sql"
"errors"
"os"
"runtime/debug"

_ "github.com/DIMO-Network/accounts-api/docs"
"github.com/DIMO-Network/accounts-api/internal/config"
"github.com/DIMO-Network/accounts-api/internal/controller"
"github.com/DIMO-Network/accounts-api/internal/services"
"github.com/DIMO-Network/shared"
"github.com/DIMO-Network/shared/db"

"accounts-api/internal/controller"

"github.com/goccy/go-json"
jwtware "github.com/gofiber/contrib/jwt"
"github.com/gofiber/fiber/v2"
Expand Down
14 changes: 1 addition & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module accounts-api
module github.com/DIMO-Network/accounts-api

go 1.23

Expand Down Expand Up @@ -36,7 +36,6 @@ require (
github.com/MicahParks/jwkset v0.5.19 // indirect
github.com/MicahParks/keyfunc/v2 v2.1.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.11.5 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/avast/retry-go/v4 v4.5.1 // indirect
github.com/aws/aws-sdk-go-v2 v1.25.0 // indirect
Expand All @@ -45,24 +44,19 @@ require (
github.com/aws/aws-sdk-go-v2/service/kms v1.28.1 // indirect
github.com/aws/smithy-go v1.20.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/containerd/containerd v1.7.18 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -73,7 +67,6 @@ require (
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/holiman/uint256 v1.3.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -86,7 +79,6 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mfridman/interpolate v0.0.2 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
Expand All @@ -108,7 +100,6 @@ require (
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/supranational/blst v0.3.11 // indirect
github.com/swaggo/files/v2 v2.0.0 // indirect
github.com/tklauser/go-sysconf v0.3.13 // indirect
github.com/tklauser/numcpus v0.7.0 // indirect
Expand All @@ -125,8 +116,6 @@ require (
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
Expand All @@ -137,5 +126,4 @@ require (
google.golang.org/grpc v1.66.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)
129 changes: 13 additions & 116 deletions go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions internal/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"log"
"time"

"accounts-api/internal/config"
"accounts-api/internal/services"
"accounts-api/models"
"github.com/DIMO-Network/accounts-api/internal/config"
"github.com/DIMO-Network/accounts-api/internal/services"
"github.com/DIMO-Network/accounts-api/models"

"github.com/DIMO-Network/shared/db"
"github.com/MicahParks/keyfunc/v3"
Expand Down
9 changes: 5 additions & 4 deletions internal/controller/controller_test.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package controller

import (
"accounts-api/internal/config"
"accounts-api/internal/services"
"accounts-api/internal/test"
"accounts-api/models"
"context"
"encoding/json"
"fmt"
"io"
"testing"
"time"

"github.com/DIMO-Network/accounts-api/internal/config"
"github.com/DIMO-Network/accounts-api/internal/services"
"github.com/DIMO-Network/accounts-api/internal/test"
"github.com/DIMO-Network/accounts-api/models"

"github.com/DIMO-Network/shared/db"
"github.com/MicahParks/keyfunc/v3"
jwtware "github.com/gofiber/contrib/jwt"
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/referral_handlers.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package controller

import (
"accounts-api/models"
"context"
"database/sql"
"fmt"
"math/rand"
"strings"
"time"

"github.com/DIMO-Network/accounts-api/models"

"github.com/ethereum/go-ethereum/common"
"github.com/gofiber/fiber/v2"
"github.com/volatiletech/null/v8"
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/wallet_handlers.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package controller

import (
"accounts-api/models"
_ "embed"
"errors"
"fmt"

"github.com/DIMO-Network/accounts-api/models"

"github.com/gofiber/fiber/v2"
"github.com/golang-jwt/jwt/v5"
"github.com/volatiletech/sqlboiler/v4/boil"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/customer_io_service.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package services

import (
"accounts-api/internal/config"
"github.com/DIMO-Network/accounts-api/internal/config"

analytics "github.com/customerio/cdp-analytics-go"
"github.com/ethereum/go-ethereum/common"
Expand Down
3 changes: 2 additions & 1 deletion internal/services/email_service.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package services

import (
"accounts-api/internal/config"
"bytes"
"context"
_ "embed"
Expand All @@ -11,6 +10,8 @@ import (
"mime/quotedprintable"
"net/smtp"
"net/textproto"

"github.com/DIMO-Network/accounts-api/internal/config"
)

type EmailService interface {
Expand Down
3 changes: 2 additions & 1 deletion internal/services/identity_api_service.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package services

import (
"accounts-api/internal/config"
"context"
"net/http"
"time"

"github.com/DIMO-Network/accounts-api/internal/config"

"github.com/Khan/genqlient/graphql"
"github.com/ethereum/go-ethereum/common"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/test/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"testing"
"time"

"accounts-api/internal/config"
"accounts-api/internal/services"
"accounts-api/models"
"github.com/DIMO-Network/accounts-api/internal/config"
"github.com/DIMO-Network/accounts-api/internal/services"
"github.com/DIMO-Network/accounts-api/models"

"github.com/DIMO-Network/shared/db"
"github.com/docker/go-connections/nat"
Expand Down Expand Up @@ -198,7 +198,7 @@ func getTestDbSettings() config.Settings {
settings := config.Settings{
LogLevel: "info",
DB: dbSettings,
ServiceName: "accounts-api",
ServiceName: "github.com/DIMO-Network/accounts-api",
}
return settings
}
Expand Down Expand Up @@ -255,7 +255,7 @@ func TruncateTables(db *sql.DB, t *testing.T) {
func Logger() *zerolog.Logger {
l := zerolog.New(os.Stdout).With().
Timestamp().
Str("app", "accounts-api").
Str("app", "github.com/DIMO-Network/accounts-api").
Logger()
return &l
}
Expand Down

0 comments on commit cf36fbf

Please sign in to comment.