rename to make sense

protocol/chainlib/chain_fetcher.go

@@ -189,7 +189,7 @@ func (cf *ChainFetcher) Verify(ctx context.Context, verification VerificationCon
 	}
 
 	parsedInput := parser.ParseBlockFromReply(parserInput, parsing.ResultParsing, parsing.Parsers)
-	if parsedInput.GetBlockRaw() == "" {
+	if parsedInput.GetRawParsedData() == "" {
 		return utils.LavaFormatWarning("[-] verify failed to parse result", err,
 			utils.LogAttr("chainId", chainId),
 			utils.LogAttr("nodeUrl", proxyUrl.Url),
@@ -205,7 +205,7 @@ func (cf *ChainFetcher) Verify(ctx context.Context, verification VerificationCon
 				utils.LogAttr("nodeUrl", proxyUrl.Url),
 				utils.LogAttr("Method", parsing.GetApiName()),
 				utils.LogAttr("Response", string(reply.RelayReply.Data)),
-				utils.LogAttr("rawParsedBlock", parsedInput.GetBlockRaw()),
+				utils.LogAttr("rawParsedData", parsedInput.GetRawParsedData()),
 			)
 		}
 		uint64ParsedResultAsNumber := uint64(parsedResultAsNumber)
@@ -231,12 +231,12 @@ func (cf *ChainFetcher) Verify(ctx context.Context, verification VerificationCon
 	}
 	// some verifications only want the response to be valid, and don't care about the value
 	if verification.Value != "*" && verification.Value != "" && verification.ParseDirective.FunctionTag != spectypes.FUNCTION_TAG_GET_BLOCK_BY_NUM {
-		rawBlock := parsedInput.GetBlockRaw()
-		if rawBlock != verification.Value {
+		rawData := parsedInput.GetRawParsedData()
+		if rawData != verification.Value {
 			return utils.LavaFormatWarning("[-] verify failed expected and received are different", err,
 				utils.LogAttr("chainId", chainId),
 				utils.LogAttr("nodeUrl", proxyUrl.Url),
-				utils.LogAttr("rawParsedBlock", rawBlock),
+				utils.LogAttr("rawParsedBlock", rawData),
 				utils.LogAttr("verification.Value", verification.Value),
 				utils.LogAttr("Method", parsing.GetApiName()),
 				utils.LogAttr("Extension", verification.Extension),
@@ -250,7 +250,7 @@ func (cf *ChainFetcher) Verify(ctx context.Context, verification VerificationCon
 		utils.LogAttr("nodeUrl", proxyUrl.Url),
 		utils.LogAttr("verification", verification.Name),
 		utils.LogAttr("block", parsedInput.GetBlock()),
-		utils.LogAttr("rawBlock", parsedInput.GetBlockRaw()),
+		utils.LogAttr("rawData", parsedInput.GetRawParsedData()),
 		utils.LogAttr("verificationKey", verification.VerificationKey),
 		utils.LogAttr("apiInterface", cf.endpoint.ApiInterface),
 	)

protocol/parser/parser.go

@@ -109,10 +109,10 @@ func parseInputWithGenericParsers(rpcInput RPCInput, genericParsers []spectypes.
 	}
 
 	parsed := NewParsedInput()
-	parsedBlock := genericParserResult.GetBlockRaw()
+	parsedBlock := genericParserResult.GetRawParsedData()
 	if parsedBlock != "" {
 		parsedSuccessfully = true
-		parsed.parsedBlockRaw = parsedBlock
+		parsed.parsedDataRaw = parsedBlock
 	}
 
 	parsedBlockHashes, err := genericParserResult.GetBlockHashes()
@@ -124,7 +124,7 @@ func parseInputWithGenericParsers(rpcInput RPCInput, genericParsers []spectypes.
 }
 
 func ParseRawBlock(rpcInput RPCInput, parsedInput *ParsedInput, defaultValue string) {
-	rawBlock := parsedInput.GetBlockRaw()
+	rawBlock := parsedInput.GetRawParsedData()
 	var parsedBlock int64
 	var err error
 	if rawBlock != "" {
@@ -173,15 +173,15 @@ func parseInputWithLegacyBlockParser(rpcInput RPCInput, blockParser spectypes.Bl
 func parseBlock(rpcInput RPCInput, blockParser spectypes.BlockParser, genericParsers []spectypes.GenericParser, source int) *ParsedInput {
 	parsedBlockInfo, parsedSuccessfully := parseInputWithGenericParsers(rpcInput, genericParsers)
 	if parsedSuccessfully {
-		parsedBlockInfo.parsedBlockRaw = unquoteString(parsedBlockInfo.parsedBlockRaw)
+		parsedBlockInfo.parsedDataRaw = unquoteString(parsedBlockInfo.parsedDataRaw)
 		return parsedBlockInfo
 	}
 	if parsedBlockInfo == nil {
 		parsedBlockInfo = NewParsedInput()
 	}
 
 	parsedRawBlock, _ := parseInputWithLegacyBlockParser(rpcInput, blockParser, source)
-	parsedBlockInfo.parsedBlockRaw = unquoteString(parsedRawBlock)
+	parsedBlockInfo.parsedDataRaw = unquoteString(parsedRawBlock)
 	return parsedBlockInfo
 }
 
@@ -270,24 +270,24 @@ func legacyParse(rpcInput RPCInput, blockParser spectypes.BlockParser, dataSourc
 }
 
 type ParsedInput struct {
-	parsedBlockRaw string
-	parsedBlock    int64
-	parsedHashes   []string
+	parsedDataRaw string
+	parsedBlock   int64
+	parsedHashes  []string
 }
 
 func NewParsedInput() *ParsedInput {
 	return &ParsedInput{
-		parsedBlockRaw: "",
-		parsedHashes:   make([]string, 0),
+		parsedDataRaw: "",
+		parsedHashes:  make([]string, 0),
 	}
 }
 
 func (p *ParsedInput) SetBlock(block int64) {
 	p.parsedBlock = block
 }
 
-func (p *ParsedInput) GetBlockRaw() string {
-	return p.parsedBlockRaw
+func (p *ParsedInput) GetRawParsedData() string {
+	return p.parsedDataRaw
 }
 
 func (p *ParsedInput) GetBlock() int64 {
@@ -389,14 +389,14 @@ func parseGeneric(input interface{}, genericParser spectypes.GenericParser) (*Pa
 	// regardless of the value provided by the user. for example .finality: final
 	case spectypes.PARSER_TYPE_DEFAULT_VALUE:
 		parsed := NewParsedInput()
-		parsed.parsedBlockRaw = genericParser.Value
+		parsed.parsedDataRaw = genericParser.Value
 		return parsed, nil
 	// Case Block Latest, setting the value set by the user given a json path hit.
 	// Example: block_id: 100, will result in requested block 100.
 	case spectypes.PARSER_TYPE_BLOCK_LATEST:
 		parsed := NewParsedInput()
 		block := blockInterfaceToString(value)
-		parsed.parsedBlockRaw = block
+		parsed.parsedDataRaw = block
 		return parsed, nil
 	case spectypes.PARSER_TYPE_BLOCK_HASH:
 		return parseGenericParserBlockHash(value)

protocol/parser/parser_test.go

@@ -830,7 +830,7 @@ func TestParseGeneric(t *testing.T) {
 		Rule:      "=final || =optimistic",
 	})
 	require.NoError(t, err)
-	require.Equal(t, "latest", parsedInput.GetBlockRaw())
+	require.Equal(t, "latest", parsedInput.GetRawParsedData())
 }
 
 func TestHashLengthValidation(t *testing.T) {