fix: fixes after colors feature rebase

Author: ascandone

internal/interpreter/evaluate_expr.go

@@ -140,7 +140,8 @@ func (s *programState) evaluateColor(colorExpr parser.ValueExpr) (*string, Inter
 		return nil, err
 	}
 	if color == nil {
-		return nil, nil
+		c := ""
+		return &c, nil
 	}
 
 	isValidColor := colorRe.Match([]byte(*color))

internal/interpreter/funds_stack.go

@@ -8,6 +8,7 @@ import (
 type Sender struct {
 	Name   string
 	Amount *big.Int
+	Color  string
 }
 
 type fundsStack struct {
@@ -35,12 +36,13 @@ func (s *fundsStack) compactTop() {
 			continue
 		}
 
-		if first.Name != second.Name {
+		if first.Name != second.Name || first.Color != second.Color {
 			return
 		}
 
 		s.senders = append(s.senders[0:len(s.senders)-2], Sender{
 			Name:   first.Name,
+			Color:  first.Color,
 			Amount: new(big.Int).Add(first.Amount, second.Amount),
 		})
 	}
@@ -67,13 +69,15 @@ func (s *fundsStack) Pull(requiredAmount *big.Int) []Sender {
 		case 1: // more than enough
 			s.senders = append(s.senders, Sender{
 				Name:   available.Name,
+				Color:  available.Color,
 				Amount: new(big.Int).Sub(available.Amount, requiredAmount),
 			})
 			fallthrough
 
 		case 0: // exactly the same
 			out = append(out, Sender{
 				Name:   available.Name,
+				Color:  available.Color,
 				Amount: new(big.Int).Set(requiredAmount),
 			})
 			return out

internal/interpreter/funds_stack_test.go

@@ -109,3 +109,51 @@ func TestNoZeroLeftovers(t *testing.T) {
 		{Name: "s2", Amount: big.NewInt(15)},
 	}, out)
 }
+
+func TestReconcileColoredAssetExactMatch(t *testing.T) {
+	stack := newFundsStack([]Sender{
+		{Name: "src", Amount: big.NewInt(10), Color: "X"},
+		{Name: "s2", Amount: big.NewInt(15)},
+	})
+
+	out := stack.Pull(big.NewInt(10))
+	require.Equal(t, []Sender{
+		{Name: "src", Amount: big.NewInt(10), Color: "X"},
+	}, out)
+
+}
+
+func TestReconcileColoredManyDestPerSender(t *testing.T) {
+
+	stack := newFundsStack([]Sender{
+		{"src", big.NewInt(10), "X"},
+	})
+
+	out := stack.Pull(big.NewInt(5))
+	require.Equal(t, []Sender{
+		{Name: "src", Amount: big.NewInt(5), Color: "X"},
+	}, out)
+
+	out = stack.Pull(big.NewInt(5))
+	require.Equal(t, []Sender{
+		{Name: "src", Amount: big.NewInt(5), Color: "X"},
+	}, out)
+
+}
+
+func TestReconcileColoredManySenderColors(t *testing.T) {
+	c1 := ("c1")
+	c2 := ("c2")
+
+	stack := newFundsStack([]Sender{
+		{"src", big.NewInt(1), c1},
+		{"src", big.NewInt(1), c2},
+	})
+
+	out := stack.Pull(big.NewInt(2))
+	require.Equal(t, []Sender{
+		{Name: "src", Amount: big.NewInt(1), Color: c1},
+		{Name: "src", Amount: big.NewInt(1), Color: c2},
+	}, out)
+
+}

internal/interpreter/interpreter.go

@@ -310,7 +310,7 @@ type programState struct {
 	FeatureFlags map[string]struct{}
 }
 
-func (st *programState) pushSender(name string, monetary *big.Int, color *string) {
+func (st *programState) pushSender(name string, monetary *big.Int, color string) {
 	if monetary.Cmp(big.NewInt(0)) == 0 {
 		return
 	}
@@ -334,7 +334,7 @@ func (st *programState) pushReceiver(name string, monetary *big.Int) {
 		postings := Posting{
 			Source:      sender.Name,
 			Destination: name,
-			Asset:       st.CurrentAsset,
+			Asset:       coloredAsset(st.CurrentAsset, &sender.Color),
 			Amount:      sender.Amount,
 		}
 
@@ -499,7 +499,7 @@ func (s *programState) sendAllToAccount(accountLiteral parser.ValueExpr, ovedraf
 
 	// we sent balance+overdraft
 	sentAmt := utils.MaxBigInt(new(big.Int).Add(balance, ovedraft), big.NewInt(0))
-	s.pushSender(*account, sentAmt, color)
+	s.pushSender(*account, sentAmt, *color)
 	return sentAmt, nil
 }
 
@@ -634,7 +634,7 @@ func (s *programState) trySendingToAccount(accountLiteral parser.ValueExpr, amou
 		actuallySentAmt = utils.MinBigInt(safeSendAmt, amount)
 	}
 
-	s.pushSender(*account, actuallySentAmt, color)
+	s.pushSender(*account, actuallySentAmt, *color)
 	return actuallySentAmt, nil
 }
 

internal/parser/__snapshots__/parser_test.snap

@@ -3250,6 +3250,7 @@ parser.Program{
                     End:   parser.Position{Character:23, Line:2},
                 },
                 Source: &parser.SourceAccount{
+                    Color:     nil,
                     ValueExpr: &parser.AccountInterpLiteral{
                         Range: parser.Range{
                             Start: parser.Position{Character:10, Line:2},
@@ -3261,6 +3262,7 @@ parser.Program{
                     },
                 },
                 Proxy: &parser.SourceAccount{
+                    Color:     nil,
                     ValueExpr: &parser.AccountInterpLiteral{
                         Range: parser.Range{
                             Start: parser.Position{Character:21, Line:2},