Skip to content

DO NOT MERGE migrate codebase to jsonrpsee #534

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

Closed
librelois wants to merge 8 commits into from
Closed

DO NOT MERGE migrate codebase to jsonrpsee #534

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03d32d2
migrate codebase to jsonrpsee (template not compile yet)
librelois Dec 9, 2021
70dcc60
fmt
librelois Dec 9, 2021
48e8d4c
upgrade jsonrpsee
librelois Dec 9, 2021
ec8c466
remove unused imports
librelois Dec 9, 2021
b49a479
fix template compilation
librelois Dec 9, 2021
639ff9b
fix manual-seal compilation
librelois Dec 9, 2021
a7491d3
fmt
librelois Dec 9, 2021
c282f45
fix error serialization
librelois Dec 10, 2021
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
Prev Previous commit
fix error serialization
  • Loading branch information
@librelois
librelois committed Dec 10, 2021
commit c282f457c0bc99a10b762fb93dcf1174db0f086a
11 changes: 5 additions & 6 deletions client/rpc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub use overrides::{
use ethereum_types::{H160, H256};
use evm::ExitError;
pub use fc_rpc_core::types::TransactionMessage;
use jsonrpsee::types::{v2::ErrorCode, CallError, Error, JsonRawValue};
use jsonrpsee::types::{v2::ErrorCode, CallError, Error};
use pallet_evm::ExitReason;
use rustc_hex::ToHex;
use sha3::{Digest, Keccak256};
Expand Down Expand Up @@ -219,7 +219,7 @@ pub fn error_on_execution_failure(reason: &ExitReason, data: &[u8]) -> Result<()
code: ErrorCode::InternalError.code(),
message: format!("evm error: {:?}", e),
data: Some(
JsonRawValue::from_string("0x".to_string()).expect("fail to serialize data"),
jsonrpsee::types::to_json_raw_value(&"0x").expect("fail to serialize data"),
),
})
}
Expand All @@ -238,16 +238,15 @@ pub fn error_on_execution_failure(reason: &ExitReason, data: &[u8]) -> Result<()
code: ErrorCode::InternalError.code(),
message,
data: Some(
JsonRawValue::from_string(data.to_hex()).expect("fail to serialize data"),
jsonrpsee::types::to_json_raw_value::<String>(&data.to_hex())
.expect("fail to serialize data"),
),
})
}
ExitReason::Fatal(e) => Err(CallError::Custom {
code: ErrorCode::InternalError.code(),
message: format!("evm fatal: {:?}", e),
data: Some(
JsonRawValue::from_string("0x".to_string()).expect("fail to serialize data"),
),
data: Some(jsonrpsee::types::to_json_raw_value(&"0x").expect("fail to serialize data")),
}),
}
}
Expand Down