chore: move core in ledger/pkg

formancehq · Sep 23, 2024 · c10a388 · c10a388
1 parent 5f4c416
commit c10a388
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 120 deletions.
diff --git a/components/ledger/Earthfile b/components/ledger/Earthfile
@@ -7,8 +7,6 @@ IMPORT .. AS components
 FROM core+base-image
 
 sources:
-    WORKDIR src
-    COPY (stack+sources/out --LOCATION=libs/core) /src/libs/core
     WORKDIR /src/components/ledger
     COPY go.mod go.sum .
     COPY --dir internal pkg cmd .

diff --git a/components/ledger/go.mod b/components/ledger/go.mod
@@ -6,16 +6,13 @@ toolchain go1.22.7
 
 replace github.com/formancehq/stack/ledger/client => ./pkg/client
 
-replace github.com/formancehq/stack/libs/core => ../../libs/core
-
 require (
 	github.com/ThreeDotsLabs/watermill v1.3.7
 	github.com/alitto/pond v1.9.2
 	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10
 	github.com/bluele/gcache v0.0.2
 	github.com/formancehq/go-libs v1.7.1
 	github.com/formancehq/stack/ledger/client v0.0.0-00010101000000-000000000000
-	github.com/formancehq/stack/libs/core v0.0.0-00010101000000-000000000000
 	github.com/go-chi/chi/v5 v5.1.0
 	github.com/go-chi/cors v1.2.1
 	github.com/google/go-cmp v0.6.0

diff --git a/components/ledger/internal/api/v1/controllers_accounts.go b/components/ledger/internal/api/v1/controllers_accounts.go
@@ -9,12 +9,13 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/formancehq/ledger/pkg/core/accounts"
+
 	"github.com/go-chi/chi/v5"
 
 	storageerrors "github.com/formancehq/ledger/internal/storage/sqlutils"
 
 	"github.com/formancehq/go-libs/pointer"
-	"github.com/formancehq/stack/libs/core/accounts"
 
 	"github.com/formancehq/go-libs/bun/bunpaginate"
 	"github.com/formancehq/ledger/internal/api/backend"

diff --git a/components/ledger/internal/api/v2/controllers_accounts.go b/components/ledger/internal/api/v2/controllers_accounts.go
@@ -6,12 +6,13 @@ import (
 	"net/http"
 	"net/url"
 
+	"github.com/formancehq/ledger/pkg/core/accounts"
+
 	"github.com/go-chi/chi/v5"
 
 	storageerrors "github.com/formancehq/ledger/internal/storage/sqlutils"
 
 	"github.com/formancehq/go-libs/pointer"
-	"github.com/formancehq/stack/libs/core/accounts"
 
 	sharedapi "github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/bun/bunpaginate"

diff --git a/components/ledger/internal/machine/account.go b/components/ledger/internal/machine/account.go
@@ -3,7 +3,7 @@ package machine
 import (
 	"fmt"
 
-	"github.com/formancehq/stack/libs/core/accounts"
+	"github.com/formancehq/ledger/pkg/core/accounts"
 )
 
 type AccountAddress string

diff --git a/components/ledger/internal/machine/asset.go b/components/ledger/internal/machine/asset.go
@@ -3,7 +3,7 @@ package machine
 import (
 	"fmt"
 
-	"github.com/formancehq/stack/libs/core/assets"
+	"github.com/formancehq/ledger/pkg/core/assets"
 )
 
 type Asset string

diff --git a/components/ledger/internal/posting.go b/components/ledger/internal/posting.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"math/big"
 
-	"github.com/formancehq/stack/libs/core/accounts"
-	"github.com/formancehq/stack/libs/core/assets"
+	"github.com/formancehq/ledger/pkg/core/accounts"
+	"github.com/formancehq/ledger/pkg/core/assets"
 
 	"github.com/pkg/errors"
 )

diff --git a/libs/core/accounts/account_test.go → .../ledger/pkg/core/accounts/account_test.go b/libs/core/accounts/account_test.go → .../ledger/pkg/core/accounts/account_test.go
diff --git a/libs/core/accounts/accounts.go → ...ents/ledger/pkg/core/accounts/accounts.go b/libs/core/accounts/accounts.go → ...ents/ledger/pkg/core/accounts/accounts.go
diff --git a/libs/core/assets/asset.go → components/ledger/pkg/core/assets/asset.go b/libs/core/assets/asset.go → components/ledger/pkg/core/assets/asset.go
diff --git a/components/payments/internal/storage/migrations_v1.x.go b/components/payments/internal/storage/migrations_v1.x.go
@@ -1052,8 +1052,6 @@ func fixExpandingChangelogs(ctx context.Context, tx bun.Tx) error {
 			return err
 		}
 
-		fmt.Println("Processing", len(metadata), "metadata")
-
 		if len(metadata) == 0 {
 			break
 		}

diff --git a/ee/wallets/Earthfile b/ee/wallets/Earthfile
@@ -9,7 +9,7 @@ FROM core+base-image
 
 sources:
     WORKDIR src
-    COPY (stack+sources/out --LOCATION=libs/core) libs/core
+    COPY (stack+sources/out --LOCATION=components/ledger) components/ledger
     COPY --pass-args (releases+sdk-generate/go) /src/releases/sdks/go
     WORKDIR /src/ee/wallets
     COPY go.* .

diff --git a/ee/wallets/go.mod b/ee/wallets/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.7
 require (
 	github.com/formancehq/formance-sdk-go/v2 v2.0.0-00010101000000-000000000000
 	github.com/formancehq/go-libs v1.7.1
-	github.com/formancehq/stack/libs/core v0.0.0-00010101000000-000000000000
+	github.com/formancehq/ledger v0.0.0-00010101000000-000000000000
 	github.com/go-chi/chi/v5 v5.1.0
 	github.com/go-chi/render v1.0.3
 	github.com/google/uuid v1.6.0
@@ -89,6 +89,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/formancehq/stack/libs/core => ../../libs/core
-
 replace github.com/formancehq/formance-sdk-go/v2 => ../../releases/sdks/go
+
+replace github.com/formancehq/ledger => ../../components/ledger
diff --git a/ee/wallets/pkg/credit.go b/ee/wallets/pkg/credit.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"net/http"
 
-	"github.com/formancehq/stack/libs/core/assets"
+	"github.com/formancehq/ledger/pkg/core/assets"
 
 	"github.com/formancehq/go-libs/time"
 

diff --git a/ee/wallets/pkg/debit.go b/ee/wallets/pkg/debit.go
@@ -4,8 +4,7 @@ import (
 	"math/big"
 	"net/http"
 
-	"github.com/formancehq/stack/libs/core/assets"
-
+	"github.com/formancehq/ledger/pkg/core/assets"
 	"github.com/formancehq/go-libs/time"
 
 	"github.com/formancehq/go-libs/metadata"

diff --git a/ee/wallets/pkg/subject.go b/ee/wallets/pkg/subject.go
@@ -3,7 +3,7 @@ package wallet
 import (
 	"fmt"
 
-	"github.com/formancehq/stack/libs/core/accounts"
+	"github.com/formancehq/ledger/pkg/core/accounts"
 )
 
 const (

diff --git a/libs/Earthfile b/libs/Earthfile
@@ -6,5 +6,4 @@ IMPORT .. AS stack
 run:
   LOCALLY
   ARG --required TARGET
-  BUILD ./core+$TARGET
   BUILD ./events+$TARGET
diff --git a/libs/core/.golangci.yml b/libs/core/.golangci.yml
diff --git a/libs/core/Earthfile b/libs/core/Earthfile
diff --git a/libs/core/go.mod b/libs/core/go.mod
diff --git a/libs/core/go.sum b/libs/core/go.sum
diff --git a/tests/integration/go.mod b/tests/integration/go.mod
@@ -94,7 +94,6 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/formancehq/payments/genericclient v0.0.0-00010101000000-000000000000 // indirect
-	github.com/formancehq/stack/libs/core v0.0.0-00010101000000-000000000000 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/get-momo/atlar-v1-go-client v1.2.1 // indirect
 	github.com/gibson042/canonicaljson-go v1.0.3 // indirect
@@ -280,7 +279,6 @@ replace (
 	github.com/formancehq/payments/genericclient => ../../components/payments/cmd/connectors/internal/connectors/generic/client/generated
 	github.com/formancehq/reconciliation => ../../ee/reconciliation
 	github.com/formancehq/search => ../../ee/search
-	github.com/formancehq/stack/libs/core => ../../libs/core
 	github.com/formancehq/stack/libs/events => ../../libs/events
 	github.com/formancehq/wallets => ../../ee/wallets
 	github.com/formancehq/webhooks => ../../ee/webhooks