Add to value set inside the unit test

Author: s4nsec

fuzzing/fuzzer_test.go

@@ -87,9 +87,11 @@ func TestExperimentalValueGeneration_EventsReturnValues(t *testing.T) {
 				f.fuzzer.Events.WorkerCreated.Subscribe(func(event FuzzerWorkerCreatedEvent) error {
 					event.Worker.Events.FuzzerWorkerChainSetup.Subscribe(func(event FuzzerWorkerChainSetupEvent) error {
 						event.Worker.chain.Events.PendingBlockAddedTx.Subscribe(func(event chain.PendingBlockAddedTxEvent) error {
-							valueGenerationResults := event.Block.MessageResults[event.TransactionIndex-1].AdditionalResults["ValueGenerationTracerResults"]
-							res := experimentalValuesAddedToBaseValueSet(f, valueGenerationResults)
-							assert.True(t, res)
+							if valueGenerationResults, ok := event.Block.MessageResults[event.TransactionIndex-1].AdditionalResults["ValueGenerationTracerResults"].([]any); ok {
+								f.fuzzer.workers[0].valueSet.Add(valueGenerationResults)
+								res := experimentalValuesAddedToBaseValueSet(f, valueGenerationResults)
+								assert.True(t, res)
+							}
 							// just check if these values are added to value set
 							//msgResult[event.TransactionIndex].AdditionalResults
 							// make sure to use CallSequenceTested event to see if the base value set

fuzzing/fuzzer_worker.go

@@ -289,8 +289,10 @@ func (fw *FuzzerWorker) testNextCallSequence() (calls.CallSequence, []ShrinkCall
 
 		// Add event values to copied ValueSet
 		lastExecutedSequenceElement := currentlyExecutedSequence[len(currentlyExecutedSequence)-1]
-		messageResults := lastExecutedSequenceElement.ChainReference.MessageResults()
-		fw.ValueSet().Add(messageResults)
+
+		if messageResults, ok := lastExecutedSequenceElement.ChainReference.MessageResults().AdditionalResults["ValueGenerationTracerResults"].([]any); ok {
+			fw.ValueSet().Add(messageResults)
+		}
 
 		// Loop through each test function, signal our worker tested a call, and collect any requests to shrink
 		// this call sequence.

fuzzing/valuegeneration/value_set.go

@@ -2,7 +2,6 @@ package valuegeneration
 
 import (
 	"encoding/hex"
-	"github.com/crytic/medusa/chain/types"
 	"hash"
 	"math/big"
 
@@ -174,44 +173,24 @@ func (vs *ValueSet) RemoveBytes(b []byte) {
 	delete(vs.bytes, hashStr)
 }
 
-func (vs *ValueSet) Add(results *types.MessageResults) {
-	valueGenerationTracerResults := results.AdditionalResults["ValueGenerationTracerResults"]
-
-	if transactionOutputValues, ok := valueGenerationTracerResults.([]any); ok {
-
-		for _, eventOrReturnValues := range transactionOutputValues {
-			//if eventOrReturnSlice, ok := eventOrReturnValues.(TransactionOutputValues); ok {
-			//	for _, eventOrReturnValue := range eventOrReturnSlice {
-			//		switch v := eventOrReturnValue.(type) {
-			//		case *big.Int:
-			//			valueSet.AddInteger(v)
-			//		case common.Address:
-			//			valueSet.AddAddress(v)
-			//		case string:
-			//			valueSet.AddString(v)
-			//		case []byte:
-			//			valueSet.AddBytes(v)
-			//		default:
-			//			continue
-			//		}
-			//
-			//	}
-			if eventOrReturnSlice, ok := eventOrReturnValues.([]any); ok {
-				for _, eventOrReturnValue := range eventOrReturnSlice {
-					switch v := eventOrReturnValue.(type) {
-					case *big.Int:
-						vs.AddInteger(v)
-					case common.Address:
-						vs.AddAddress(v)
-					case string:
-						vs.AddString(v)
-					case []byte:
-						vs.AddBytes(v)
-					default:
-						continue
-					}
-
+func (vs *ValueSet) Add(results []any) {
+
+	for _, eventOrReturnValues := range results {
+		if eventOrReturnSlice, ok := eventOrReturnValues.([]any); ok {
+			for _, eventOrReturnValue := range eventOrReturnSlice {
+				switch v := eventOrReturnValue.(type) {
+				case *big.Int:
+					vs.AddInteger(v)
+				case common.Address:
+					vs.AddAddress(v)
+				case string:
+					vs.AddString(v)
+				case []byte:
+					vs.AddBytes(v)
+				default:
+					continue
 				}
+
 			}
 		}
 	}