Merge pull request #314 from sdcio/Visitors-1

Visitors 1

Author: steiler

mocks/mocktreeentry/entry.go

@@ -465,11 +465,15 @@ func (d *Datastore) BlameConfig(ctx context.Context, includeDefaults bool) (*sdc
 	if err != nil {
 		return nil, err
 	}
+
 	// calculate the Blame
-	bte, err := root.BlameConfig(includeDefaults)
+	bcv := tree.NewBlameConfigVisitor(includeDefaults)
+	err = root.Walk(ctx, bcv)
 	if err != nil {
 		return nil, err
 	}
+	bte := bcv.GetResult()
+
 	// set the root level elements name to the target name
 	bte.Name = d.config.Name
 	return bte, nil

pkg/datastore/datastore_rpc.go

@@ -209,7 +209,11 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 
 		oldIntentContent := lvs.ToUpdateSlice()
 
-		root.MarkOwnerDelete(intent.GetName(), intent.GetOnlyIntended())
+		marksOwnerDeleteVisitor := tree.NewMarkOwnerDeleteVisitor(intent.GetName(), intent.GetOnlyIntended())
+		err := root.Walk(ctx, marksOwnerDeleteVisitor)
+		if err != nil {
+			return nil, err
+		}
 
 		// store the old intent content in the transaction as the old intent.
 		err = transaction.AddIntentContent(intent.GetName(), types.TransactionIntentOld, oldIntentContent.GetFirstPriorityValue(), oldIntentContent)

pkg/datastore/transaction_rpc.go

@@ -807,7 +807,11 @@ func TestDatastore_populateTree(t *testing.T) {
 				t.Error(err)
 			}
 
-			root.MarkOwnerDelete(tt.intentName, false)
+			marksOwnerDeleteVisitor := tree.NewMarkOwnerDeleteVisitor(tt.intentName, false)
+			err = root.Walk(ctx, marksOwnerDeleteVisitor)
+			if err != nil {
+				t.Error(err)
+			}
 
 			newFlag := types.NewUpdateInsertFlags().SetNewFlag()