bet/beteran-common-rust
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server error is changed

Browse Source
This commit is contained in:
병준 박 2022-08-05 05:02:49 +00:00
parent a3afe66b5d
commit b0fd020d6f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -14,7 +14,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = { version = "1" } serde_json = { version = "1" }
prost = { version = "0" } prost = { version = "0" }
beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.21-snapshot" } beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.22-snapshot" }
[build-dependencies] [build-dependencies]

14
src/error/rpc.rs
View File

@ -194,7 +194,9 @@ impl fmt::Display for Internal {
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct Server { pub struct Server {
pub code: i32,
pub message: String, pub message: String,
pub data: Option<Vec<u8>>,
} }
impl fmt::Display for Server { impl fmt::Display for Server {
@ -246,29 +248,29 @@ impl From<Error> for bpr::protobuf::rpc::Error {
fn from(err: Error) -> Self { fn from(err: Error) -> Self {
match err { match err {
Error::Parse(e) => bpr::protobuf::rpc::Error { Error::Parse(e) => bpr::protobuf::rpc::Error {
code: -32700, code: bpr::protobuf::rpc::Error::PARSE,
message: e.message, message: e.message,
data: None, data: None,
}, },
Error::InvalidRequest(e) => bpr::protobuf::rpc::Error { Error::InvalidRequest(e) => bpr::protobuf::rpc::Error {
code: -32600, code: bpr::protobuf::rpc::Error::INVALID_REQUEST,
message: e.message, message: e.message,
data: None, data: None,
}, },
Error::InvalidParams(e) => bpr::protobuf::rpc::Error { Error::InvalidParams(e) => bpr::protobuf::rpc::Error {
code: -32602, code: bpr::protobuf::rpc::Error::INVALID_PARAMS,
message: e.message.clone(), message: e.message.clone(),
data: Some(bpr::protobuf::rpc::InvalidParamsDetail::from(&e.detail).encode_to_vec()), data: Some(bpr::protobuf::rpc::InvalidParamsDetail::from(&e.detail).encode_to_vec()),
}, },
Error::Internal(e) => bpr::protobuf::rpc::Error { Error::Internal(e) => bpr::protobuf::rpc::Error {
code: -32603, code: bpr::protobuf::rpc::Error::INTERNAL,
message: e.message, message: e.message,
data: None, data: None,
}, },
Error::Server(e) => bpr::protobuf::rpc::Error { Error::Server(e) => bpr::protobuf::rpc::Error {
code: -32603, code: e.code,
message: e.message, message: e.message,
data: None, data: e.data,
}, },
} }
} }