Skip to content
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

chore: update predicate status format for easier parsing #420

Merged
merged 1 commit into from
Sep 25, 2023
Merged

chore: update predicate status format for easier parsing #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions components/chainhook-cli/src/service/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ impl Service {

#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
#[serde(rename_all = "snake_case")]
#[serde(tag = "type", content = "info")]
/// A high-level view of how `PredicateStatus` is used/updated can be seen here: docs/images/predicate-status-flowchart/PredicateStatusFlowchart.png.
pub enum PredicateStatus {
Scanning(ScanningData),
Expand All @@ -546,18 +547,21 @@ pub enum PredicateStatus {
}

#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
// note: last_occurrence (and other time-based fields on the status structs) originally were
// of type u128. serde can't handle deserializing u128s when using an adjacently tagged enum,
// so we're having to convert to a string. serde issue: https://github.com/serde-rs/json/issues/740
pub struct ScanningData {
pub number_of_blocks_to_scan: u64,
pub number_of_blocks_evaluated: u64,
pub number_of_times_triggered: u64,
pub last_occurrence: u128,
pub last_occurrence: String,
pub last_evaluated_block_height: u64,
}

#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
pub struct StreamingData {
pub last_occurrence: u128,
pub last_evaluation: u128,
pub last_occurrence: String,
pub last_evaluation: String,
pub number_of_times_triggered: u64,
pub number_of_blocks_evaluated: u64,
pub last_evaluated_block_height: u64,
Expand All @@ -567,7 +571,7 @@ pub struct StreamingData {
pub struct ExpiredData {
pub number_of_blocks_evaluated: u64,
pub number_of_times_triggered: u64,
pub last_occurrence: u128,
pub last_occurrence: String,
pub last_evaluated_block_height: u64,
pub expired_at_block_height: u64,
}
Expand Down Expand Up @@ -663,7 +667,8 @@ fn set_predicate_streaming_status(
let now_ms = SystemTime::now()
.duration_since(UNIX_EPOCH)
.expect("Could not get current time in ms")
.as_millis();
.as_millis()
.to_string();
let (
last_occurrence,
number_of_blocks_evaluated,
Expand Down Expand Up @@ -715,7 +720,7 @@ fn set_predicate_streaming_status(
unreachable!("unreachable predicate status: {:?}", status)
}
},
None => (0, 0, 0, 0),
None => (format!("0"), 0, 0, 0),
}
};
let (
Expand All @@ -728,7 +733,7 @@ fn set_predicate_streaming_status(
last_triggered_height,
triggered_count,
} => (
now_ms,
now_ms.clone(),
number_of_times_triggered + triggered_count,
number_of_blocks_evaluated + triggered_count,
last_triggered_height,
Expand Down Expand Up @@ -779,7 +784,8 @@ pub fn set_predicate_scanning_status(
let now_ms = SystemTime::now()
.duration_since(UNIX_EPOCH)
.expect("Could not get current time in ms")
.as_millis();
.as_millis()
.to_string();
let current_status = retrieve_predicate_status(&predicate_key, predicates_db_conn);
let last_occurrence = match current_status {
Some(status) => match status {
Expand Down Expand Up @@ -808,14 +814,14 @@ pub fn set_predicate_scanning_status(
if number_of_times_triggered > 0 {
now_ms
} else {
0
format!("0")
}
}
PredicateStatus::Interrupted(_) | PredicateStatus::ConfirmedExpiration(_) => {
unreachable!("unreachable predicate status: {:?}", status)
}
},
None => 0,
None => format!("0"),
};

update_predicate_status(
Expand Down Expand Up @@ -864,7 +870,7 @@ pub fn set_unconfirmed_expiration_status(
last_occurrence,
last_evaluated_block_height,
),
PredicateStatus::New => (0, 0, 0, 0),
PredicateStatus::New => (0, 0, format!("0"), 0),
PredicateStatus::Streaming(StreamingData {
last_occurrence,
last_evaluation: _,
Expand Down Expand Up @@ -900,7 +906,7 @@ pub fn set_unconfirmed_expiration_status(
return;
}
},
None => (0, 0, 0, 0),
None => (0, 0, format!("0"), 0),
};
update_predicate_status(
predicate_key,
Expand Down Expand Up @@ -1032,6 +1038,7 @@ pub fn update_predicate_status(
ctx: &Context,
) {
let serialized_status = json!(status).to_string();
println!("serialized predicate status {serialized_status}");
if let Err(e) =
predicates_db_conn.hset::<_, _, _, ()>(&predicate_key, "status", &serialized_status)
{
Expand Down