updated tests

blessnetwork · Jun 28, 2024 · 17efb33 · 17efb33
1 parent 92174b4
commit 17efb33
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/api/execute_test.go b/api/execute_test.go
@@ -19,7 +19,7 @@ import (
 func TestAPI_Execute(t *testing.T) {
 
 	executionResult := execute.Result{
-		Result: execute.RuntimeOutput{
+		Output: execute.RuntimeOutput{
 			Stdout:   "dummy-failed-execution-result",
 			Stderr:   "dummy-failed-execution-log",
 			ExitCode: 0,
@@ -34,7 +34,7 @@ func TestAPI_Execute(t *testing.T) {
 	node.ExecuteFunctionFunc = func(context.Context, execute.Request, string) (codes.Code, string, execute.ResultMap, execute.Cluster, error) {
 
 		res := execute.ResultMap{
-			mocks.GenericPeerID: executionResult,
+			mocks.GenericPeerID: execute.NodeExecutionResult{Result: executionResult},
 		}
 
 		cluster := execute.Cluster{
@@ -65,7 +65,7 @@ func TestAPI_Execute(t *testing.T) {
 	require.Equal(t, res.Cluster.Peers, peerIDs)
 
 	require.Len(t, res.Results, 1)
-	require.Equal(t, executionResult.Result, res.Results[0].Result)
+	require.Equal(t, executionResult.Output, res.Results[0].Result)
 	require.Equal(t, float64(100), res.Results[0].Frequency)
 	require.Equal(t, peerIDs, res.Results[0].Peers)
 
@@ -75,7 +75,7 @@ func TestAPI_Execute(t *testing.T) {
 func TestAPI_Execute_HandlesErrors(t *testing.T) {
 
 	executionResult := execute.Result{
-		Result: execute.RuntimeOutput{
+		Output: execute.RuntimeOutput{
 			Stdout:   "dummy-failed-execution-result",
 			Stderr:   "dummy-failed-execution-log",
 			ExitCode: 1,
@@ -88,7 +88,7 @@ func TestAPI_Execute_HandlesErrors(t *testing.T) {
 	node.ExecuteFunctionFunc = func(context.Context, execute.Request, string) (codes.Code, string, execute.ResultMap, execute.Cluster, error) {
 
 		res := execute.ResultMap{
-			mocks.GenericPeerID: executionResult,
+			mocks.GenericPeerID: execute.NodeExecutionResult{Result: executionResult},
 		}
 
 		return expectedCode, "", res, execute.Cluster{}, mocks.GenericError
@@ -112,7 +112,7 @@ func TestAPI_Execute_HandlesErrors(t *testing.T) {
 	require.Equal(t, expectedCode.String(), res.Code)
 
 	require.Len(t, res.Results, 1)
-	require.Equal(t, executionResult.Result, res.Results[0].Result)
+	require.Equal(t, executionResult.Output, res.Results[0].Result)
 	require.Equal(t, float64(100), res.Results[0].Frequency)
 	require.Len(t, res.Results[0].Peers, 1)
 	require.Equal(t, mocks.GenericPeerID, res.Results[0].Peers[0])

diff --git a/models/response/execute_test.go b/models/response/execute_test.go
@@ -17,7 +17,7 @@ func TestExecute_Signing(t *testing.T) {
 		RequestID: mocks.GenericUUID.String(),
 		Code:      codes.OK,
 		Results: execute.ResultMap{
-			mocks.GenericPeerID: mocks.GenericExecutionResult,
+			mocks.GenericPeerID: execute.NodeExecutionResult{Result: mocks.GenericExecutionResult},
 		},
 		Cluster: execute.Cluster{
 			Peers: mocks.GenericPeerIDs[:4],

diff --git a/node/execute_internal_test.go b/node/execute_internal_test.go
@@ -49,7 +49,7 @@ func TestNode_WorkerExecute(t *testing.T) {
 
 		// Use a custom executor to verify all execution parameters are correct.
 		executor := mocks.BaselineExecutor(t)
-		executor.ExecFunctionFunc = func(reqID string, req execute.Request) (execute.Result, error) {
+		executor.ExecFunctionFunc = func(reqID string, req execute.Request) (execute.Result, any, error) {
 			require.NotEmpty(t, reqID)
 			require.Equal(t, requestID, reqID)
 			require.Equal(t, executionRequest.FunctionID, req.FunctionID)
@@ -61,7 +61,7 @@ func TestNode_WorkerExecute(t *testing.T) {
 			res := mocks.GenericExecutionResult
 			res.RequestID = outRequestID
 
-			return res, nil
+			return res, nil, nil
 		}
 		node.executor = executor
 
@@ -89,7 +89,7 @@ func TestNode_WorkerExecute(t *testing.T) {
 			require.Equal(t, outRequestID, received.RequestID)
 			require.Equal(t, expected.Code, received.Code)
 
-			require.Equal(t, expected.Result, received.Results[node.host.ID()].Result)
+			require.Equal(t, expected.Output, received.Results[node.host.ID()].Result.Output)
 		})
 
 		err = node.processExecute(context.Background(), receiver.ID(), executionRequest)
@@ -103,7 +103,7 @@ func TestNode_WorkerExecute(t *testing.T) {
 		var (
 			faultyExecutionResult = execute.Result{
 				Code: codes.Error,
-				Result: execute.RuntimeOutput{
+				Output: execute.RuntimeOutput{
 					Stdout:   "something horrible has happened",
 					Stderr:   "log of something horrible",
 					ExitCode: 1,
@@ -117,13 +117,13 @@ func TestNode_WorkerExecute(t *testing.T) {
 
 		// Use a custom executor to verify all execution parameters are correct.
 		executor := mocks.BaselineExecutor(t)
-		executor.ExecFunctionFunc = func(reqID string, req execute.Request) (execute.Result, error) {
+		executor.ExecFunctionFunc = func(reqID string, req execute.Request) (execute.Result, any, error) {
 			requestID = reqID
 
 			out := faultyExecutionResult
 			out.RequestID = reqID
 
-			return out, mocks.GenericError
+			return out, nil, mocks.GenericError
 		}
 		node.executor = executor
 
@@ -148,7 +148,7 @@ func TestNode_WorkerExecute(t *testing.T) {
 
 			require.Equal(t, received.RequestID, requestID)
 			require.Equal(t, faultyExecutionResult.Code, received.Code)
-			require.Equal(t, faultyExecutionResult.Result, received.Results[node.host.ID()].Result)
+			require.Equal(t, faultyExecutionResult.Output, received.Results[node.host.ID()].Result.Output)
 		})
 
 		err = node.processExecute(context.Background(), receiver.ID(), executionRequest)
@@ -334,10 +334,12 @@ func TestNode_HeadExecute(t *testing.T) {
 			res := response.Execute{
 				Code:      codes.OK,
 				RequestID: requestID,
-				Results: map[peer.ID]execute.Result{
+				Results: map[peer.ID]execute.NodeExecutionResult{
 					mockWorker.Host.ID(): {
-						Code:   codes.OK,
-						Result: executionResult,
+						Result: execute.Result{
+							Code:   codes.OK,
+							Output: executionResult,
+						},
 					},
 				},
 			}