PR FIXUP - Add LensID test substitution

Author: AndrewSisley

tests/action/add.go

@@ -19,6 +19,8 @@ var _ Action = (*Add)(nil)
 var _ Stateful = (*Add)(nil)
 
 func (a *Add) Execute() {
-	_, err := a.s.Store.Add(a.s.Ctx, a.Config)
+	id, err := a.s.Store.Add(a.s.Ctx, a.Config)
 	require.NoError(a.s.T, err)
+
+	a.s.LensIDs = append(a.s.LensIDs, id)
 }

tests/action/list.go

@@ -21,6 +21,11 @@ var _ Action = (*List)(nil)
 var _ Stateful = (*List)(nil)
 
 func (a *List) Execute() {
+	for key, model := range a.Expected {
+		delete(a.Expected, key)
+		a.Expected[replace(a.s, key)] = model
+	}
+
 	result, err := a.s.Store.List(a.s.Ctx)
 	require.NoError(a.s.T, err)
 

tests/action/util_replace.go

@@ -0,0 +1,55 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package action
+
+import (
+	"bytes"
+	"maps"
+	"strconv"
+	"strings"
+	"text/template"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/sourcenetwork/lens/tests/state"
+)
+
+// templateDataGenerators contains a set of data generators by their template prefix.
+//
+// Supporting action properties will replace any templated elements with data drawn from these
+// sets.
+var templateDataGenerators = map[string]func(*state.State) map[string]string{
+	"LensIDs": func(s *state.State) map[string]string {
+		res := map[string]string{}
+		for i, ID := range s.LensIDs {
+			res["LensIDs"+strconv.Itoa(i)] = ID.String()
+		}
+
+		return res
+	},
+}
+
+// replace returns a new string with any templating placholders (see "text/template") with data drawn
+// from `state`.
+func replace(s *state.State, input string) string {
+	if !strings.Contains(input, "{{") {
+		// If the input doesn't contain any templating elements we can return early
+		return input
+	}
+
+	templateData := map[string]string{}
+	for _, datasetGenerator := range templateDataGenerators {
+		// Having to regenerate the full dataset for every node-action is horribly inefficient, but
+		// it is tolerable for now.
+		maps.Copy(templateData, datasetGenerator(s))
+	}
+
+	tmpl := template.Must(template.New("").Parse(input))
+	var buf bytes.Buffer
+	err := tmpl.Execute(&buf, templateData)
+	require.NoError(s.T, err)
+
+	return buf.String()
+}

tests/integration/node/add_list_test.go

@@ -36,7 +36,7 @@ func TestAddList(t *testing.T) {
 			},
 			&action.List{
 				Expected: map[string]model.Lens{
-					"bafyreibtjagnf2pgjgteonxcwigifwfylqgbrrn7f5zcx6tsqi7v3evgqq": {
+					"{{.LensIDs0}}": {
 						Lenses: []model.LensModule{
 							{
 								Path: "data://" + string(wasm),

tests/state/state.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/ipfs/go-cid"
 	"github.com/sourcenetwork/lens/host-go/node"
 	"github.com/sourcenetwork/lens/host-go/store"
 )
@@ -19,6 +20,7 @@ type State struct {
 	Node *node.Node
 	Path string
 
-	Store store.Store
-	Txns  []store.Txn
+	Store   store.Store
+	Txns    []store.Txn
+	LensIDs []cid.Cid
 }