Merge pull request 'fixed orchestrator compilaiton' (#269) from payments-268 into main
All checks were successful
ci/woodpecker/push/billing_fees Pipeline was successful
ci/woodpecker/push/db Pipeline was successful
ci/woodpecker/push/bff Pipeline was successful
ci/woodpecker/push/discovery Pipeline was successful
ci/woodpecker/push/fx_ingestor Pipeline was successful
ci/woodpecker/push/fx_oracle Pipeline was successful
ci/woodpecker/push/frontend Pipeline was successful
ci/woodpecker/push/gateway_mntx Pipeline was successful
ci/woodpecker/push/gateway_chain Pipeline was successful
ci/woodpecker/push/gateway_tgsettle Pipeline was successful
ci/woodpecker/push/nats Pipeline was successful
ci/woodpecker/push/ledger Pipeline was successful
ci/woodpecker/push/notification Pipeline was successful
ci/woodpecker/push/payments_orchestrator Pipeline was successful
All checks were successful
ci/woodpecker/push/billing_fees Pipeline was successful
ci/woodpecker/push/db Pipeline was successful
ci/woodpecker/push/bff Pipeline was successful
ci/woodpecker/push/discovery Pipeline was successful
ci/woodpecker/push/fx_ingestor Pipeline was successful
ci/woodpecker/push/fx_oracle Pipeline was successful
ci/woodpecker/push/frontend Pipeline was successful
ci/woodpecker/push/gateway_mntx Pipeline was successful
ci/woodpecker/push/gateway_chain Pipeline was successful
ci/woodpecker/push/gateway_tgsettle Pipeline was successful
ci/woodpecker/push/nats Pipeline was successful
ci/woodpecker/push/ledger Pipeline was successful
ci/woodpecker/push/notification Pipeline was successful
ci/woodpecker/push/payments_orchestrator Pipeline was successful
Reviewed-on: #269
This commit was merged in pull request #269.
This commit is contained in:
@@ -5,8 +5,6 @@ import (
|
|||||||
|
|
||||||
oracleclient "github.com/tech/sendico/fx/oracle/client"
|
oracleclient "github.com/tech/sendico/fx/oracle/client"
|
||||||
chainclient "github.com/tech/sendico/gateway/chain/client"
|
chainclient "github.com/tech/sendico/gateway/chain/client"
|
||||||
mntxclient "github.com/tech/sendico/gateway/mntx/client"
|
|
||||||
ledgerclient "github.com/tech/sendico/ledger/client"
|
|
||||||
"github.com/tech/sendico/pkg/merrors"
|
"github.com/tech/sendico/pkg/merrors"
|
||||||
"github.com/tech/sendico/pkg/payments/rail"
|
"github.com/tech/sendico/pkg/payments/rail"
|
||||||
feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
|
feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
|
||||||
@@ -263,7 +261,7 @@ func (c *discoveryMntxClient) Close() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type discoveryChainClient struct {
|
type discoveryChainClient struct {
|
||||||
resolver *discoveryClientResolver
|
resolver *discoveryClientResolver
|
||||||
invokeURI string
|
invokeURI string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -58,10 +58,6 @@ type gatewayDependency struct {
|
|||||||
resolver ChainGatewayResolver
|
resolver ChainGatewayResolver
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g gatewayDependency) available() bool {
|
|
||||||
return g.resolver != nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type railGatewayDependency struct {
|
type railGatewayDependency struct {
|
||||||
byID map[string]rail.RailGateway
|
byID map[string]rail.RailGateway
|
||||||
byRail map[model.Rail][]rail.RailGateway
|
byRail map[model.Rail][]rail.RailGateway
|
||||||
@@ -233,10 +229,6 @@ type providerGatewayDependency struct {
|
|||||||
resolver ChainGatewayResolver
|
resolver ChainGatewayResolver
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p providerGatewayDependency) available() bool {
|
|
||||||
return p.resolver != nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type staticChainGatewayResolver struct {
|
type staticChainGatewayResolver struct {
|
||||||
client chainclient.Client
|
client chainclient.Client
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
|
|
||||||
oracleclient "github.com/tech/sendico/fx/oracle/client"
|
oracleclient "github.com/tech/sendico/fx/oracle/client"
|
||||||
"github.com/tech/sendico/payments/orchestrator/storage/model"
|
"github.com/tech/sendico/payments/orchestrator/storage/model"
|
||||||
|
chainpkg "github.com/tech/sendico/pkg/chain"
|
||||||
"github.com/tech/sendico/pkg/merrors"
|
"github.com/tech/sendico/pkg/merrors"
|
||||||
feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
|
feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
|
||||||
fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
|
fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
|
||||||
@@ -159,7 +160,7 @@ func (s *Service) estimateNetworkFee(ctx context.Context, intent *orchestratorv1
|
|||||||
|
|
||||||
network := ""
|
network := ""
|
||||||
if req.Asset != nil {
|
if req.Asset != nil {
|
||||||
network = strings.ToUpper(strings.TrimSpace(req.Asset.GetChain()))
|
network = chainpkg.NetworkName(req.Asset.GetChain())
|
||||||
}
|
}
|
||||||
instanceID := strings.TrimSpace(intent.GetSource().GetInstanceId())
|
instanceID := strings.TrimSpace(intent.GetSource().GetInstanceId())
|
||||||
if instanceID == "" {
|
if instanceID == "" {
|
||||||
|
|||||||
Reference in New Issue
Block a user