gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup rpc (#10910)

Browse Source 
* Remove unreachable error case

* Inline Ok

* Hoist Ok
This commit is contained in:
Greg Fitzgerald
2020-07-03 17:39:14 -06:00
committed by GitHub
parent c5a501e87f
commit 2922494b4f
3 changed files with 114 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/rpc_error.rs
View File

@@ -1,15 +1,10 @@
use jsonrpc_core::{Error, ErrorCode};
use solana_sdk::clock::Slot;
const JSON_RPC_SERVER_ERROR_0: i64 = -32000;
const JSON_RPC_SERVER_ERROR_1: i64 = -32001;
const JSON_RPC_SERVER_ERROR_2: i64 = -32002;
pub enum RpcCustomError {
NonexistentClusterRoot {
cluster_root: Slot,
node_root: Slot,
},
BlockCleanedUp {
slot: Slot,
first_available_block: Slot,
@@ -22,17 +17,6 @@ pub enum RpcCustomError {
impl From<RpcCustomError> for Error {
fn from(e: RpcCustomError) -> Self {
match e {
RpcCustomError::NonexistentClusterRoot {
cluster_root,
node_root,
} => Self {
code: ErrorCode::ServerError(JSON_RPC_SERVER_ERROR_0),
message: format!(
"Cluster largest_confirmed_root {} does not exist on node. Node root: {}",
cluster_root, node_root,
),
data: None,
},
RpcCustomError::BlockCleanedUp {
slot,
first_available_block,