Skip to content

Commit 7fa5f8b

Browse files
bkioshnbkioshn
committed
fix problem report json display
Signed-off-by: bkioshn <[email protected]>
1 parent f718ba8 commit 7fa5f8b

File tree

4 files changed

+103
-8
lines changed

4 files changed

+103
-8
lines changed

‎hermes/apps/athena/modules/rbac-registration-indexer/src/lib.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use rbac_registration::{
2929
cardano::cip509::{Cip0134UriSet, Cip509},
3030
};
3131
use serde_json::json;
32-
use utils::{cardano::block::build_block, log::log_error};
32+
use utils::{cardano::block::build_block, log::log_error, problem_report::problem_report_to_json};
3333

3434
use crate::{
3535
database::{
@@ -55,7 +55,7 @@ use crate::{
5555
utils::log::log_info,
5656
};
5757

58-
use hermes::{cardano, sqlite::api::Statement};
58+
use hermes::cardano;
5959

6060
struct RbacRegistrationComponent;
6161

@@ -130,11 +130,7 @@ impl exports::hermes::cardano::event_on_block::Guest for RbacRegistrationCompone
130130
let txn_idx: u16 = reg.origin().txn_index().into();
131131
let purpose: Option<String> = reg.purpose().map(|p| p.to_string());
132132
let prv_txn_id: Option<Vec<u8>> = reg.previous_transaction().map(|p| p.into());
133-
let problem_report: Option<String> = reg
134-
.report()
135-
.is_problematic()
136-
.then(|| Some(format!("{:?}", reg.report())))
137-
.flatten();
133+
let problem_report: Option<String> = problem_report_to_json(reg.report());
138134
// Can contain multiple stake addresses
139135
let stake_addresses = reg
140136
.certificate_uris()

‎hermes/apps/athena/modules/rbac-registration-indexer/src/utils/mod.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//! Utilities
2+
13
pub(crate) mod cardano;
24
pub(crate) mod log;
5+
pub(crate) mod problem_report;
36
pub(crate) mod value;

‎hermes/apps/athena/modules/rbac-registration-indexer/src/utils/problem_report.rs‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
//! Problem report utils.
2+
3+
use catalyst_types::problem_report::ProblemReport;
4+
5+
/// Converts problem report to JSON.
6+
pub(crate) fn problem_report_to_json(report: &ProblemReport) -> Option<String> {
7+
if !report.is_problematic() {
8+
return None;
9+
}
10+
let mut obj = serde_json::json!({
11+
"context": report.context(),
12+
});
13+
14+
let entries: Vec<_> = report
15+
.entries()
16+
.map(|elem| {
17+
elem.map(|entry| {
18+
let mut obj = serde_json::json!({
19+
"msg": entry.context(),
20+
});
21+
22+
let map = obj.as_object_mut().unwrap();
23+
24+
match entry.kind() {
25+
catalyst_types::problem_report::Kind::MissingField { field } => {
26+
map.insert("kind".to_string(), serde_json::json!("MissingField"));
27+
map.insert("field".to_string(), serde_json::json!(field));
28+
},
29+
catalyst_types::problem_report::Kind::UnknownField { field, value } => {
30+
map.insert("kind".to_string(), serde_json::json!("UnknownField"));
31+
map.insert("field".to_string(), serde_json::json!(field));
32+
map.insert("value".to_string(), serde_json::json!(value));
33+
},
34+
catalyst_types::problem_report::Kind::InvalidValue {
35+
field,
36+
value,
37+
constraint,
38+
} => {
39+
map.insert("kind".to_string(), serde_json::json!("InvalidValue"));
40+
map.insert("field".to_string(), serde_json::json!(field));
41+
map.insert("value".to_string(), serde_json::json!(value));
42+
map.insert("constraint".to_string(), serde_json::json!(constraint));
43+
},
44+
catalyst_types::problem_report::Kind::InvalidEncoding {
45+
field,
46+
encoded,
47+
expected,
48+
} => {
49+
map.insert("kind".to_string(), serde_json::json!("InvalidEncoding"));
50+
map.insert("field".to_string(), serde_json::json!(field));
51+
map.insert("encoded".to_string(), serde_json::json!(encoded));
52+
map.insert("expected".to_string(), serde_json::json!(expected));
53+
},
54+
catalyst_types::problem_report::Kind::FunctionalValidation { explanation } => {
55+
map.insert(
56+
"kind".to_string(),
57+
serde_json::json!("FunctionalValidation"),
58+
);
59+
map.insert("explanation".to_string(), serde_json::json!(explanation));
60+
},
61+
catalyst_types::problem_report::Kind::DuplicateField { field, description } => {
62+
map.insert("kind".to_string(), serde_json::json!("DuplicateField"));
63+
map.insert("field".to_string(), serde_json::json!(field));
64+
map.insert("description".to_string(), serde_json::json!(description));
65+
},
66+
catalyst_types::problem_report::Kind::ConversionError {
67+
field,
68+
value,
69+
expected_type,
70+
} => {
71+
map.insert("kind".to_string(), serde_json::json!("ConversionError"));
72+
map.insert("field".to_string(), serde_json::json!(field));
73+
map.insert("value".to_string(), serde_json::json!(value));
74+
map.insert(
75+
"expected_type".to_string(),
76+
serde_json::json!(expected_type),
77+
);
78+
},
79+
catalyst_types::problem_report::Kind::Other { description } => {
80+
map.insert("kind".to_string(), serde_json::json!("Other"));
81+
map.insert("description".to_string(), serde_json::json!(description));
82+
},
83+
}
84+
85+
obj
86+
})
87+
})
88+
.collect();
89+
90+
let report_json = serde_json::json!({
91+
"context": report.context(),
92+
"entries": entries
93+
});
94+
95+
serde_json::to_string(&report_json).ok()
96+
}

‎hermes/bin/src/runtime_extensions/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mod wasi;
1313

1414
/// Advise Runtime Extensions of a new context
1515
pub(crate) fn new_context(ctx: &crate::runtime_context::HermesRuntimeContext) {
16-
span!(Level::INFO, "Context Span", ctx = %ctx).in_scope(|| {
16+
span!(Level::DEBUG, "Context Span", ctx = %ctx).in_scope(|| {
1717
hermes::new_context(ctx);
1818
wasi::new_context(ctx);
1919
});

0 commit comments

Comments
 (0)