fixes after rebase

formancehq · Oct 16, 2024 · 8fc7b17 · 8fc7b17
1 parent 9d4e597
commit 8fc7b17
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/internal/controller/ledger/numscript_runtime.go b/internal/controller/ledger/numscript_runtime.go
@@ -88,7 +88,7 @@ func NewMachineNumscriptRuntimeAdapter(p program.Program) *MachineNumscriptRunti
 var _ NumscriptRuntime = (*MachineNumscriptRuntimeAdapter)(nil)
 
 // numscript rewrite implementation
-var _ Machine = (*DefaultInterpreterMachineAdapter)(nil)
+var _ NumscriptRuntime = (*DefaultInterpreterMachineAdapter)(nil)
 
 type DefaultInterpreterMachineAdapter struct {
 	parseResult numscript.ParseResult
@@ -100,7 +100,7 @@ func NewDefaultInterpreterMachineAdapter(parseResult numscript.ParseResult) *Def
 	}
 }
 
-func (d *DefaultInterpreterMachineAdapter) Execute(ctx context.Context, tx TX, vars map[string]string) (*MachineResult, error) {
+func (d *DefaultInterpreterMachineAdapter) Execute(ctx context.Context, tx TX, vars map[string]string) (*NumscriptExecutionResult, error) {
 	execResult, err := d.parseResult.Run(ctx, vars, newNumscriptRewriteAdapter(tx))
 	if err != nil {
 		return nil, ErrRuntime{
@@ -109,7 +109,7 @@ func (d *DefaultInterpreterMachineAdapter) Execute(ctx context.Context, tx TX, v
 		}
 	}
 
-	return &MachineResult{
+	return &NumscriptExecutionResult{
 		Postings: collectionutils.Map(execResult.Postings, func(posting numscript.Posting) ledger.Posting {
 			return ledger.Posting(posting)
 		}),

diff --git a/internal/controller/system/controller.go b/internal/controller/system/controller.go
@@ -50,7 +50,7 @@ func (ctrl *DefaultController) GetLedgerController(ctx context.Context, name str
 		var ledgerController ledgercontroller.Controller = ledgercontroller.NewDefaultController(
 			*l,
 			store,
-			&ledgercontroller.DefaultInterpreterMachineFactory{},
+			&ledgercontroller.DefaultNumscriptParser{},
 			ledgercontroller.WithMeter(ctrl.meter),
 		)
 

diff --git a/test/e2e/api_transactions_create.go b/test/e2e/api_transactions_create.go
@@ -10,9 +10,6 @@ import (
 	. "github.com/formancehq/go-libs/v2/testing/api"
 	"github.com/formancehq/go-libs/v2/testing/platform/pgtesting"
 
-	"github.com/formancehq/go-libs/logging"
-	. "github.com/formancehq/go-libs/testing/api"
-	"github.com/formancehq/go-libs/testing/platform/pgtesting"
 	ledger "github.com/formancehq/ledger/internal"
 	"github.com/formancehq/ledger/internal/bus"
 	. "github.com/formancehq/ledger/pkg/testserver"