Revert "Rpc-Iterator clean up (#793)" (#802)

This reverts commit 54f147c.
Fantom-foundation · Nov 8, 2023 · 88c11fa · 88c11fa
1 parent 54f147c
commit 88c11fa
Show file tree

Hide file tree

Showing 10 changed files with 267 additions and 160 deletions.
diff --git a/cmd/aida-rpc/rpc_test.go b/cmd/aida-rpc/rpc_test.go
@@ -21,12 +21,12 @@ func TestRPC_TransactionsAreExecutedForCorrectRange(t *testing.T) {
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
 	var err error
-	emptyReqA.Response, err = json.Marshal("0x1")
+	emptyReqA.Response.Result, err = json.Marshal("0x1")
 	if err != nil {
 		t.Errorf("unexpected error while marshalling result; %v", err)
 	}
 
-	emptyReqB.Response, err = json.Marshal("0x0")
+	emptyReqB.Response.Result, err = json.Marshal("0x0")
 	if err != nil {
 		t.Errorf("unexpected error while marshalling result; %v", err)
 	}
@@ -93,8 +93,6 @@ func TestRPC_TransactionsAreExecutedForCorrectRange(t *testing.T) {
 }
 
 var emptyReqA = &rpc.RequestAndResults{
-	Block:     10,
-	Timestamp: 10,
 	Query: &rpc.Body{
 		Version:    "2.0",
 		ID:         json.RawMessage{1},
@@ -103,14 +101,18 @@ var emptyReqA = &rpc.RequestAndResults{
 		Namespace:  "eth",
 		MethodBase: "getBalance",
 	},
-	ReturnState: &rpc.ReturnState{
+	Response: &rpc.Response{
+		Version:   "2.0",
+		ID:        json.RawMessage{1},
+		BlockID:   10,
+		Timestamp: 10,
+	},
+	StateDB: &rpc.StateDBData{
 		Result: new(big.Int).SetInt64(1),
 	},
 }
 
 var emptyReqB = &rpc.RequestAndResults{
-	Block:     11,
-	Timestamp: 11,
 	Query: &rpc.Body{
 		Version:    "2.0",
 		ID:         json.RawMessage{1},
@@ -119,7 +121,13 @@ var emptyReqB = &rpc.RequestAndResults{
 		Namespace:  "eth",
 		MethodBase: "getBalance",
 	},
-	ReturnState: &rpc.ReturnState{
+	Response: &rpc.Response{
+		Version:   "2.0",
+		ID:        json.RawMessage{1},
+		BlockID:   11,
+		Timestamp: 11,
+	},
+	StateDB: &rpc.StateDBData{
 		Result: new(big.Int).SetInt64(0),
 	},
 }
diff --git a/cmd/aida-rpc/run_rpc.go b/cmd/aida-rpc/run_rpc.go
@@ -43,7 +43,7 @@ type rpcProcessor struct {
 }
 
 func (p rpcProcessor) Process(state executor.State[*rpc.RequestAndResults], ctx *executor.Context) error {
-	state.Data.ReturnState = rpc.Execute(uint64(state.Block), state.Data, ctx.Archive, p.cfg)
+	state.Data.StateDB = rpc.Execute(uint64(state.Block), state.Data, ctx.Archive, p.cfg)
 	return nil
 }