simplify code

Author: ascandone

internal/interpreter/interpreter.go

@@ -392,7 +392,7 @@ func (st *programState) pushReceiverAddress(name string, sender Sender) {
 	case VirtualAccount:
 		// Here we have a debt from a virtual acc.
 		// we don't want to emit that as a posting (but TODO check how does it interact with kept)
-		senderAccountAddress.Pull(st.CurrentAsset, nil, Sender{
+		senderAccountAddress.Pull(st.CurrentAsset, Sender{
 			AccountAddress(name),
 			sender.Amount,
 			sender.Color,

internal/interpreter/virtual_account.go

@@ -3,8 +3,6 @@ package interpreter
 import (
 	"fmt"
 	"math/big"
-
-	"github.com/formancehq/numscript/internal/utils"
 )
 
 type VirtualAccount struct {
@@ -94,7 +92,7 @@ func send(
 
 		switch dest := destination.(type) {
 		case AccountAddress:
-			return source.Pull(asset, nil, Sender{
+			return source.Pull(asset, Sender{
 				Account: dest,
 				Amount:  amount,
 				Color:   color,
@@ -149,11 +147,7 @@ func (vacc *VirtualAccount) PullCredits(asset string) []Sender {
 //
 // If the overdraft is higher than 0 or unbounded, is possible that the pulled amount is higher than the virtual account's credits.
 // In this case, we'll add the pulled amount to the virtual account's debts.
-func (vacc *VirtualAccount) Pull(asset string, overdraft *big.Int, receiver Sender) []Posting {
-	if overdraft == nil {
-		overdraft = new(big.Int).Set(receiver.Amount)
-	}
-
+func (vacc *VirtualAccount) Pull(asset string, receiver Sender) []Posting {
 	credits := vacc.getCredits(asset)
 	pulled := credits.PullColored(receiver.Amount, receiver.Color)
 
@@ -173,15 +167,14 @@ func (vacc *VirtualAccount) Pull(asset string, overdraft *big.Int, receiver Send
 	}
 
 	// TODO it looks like we aren't using overdraft now. How's that possible?
-	allowedDebt := utils.MinBigInt(remainingAmt, overdraft)
-	if allowedDebt.Cmp(big.NewInt(0)) == 1 {
+	if remainingAmt.Cmp(big.NewInt(0)) == 1 {
 		// If we didn't pull enough and we're allowed to overdraft,
 		// push the amount to debts WITHOUT emitting the corresponding postings (yet)
 		debits := vacc.getDebits(asset)
 		debits.Push(Sender{
 			Account: receiver.Account,
 			Color:   receiver.Color,
-			Amount:  allowedDebt,
+			Amount:  remainingAmt,
 		})
 	}
 

internal/interpreter/virtual_account_test.go

@@ -19,7 +19,7 @@ func TestVirtualAccountReceiveAndThenPull(t *testing.T) {
 	})
 	require.Empty(t, postings)
 
-	postings = vacc.Pull("USD", big.NewInt(0), interpreter.Sender{
+	postings = vacc.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  big.NewInt(10),
 	})
@@ -42,7 +42,7 @@ func TestVirtualAccountReceiveAndThenPullPartialAmount(t *testing.T) {
 	})
 	require.Empty(t, postings)
 
-	postings = vacc.Pull("USD", big.NewInt(0), interpreter.Sender{
+	postings = vacc.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  big.NewInt(1), // <- we're only pulling 1 out of 10
 	})
@@ -64,7 +64,7 @@ func TestVirtualAccountPullFirst(t *testing.T) {
 	vacc := interpreter.NewVirtualAccount()
 
 	// Now we pull first. Note the unbounded overdraft
-	postings := vacc.Pull("USD", nil, interpreter.Sender{
+	postings := vacc.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  big.NewInt(10),
 	})
@@ -90,7 +90,7 @@ func TestVirtualAccountPullFirstMixed(t *testing.T) {
 	vacc := interpreter.NewVirtualAccount()
 
 	// 1 USD of debt
-	vacc.Pull("USD", nil, interpreter.Sender{
+	vacc.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("lender"),
 		Amount:  big.NewInt(1),
 	})
@@ -110,7 +110,7 @@ func TestVirtualAccountPullFirstMixed(t *testing.T) {
 	}, postings)
 
 	// pull the rest
-	postings = vacc.Pull("USD", nil, interpreter.Sender{
+	postings = vacc.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  big.NewInt(100),
 	})
@@ -156,7 +156,7 @@ func TestVirtualAccountTransitiveWhenNotOverdraft(t *testing.T) {
 	require.Equal(t, []Posting{
 		{"src", "dest", amt, "USD"},
 	},
-		v1.Pull("USD", nil, interpreter.Sender{
+		v1.Pull("USD", interpreter.Sender{
 			Account: interpreter.AccountAddress("dest"),
 			Amount:  amt,
 		}))
@@ -188,7 +188,7 @@ func TestVirtualAccountTransitiveWhenOverdraft(t *testing.T) {
 	// => [{@src, @dest, 10}]
 	require.Equal(t, []Posting{
 		{"src", "dest", amt, "USD"},
-	}, v1.Pull("USD", nil, interpreter.Sender{
+	}, v1.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  amt,
 	}))
@@ -212,7 +212,7 @@ func TestVirtualAccountTransitiveWhenOverdraftAndPayLast(t *testing.T) {
 	}))
 
 	// $v1 -> @dest (10 USD)
-	require.Empty(t, v1.Pull("USD", nil, interpreter.Sender{
+	require.Empty(t, v1.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  amt,
 	}))
@@ -254,7 +254,7 @@ func TestVirtualAccountTransitiveTwoSteps(t *testing.T) {
 	}))
 
 	// $v2 -> @dest
-	require.Empty(t, v2.Pull("USD", nil, interpreter.Sender{
+	require.Empty(t, v2.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  amt,
 	}))
@@ -304,7 +304,7 @@ func TestVirtualAccountTransitiveTwoStepsPayFirst(t *testing.T) {
 	// $v2 -> @dest
 	require.Equal(t, []Posting{
 		{"src", "dest", amt, "USD"},
-	}, v2.Pull("USD", nil, interpreter.Sender{
+	}, v2.Pull("USD", interpreter.Sender{
 		Account: interpreter.AccountAddress("dest"),
 		Amount:  amt,
 	}))
@@ -345,7 +345,7 @@ func TestCommutativeOrder(t *testing.T) {
 			})
 		},
 		func() []Posting {
-			return v2.Pull("USD", nil, interpreter.Sender{
+			return v2.Pull("USD", interpreter.Sender{
 				Account: interpreter.AccountAddress("dest"),
 				Amount:  amt,
 			})