Skip to content

GH-598-json-hotfix #699

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

Merged
bertllll merged 5 commits into from
Sep 9, 2025
Merged

GH-598-json-hotfix #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05c8b38
GH-598-json-hotfix: corrected
Sep 8, 2025
ef56bb3
GH-598-json-hotfix: little fix
Sep 8, 2025
b673102
GH-598-json-hotfix: rearrangement
Sep 8, 2025
eeae54a
GH-598-json-hotfix: addressing the review
Sep 8, 2025
40f4b44
GH-598-json-hotfix: finished addressing review
Sep 8, 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
33 changes: 20 additions & 13 deletions node/src/accountant/db_access_objects/failed_payable_dao.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ mod tests {
make_read_only_db_connection, FailedTxBuilder,
};
use crate::accountant::db_access_objects::utils::current_unix_timestamp;
use crate::blockchain::errors::rpc_errors::AppRpcErrorKind;
use crate::blockchain::errors::rpc_errors::{AppRpcErrorKind, LocalErrorKind, RemoteErrorKind};
use crate::blockchain::errors::validation_status::{
PreviousAttempts, ValidationFailureClockReal,
};
Expand Down Expand Up @@ -591,8 +591,8 @@ mod tests {
fn failure_reason_from_str_works() {
// Submission error
assert_eq!(
FailureReason::from_str(r#"{"Submission":{"Local":{"Decoder"}}}"#).unwrap(),
FailureReason::Submission(AppRpcErrorKind::Decoder)
FailureReason::from_str(r#"{"Submission":{"Local":"Decoder"}}"#).unwrap(),
FailureReason::Submission(AppRpcErrorKind::Local(LocalErrorKind::Decoder))
);

// Reverted
Expand Down Expand Up @@ -640,8 +640,8 @@ mod tests {
);

assert_eq!(
FailureStatus::from_str(r#"{"RecheckRequired":{"Reattempting":{"ServerUnreachable":{"firstSeen":{"secs_since_epoch":1755080031,"nanos_since_epoch":612180914},"attempts":1}}}}"#).unwrap(),
FailureStatus::RecheckRequired(ValidationStatus::Reattempting( PreviousAttempts::new(BlockchainErrorKind::AppRpc(AppRpcErrorKind::ServerUnreachable), &validation_failure_clock)))
FailureStatus::from_str(r#"{"RecheckRequired":{"Reattempting":[{"error":{"AppRpc":{"Remote":"Unreachable"}},"firstSeen":{"secs_since_epoch":1755080031,"nanos_since_epoch":612180914},"attempts":1}]}}"#).unwrap(),
FailureStatus::RecheckRequired(ValidationStatus::Reattempting( PreviousAttempts::new(BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(RemoteErrorKind::Unreachable)), &validation_failure_clock)))
);

assert_eq!(
Expand All @@ -652,9 +652,8 @@ mod tests {
// Invalid Variant
assert_eq!(
FailureStatus::from_str("\"UnknownStatus\"").unwrap_err(),
"unknown variant `UnknownStatus`, \
expected one of `RetryRequired`, `RecheckRequired`, `Concluded` \
at line 1 column 15 in '\"UnknownStatus\"'"
"unknown variant `UnknownStatus`, expected one of `RetryRequired`, `RecheckRequired`, \
`Concluded` at line 1 column 15 in '\"UnknownStatus\"'"
);

// Invalid Input
Expand Down Expand Up @@ -724,7 +723,9 @@ mod tests {
.reason(PendingTooLong)
.status(RecheckRequired(ValidationStatus::Reattempting(
PreviousAttempts::new(
BlockchainErrorKind::AppRpc(AppRpcErrorKind::ServerUnreachable),
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
RemoteErrorKind::Unreachable,
)),
&ValidationFailureClockReal::default(),
),
)))
Expand Down Expand Up @@ -775,13 +776,19 @@ mod tests {
subject
.insert_new_records(&vec![tx1.clone(), tx2.clone(), tx3.clone(), tx4.clone()])
.unwrap();
let timestamp = SystemTime::now();
let clock = ValidationFailureClockMock::default()
.now_result(timestamp)
.now_result(timestamp);
let hashmap = HashMap::from([
(tx1.hash, Concluded),
(
tx2.hash,
RecheckRequired(ValidationStatus::Reattempting(PreviousAttempts::new(
BlockchainErrorKind::AppRpc(AppRpcErrorKind::ServerUnreachable),
&ValidationFailureClockReal::default(),
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
RemoteErrorKind::Unreachable,
)),
&clock,
))),
),
(tx3.hash, Concluded),
Expand All @@ -797,8 +804,8 @@ mod tests {
assert_eq!(
updated_txs[1].status,
RecheckRequired(ValidationStatus::Reattempting(PreviousAttempts::new(
BlockchainErrorKind::AppRpc(AppRpcErrorKind::ServerUnreachable),
&ValidationFailureClockReal::default()
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(RemoteErrorKind::Unreachable)),
&clock
)))
);
assert_eq!(tx3.status, RetryRequired);
Expand Down
18 changes: 12 additions & 6 deletions node/src/accountant/db_access_objects/sent_payable_dao.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ mod tests {
use crate::accountant::db_access_objects::test_utils::{make_read_only_db_connection, TxBuilder};
use crate::blockchain::blockchain_interface::blockchain_interface_web3::lower_level_interface_web3::{TransactionBlock};
use crate::blockchain::errors::BlockchainErrorKind;
use crate::blockchain::errors::rpc_errors::AppRpcErrorKind;
use crate::blockchain::errors::rpc_errors::{AppRpcErrorKind, RemoteErrorKind};
use crate::blockchain::errors::validation_status::{PreviousAttempts, ValidationFailureClockReal};
use crate::blockchain::test_utils::{make_block_hash, make_tx_hash, ValidationFailureClockMock};

Expand All @@ -458,11 +458,15 @@ mod tests {
.hash(make_tx_hash(2))
.status(TxStatus::Pending(ValidationStatus::Reattempting(
PreviousAttempts::new(
BlockchainErrorKind::AppRpc(AppRpcErrorKind::ServerUnreachable),
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
RemoteErrorKind::Unreachable,
)),
&ValidationFailureClockReal::default(),
)
.add_attempt(
BlockchainErrorKind::AppRpc(AppRpcErrorKind::ServerUnreachable),
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
RemoteErrorKind::Unreachable,
)),
&ValidationFailureClockReal::default(),
),
)))
Expand Down Expand Up @@ -694,7 +698,9 @@ mod tests {
.hash(make_tx_hash(2))
.status(TxStatus::Pending(ValidationStatus::Reattempting(
PreviousAttempts::new(
BlockchainErrorKind::AppRpc(AppRpcErrorKind::ServerUnreachable),
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
RemoteErrorKind::Unreachable,
)),
&ValidationFailureClockReal::default(),
),
)))
Expand Down Expand Up @@ -1189,8 +1195,8 @@ mod tests {
);

assert_eq!(
TxStatus::from_str(r#"{"Pending":{"Reattempting":{"InvalidResponse":{"firstSeen":{"secs_since_epoch":12456,"nanos_since_epoch":0},"attempts":1}}}}"#).unwrap(),
TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(BlockchainErrorKind::AppRpc(AppRpcErrorKind::InvalidResponse), &validation_failure_clock)))
TxStatus::from_str(r#"{"Pending":{"Reattempting":[{"error":{"AppRpc":{"Remote":"InvalidResponse"}},"firstSeen":{"secs_since_epoch":12456,"nanos_since_epoch":0},"attempts":1}]}}"#).unwrap(),
TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(RemoteErrorKind::InvalidResponse)), &validation_failure_clock)))
);

assert_eq!(
Expand Down
8 changes: 4 additions & 4 deletions node/src/blockchain/errors/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ pub enum BlockchainErrorKind {
#[cfg(test)]
mod tests {
use crate::blockchain::errors::internal_errors::InternalErrorKind;
use crate::blockchain::errors::rpc_errors::AppRpcErrorKind;
use crate::blockchain::errors::rpc_errors::{AppRpcErrorKind, LocalErrorKind};
use crate::blockchain::errors::BlockchainErrorKind;

#[test]
fn blockchain_error_serialization_deserialization() {
vec![
(
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Decoder),
"{\"AppRpc\":\"Decoder\"}",
BlockchainErrorKind::AppRpc(AppRpcErrorKind::Local(LocalErrorKind::Decoder)),
r#"{"AppRpc":{"Local":"Decoder"}}"#,
),
(
BlockchainErrorKind::Internal(InternalErrorKind::PendingTooLongNotReplaced),
"{\"Internal\":\"PendingTooLongNotReplaced\"}",
r#"{"Internal":"PendingTooLongNotReplaced"}"#,
),
]
.into_iter()
Expand Down
80 changes: 43 additions & 37 deletions node/src/blockchain/errors/rpc_errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub enum AppRpcError {
pub enum LocalError {
Decoder(String),
Internal,
Io(String),
IO(String),
Signing(String),
Transport(String),
}
Expand All @@ -33,7 +33,7 @@ impl From<Web3Error> for AppRpcError {
// Local Errors
Web3Error::Decoder(error) => AppRpcError::Local(LocalError::Decoder(error)),
Web3Error::Internal => AppRpcError::Local(LocalError::Internal),
Web3Error::Io(error) => AppRpcError::Local(LocalError::Io(error.to_string())),
Web3Error::Io(error) => AppRpcError::Local(LocalError::IO(error.to_string())),
Web3Error::Signing(error) => {
// This variant cannot be tested due to import limitations.
AppRpcError::Local(LocalError::Signing(error.to_string()))
Expand All @@ -53,35 +53,44 @@ impl From<Web3Error> for AppRpcError {
}
}

#[derive(Debug, Hash, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum AppRpcErrorKind {
// Local
Local(LocalErrorKind),
Remote(RemoteErrorKind),
}

#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum LocalErrorKind {
Decoder,
Internal,
IO,
Signing,
Transport,
}

// Remote
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum RemoteErrorKind {
InvalidResponse,
ServerUnreachable,
Unreachable,
Web3RpcError(i64), // Keep only the stable error code
}

impl From<&AppRpcError> for AppRpcErrorKind {
fn from(err: &AppRpcError) -> Self {
match err {
AppRpcError::Local(local) => match local {
LocalError::Decoder(_) => Self::Decoder,
LocalError::Internal => Self::Internal,
LocalError::Io(_) => Self::IO,
LocalError::Signing(_) => Self::Signing,
LocalError::Transport(_) => Self::Transport,
LocalError::Decoder(_) => Self::Local(LocalErrorKind::Decoder),
LocalError::Internal => Self::Local(LocalErrorKind::Internal),
LocalError::IO(_) => Self::Local(LocalErrorKind::IO),
LocalError::Signing(_) => Self::Local(LocalErrorKind::Signing),
LocalError::Transport(_) => Self::Local(LocalErrorKind::Transport),
},
AppRpcError::Remote(remote) => match remote {
RemoteError::InvalidResponse(_) => Self::InvalidResponse,
RemoteError::Unreachable => Self::ServerUnreachable,
RemoteError::Web3RpcError { code, .. } => Self::Web3RpcError(*code),
RemoteError::InvalidResponse(_) => Self::Remote(RemoteErrorKind::InvalidResponse),
RemoteError::Unreachable => Self::Remote(RemoteErrorKind::Unreachable),
RemoteError::Web3RpcError { code, .. } => {
Self::Remote(RemoteErrorKind::Web3RpcError(*code))
}
},
}
}
Expand All @@ -90,7 +99,7 @@ impl From<&AppRpcError> for AppRpcErrorKind {
#[cfg(test)]
mod tests {
use crate::blockchain::errors::rpc_errors::{
AppRpcError, AppRpcErrorKind, LocalError, RemoteError,
AppRpcError, AppRpcErrorKind, LocalError, LocalErrorKind, RemoteError, RemoteErrorKind,
};
use web3::error::Error as Web3Error;

Expand All @@ -110,7 +119,7 @@ mod tests {
std::io::ErrorKind::Other,
"IO error"
))),
AppRpcError::Local(LocalError::Io("IO error".to_string()))
AppRpcError::Local(LocalError::IO("IO error".to_string()))
);
assert_eq!(
AppRpcError::from(Web3Error::Transport("Transport error".to_string())),
Expand Down Expand Up @@ -145,69 +154,66 @@ mod tests {
AppRpcErrorKind::from(&AppRpcError::Local(LocalError::Decoder(
"Decoder error".to_string()
))),
AppRpcErrorKind::Decoder
AppRpcErrorKind::Local(LocalErrorKind::Decoder)
);
assert_eq!(
AppRpcErrorKind::from(&AppRpcError::Local(LocalError::Internal)),
AppRpcErrorKind::Internal
AppRpcErrorKind::Local(LocalErrorKind::Internal)
);
assert_eq!(
AppRpcErrorKind::from(&AppRpcError::Local(LocalError::Io("IO error".to_string()))),
AppRpcErrorKind::IO
AppRpcErrorKind::from(&AppRpcError::Local(LocalError::IO("IO error".to_string()))),
AppRpcErrorKind::Local(LocalErrorKind::IO)
);
assert_eq!(
AppRpcErrorKind::from(&AppRpcError::Local(LocalError::Signing(
"Signing error".to_string()
))),
AppRpcErrorKind::Signing
AppRpcErrorKind::Local(LocalErrorKind::Signing)
);
assert_eq!(
AppRpcErrorKind::from(&AppRpcError::Local(LocalError::Transport(
"Transport error".to_string()
))),
AppRpcErrorKind::Transport
AppRpcErrorKind::Local(LocalErrorKind::Transport)
);
assert_eq!(
AppRpcErrorKind::from(&AppRpcError::Remote(RemoteError::InvalidResponse(
"Invalid response".to_string()
))),
AppRpcErrorKind::InvalidResponse
AppRpcErrorKind::Remote(RemoteErrorKind::InvalidResponse)
);
assert_eq!(
AppRpcErrorKind::from(&AppRpcError::Remote(RemoteError::Unreachable)),
AppRpcErrorKind::ServerUnreachable
AppRpcErrorKind::Remote(RemoteErrorKind::Unreachable)
);
assert_eq!(
AppRpcErrorKind::from(&AppRpcError::Remote(RemoteError::Web3RpcError {
code: 55,
message: "Booga".to_string()
})),
AppRpcErrorKind::Web3RpcError(55)
AppRpcErrorKind::Remote(RemoteErrorKind::Web3RpcError(55))
);
}

#[test]
fn app_rpc_error_kind_serialization_deserialization() {
let errors = vec![
// Local Errors
AppRpcErrorKind::Decoder,
AppRpcErrorKind::Internal,
AppRpcErrorKind::IO,
AppRpcErrorKind::Signing,
AppRpcErrorKind::Transport,
// Remote Errors
AppRpcErrorKind::InvalidResponse,
AppRpcErrorKind::ServerUnreachable,
AppRpcErrorKind::Web3RpcError(42),
AppRpcErrorKind::Local(LocalErrorKind::Decoder),
AppRpcErrorKind::Local(LocalErrorKind::Internal),
AppRpcErrorKind::Local(LocalErrorKind::IO),
AppRpcErrorKind::Local(LocalErrorKind::Signing),
AppRpcErrorKind::Local(LocalErrorKind::Transport),
AppRpcErrorKind::Remote(RemoteErrorKind::InvalidResponse),
AppRpcErrorKind::Remote(RemoteErrorKind::Unreachable),
AppRpcErrorKind::Remote(RemoteErrorKind::Web3RpcError(42)),
];

errors.into_iter().for_each(|error| {
let serialized = serde_json::to_string(&error).unwrap();
let deserialized: AppRpcErrorKind = serde_json::from_str(&serialized).unwrap();
assert_eq!(
error, deserialized,
"Failed serde attempt for {:?} that should look \
like {:?}",
"Failed serde attempt for {:?} that should look like {:?}",
deserialized, error
);
});
Expand Down
Loading