8000 graph: emit a block only when there's a block_ptr by cjorge-graphops · Pull Request #6215 · graphprotocol/graph-node · GitHub
[go: up one dir, main page]
Skip to content

graph: emit a block only when there's a block_ptr #6215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjorge-graphops wants to merge 2 commits into
base: master
Choose a base branch
from
Open

graph: emit a block only when there's a block_ptr #6215

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25f1d73
graph: emit a block only when there's a block_ptr
cjorge-graphops Nov 14, 2025
1612092
fix fmt
cjorge-graphops Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 80 additions & 23 deletions graph/src/data/subgraph/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,29 +132,6 @@ impl IntoValue for Info {
history_blocks,
} = self;

fn subgraph_error_to_value(subgraph_error: SubgraphError) -> r::Value {
let SubgraphError {
subgraph_id,
message,
block_ptr,
handler,
deterministic,
} = subgraph_error;

object! {
__typename: "SubgraphError",
subgraphId: subgraph_id.to_string(),
message: message,
handler: handler,
block: object! {
__typename: "Block",
number: block_ptr.as_ref().map(|x| x.number),
hash: block_ptr.map(|x| r::Value::from(Value::Bytes(x.hash.into()))),
},
deterministic: deterministic,
}
}

let non_fatal_errors: Vec<_> = non_fatal_errors
.into_iter()
.map(subgraph_error_to_value)
Expand All @@ -176,3 +153,83 @@ impl IntoValue for Info {
}
}
}

fn subgraph_error_to_value(subgraph_error: SubgraphError) -> r::Value {
let SubgraphError {
subgraph_id,
message,
block_ptr,
handler,
deterministic,
} = subgraph_error;

let block_value = block_ptr
.map(|ptr| {
object! {
__typename: "Block",
number: ptr.number,
Copy link
Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Block.number is a BigInt! in the index-node GraphQL schema and elsewhere in the codebase BlockPtr serializes number as a string (e.g., format!("{}", self.number)). Here it’s emitted as an Int (ptr.number), which is inconsistent and can break clients/serde deserialization expecting the BigInt string form. Consider reusing BlockPtr’s IntoValue implementation (or at least format the number as a string) for schema-consistent output.

Suggested change
number: ptr.number,
number: format!("{}", ptr.number),

Copilot uses AI. Check for mistakes.
hash: r::Value::from(Value::Bytes(ptr.hash.into())),
}
})
.unwrap_or(r::Value::Null);

object! {
__typename: "SubgraphError",
subgraphId: subgraph_id.to_string(),
message: message,
handler: handler,
block: block_value,
deterministic: deterministic,
}
}

#[cfg(test)]
mod tests {
use super::*;
use crate::prelude::DeploymentHash;
use web3::types::H256;

#[test]
fn subgraph_error_block_is_null_without_pointer() {
let deployment =
DeploymentHash::new("QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco").unwrap();
let value = subgraph_error_to_value(SubgraphError {
subgraph_id: deployment,
message: "boom".to_string(),
block_ptr: None,
handler: None,
deterministic: true,
});

match value {
r::Value::Object(map) => {
assert_eq!(map.get("block"), Some(&r::Value::Null));
}
_ => panic!("expected object"),
}
}

#[test]
fn subgraph_error_block_contains_data_when_present() {
let deployment =
DeploymentHash::new("QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco").unwrap();
let ptr = BlockPtr::new(H256::zero().into(), 42);
let value = subgraph_error_to_value(SubgraphError {
subgraph_id: deployment,
message: "boom".to_string(),
block_ptr: Some(ptr),
handler: None,
deterministic: true,
});

match value {
r::Value::Object(map) => match map.get("block").expect("block field present") {
r::Value::Object(block) => {
assert_eq!(block.get("number"), Some(&r::Value::Int(42.into())));
Copy link
Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This unit test asserts block.number is r::Value::Int, but Block.number is BigInt! in the status API schema and other IntoValue impls serialize BigInt values as strings. Update the test expectation (and production serialization) to the BigInt string form so the test matches the actual GraphQL wire format.

Suggested change
assert_eq!(block.get("number"), Some(&r::Value::Int(42.into())));
assert_eq!(block.get("number"), Some(&r::Value::String("42".to_string())));

Copilot uses AI. Check for mistakes.
}
other => panic!("unexpected block value {other:?}"),
},
_ => panic!("expected object"),
}
}
}
Loading
0