Merge pull request 'compilation fix' (#239) from ledger-237 into main
Some checks failed
ci/woodpecker/push/db Pipeline was successful
ci/woodpecker/push/bff Pipeline was successful
ci/woodpecker/push/discovery Pipeline failed
ci/woodpecker/push/billing_fees Pipeline was successful
ci/woodpecker/push/frontend Pipeline failed
ci/woodpecker/push/fx_ingestor Pipeline was successful
ci/woodpecker/push/fx_oracle Pipeline was successful
ci/woodpecker/push/gateway_chain Pipeline failed
ci/woodpecker/push/gateway_mntx Pipeline failed
ci/woodpecker/push/gateway_tgsettle Pipeline failed
ci/woodpecker/push/nats Pipeline was successful
ci/woodpecker/push/ledger Pipeline was successful
ci/woodpecker/push/payments_orchestrator Pipeline failed
ci/woodpecker/push/notification Pipeline was successful

Reviewed-on: #239
This commit was merged in pull request #239.
This commit is contained in:
2026-01-06 17:05:26 +00:00

View File

@@ -8,6 +8,7 @@ import (
"github.com/tech/sendico/ledger/storage/model"
"github.com/tech/sendico/pkg/api/routers/gsresponse"
"github.com/tech/sendico/pkg/merrors"
pmodel "github.com/tech/sendico/pkg/model"
describablev1 "github.com/tech/sendico/pkg/proto/common/describable/v1"
ledgerv1 "github.com/tech/sendico/pkg/proto/ledger/v1"
"go.uber.org/zap"
@@ -214,7 +215,7 @@ func toProtoAccount(account *model.Account) *ledgerv1.LedgerAccount {
}
}
func describableFromProto(desc *describablev1.Describable) *model.Describable {
func describableFromProto(desc *describablev1.Describable) *pmodel.Describable {
if desc == nil {
return nil
}
@@ -229,13 +230,13 @@ func describableFromProto(desc *describablev1.Describable) *model.Describable {
if name == "" && description == nil {
return nil
}
return &model.Describable{
return &pmodel.Describable{
Name: name,
Description: description,
}
}
func describableToProto(desc model.Describable) *describablev1.Describable {
func describableToProto(desc pmodel.Describable) *describablev1.Describable {
name := strings.TrimSpace(desc.Name)
var description *string
if desc.Description != nil {