Skip to content

Commit 993038e

Browse files
G8XSUG8XSU
committed
cargo fmt
1 parent f66c748 commit 993038e

File tree

4 files changed

+142
-139
lines changed

4 files changed

+142
-139
lines changed

‎rustfmt.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ hard_tabs = true # use tab characters for indentation, spaces for alignment
22
use_field_init_shorthand = true
33
max_width = 120
44
use_small_heuristics = "Max"
5+
chain_width = 80
56
fn_args_layout = "Compressed"

‎vss-accessor/build.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ use std::fs::File;
55
use std::path::Path;
66

77
fn main() {
8-
download_file("https://raw.githubusercontent.com/lightningdevkit/vss-server/main/app/src/main/proto/vss.proto",
9-
"src/proto/vss.proto").unwrap();
8+
download_file(
9+
"https://raw.githubusercontent.com/lightningdevkit/vss-server/main/app/src/main/proto/vss.proto",
10+
"src/proto/vss.proto",
11+
)
12+
.unwrap();
1013

11-
prost_build::compile_protos(&["src/proto/vss.proto"],
12-
&["src/"]).unwrap();
14+
prost_build::compile_protos(&["src/proto/vss.proto"], &["src/"]).unwrap();
1315
}
1416

1517
fn download_file(url: &str, save_to: &str) -> Result<(), Box<dyn std::error::Error>> {
16-
let mut response = reqwest::blocking::get(url)?;
17-
fs::create_dir_all(Path::new(save_to).parent().unwrap())?;
18-
let mut out_file = File::create(save_to)?;
19-
response.copy_to(&mut out_file)?;
20-
Ok(())
18+
let mut response = reqwest::blocking::get(url)?;
19+
fs::create_dir_all(Path::new(save_to).parent().unwrap())?;
20+
let mut out_file = File::create(save_to)?;
21+
response.copy_to(&mut out_file)?;
22+
Ok(())
2123
}

‎vss-accessor/src/lib.rs

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -3,93 +3,93 @@ use reqwest;
33
use reqwest::Client;
44
use std::error::Error;
55

6-
use crate::vss::{GetObjectRequest, GetObjectResponse, KeyValue, ListKeyVersionsRequest, ListKeyVersionsResponse, PutObjectRequest, PutObjectResponse};
6+
use crate::vss::{
7+
GetObjectRequest, GetObjectResponse, KeyValue, ListKeyVersionsRequest, ListKeyVersionsResponse, PutObjectRequest,
8+
PutObjectResponse,
9+
};
710
use crate::vss_error::VssError;
811

912
mod vss_error;
1013

1114
pub mod vss {
12-
include!(concat!(env!("OUT_DIR"), "/org.vss.rs"));
15+
include!(concat!(env!("OUT_DIR"), "/org.vss.rs"));
1316
}
1417

1518
pub struct VssAccessor {
16-
base_url: String,
17-
client: Client,
19+
base_url: String,
20+
client: Client,
1821
}
1922

2023
impl VssAccessor {
21-
pub fn new(base_url: &str) -> Result<Self, Box<dyn Error>> {
22-
let client = Client::new();
23-
Ok(Self { base_url: String::from(base_url), client })
24-
}
25-
26-
pub async fn get(&self, store: &str, key: &str) -> Result<GetObjectResponse, VssError> {
27-
let url = format!("{}/getObject", self.base_url);
28-
29-
let request = GetObjectRequest { store_id: store.into(), key: key.to_string() };
30-
31-
let response_raw = self.client.post(url)
32-
.body(request.encode_to_vec())
33-
.send().await?;
34-
let status = response_raw.status();
35-
let payload = &response_raw.bytes().await?;
36-
37-
if status.is_success() {
38-
let response = GetObjectResponse::decode(&payload[..])?;
39-
Ok(response)
40-
} else {
41-
Err(VssError::new(status, &payload))
42-
}
43-
}
44-
45-
pub async fn put(&self, store: &str, global_version: Option<i64>, key: &str, version: i64, value: &[u8])
46-
-> Result<PutObjectResponse, VssError> {
47-
let kv = KeyValue { key: String::from(key), version, value: value.to_vec() };
48-
return self.put_tx(store, global_version, vec![kv]).await;
49-
}
50-
51-
pub async fn put_tx(&self, store: &str, global_version: Option<i64>, transaction_items: Vec<KeyValue>)
52-
-> Result<PutObjectResponse, VssError> {
53-
let url = format!("{}/putObjects", self.base_url);
54-
55-
let request = PutObjectRequest { store_id: store.into(), global_version, transaction_items };
56-
57-
let response_raw = self.client.post(url)
58-
.body(request.encode_to_vec())
59-
.send().await?;
60-
let status = response_raw.status();
61-
let payload = &response_raw.bytes().await?;
62-
63-
if status.is_success() {
64-
let response = PutObjectResponse::decode(&payload[..])?;
65-
Ok(response)
66-
} else {
67-
Err(VssError::new(status, &payload))
68-
}
69-
}
70-
71-
pub async fn list_key_versions(&self, store: &str, key_prefix: &str, page_size: Option<i32>, page_token: Option<String>)
72-
-> Result<ListKeyVersionsResponse, VssError> {
73-
let url = format!("{}/listKeyVersions", self.base_url);
74-
75-
let request = ListKeyVersionsRequest {
76-
store_id: store.to_string(),
77-
key_prefix: Some(key_prefix.to_string()),
78-
page_size,
79-
page_token,
80-
};
81-
82-
let response_raw = self.client.post(url)
83-
.body(request.encode_to_vec())
84-
.send().await?;
85-
let status = response_raw.status();
86-
let payload = &response_raw.bytes().await?;
87-
88-
if status.is_success() {
89-
let response = ListKeyVersionsResponse::decode(&payload[..])?;
90-
Ok(response)
91-
} else {
92-
Err(VssError::new(status, &payload))
93-
}
94-
}
24+
pub fn new(base_url: &str) -> Result<Self, Box<dyn Error>> {
25+
let client = Client::new();
26+
Ok(Self { base_url: String::from(base_url), client })
27+
}
28+
29+
pub async fn get(&self, store: &str, key: &str) -> Result<GetObjectResponse, VssError> {
30+
let url = format!("{}/getObject", self.base_url);
31+
32+
let request = GetObjectRequest { store_id: store.into(), key: key.to_string() };
33+
34+
let response_raw = self.client.post(url).body(request.encode_to_vec()).send().await?;
35+
let status = response_raw.status();
36+
let payload = &response_raw.bytes().await?;
37+
38+
if status.is_success() {
39+
let response = GetObjectResponse::decode(&payload[..])?;
40+
Ok(response)
41+
} else {
42+
Err(VssError::new(status, &payload))
43+
}
44+
}
45+
46+
pub async fn put(
47+
&self, store: &str, global_version: Option<i64>, key: &str, version: i64, value: &[u8],
48+
) -> Result<PutObjectResponse, VssError> {
49+
let kv = KeyValue { key: String::from(key), version, value: value.to_vec() };
50+
return self.put_tx(store, global_version, vec![kv]).await;
51+
}
52+
53+
pub async fn put_tx(
54+
&self, store: &str, global_version: Option<i64>, transaction_items: Vec<KeyValue>,
55+
) -> Result<PutObjectResponse, VssError> {
56+
let url = format!("{}/putObjects", self.base_url);
57+
58+
let request = PutObjectRequest { store_id: store.into(), global_version, transaction_items };
59+
60+
let response_raw = self.client.post(url).body(request.encode_to_vec()).send().await?;
61+
let status = response_raw.status();
62+
let payload = &response_raw.bytes().await?;
63+
64+
if status.is_success() {
65+
let response = PutObjectResponse::decode(&payload[..])?;
66+
Ok(response)
67+
} else {
68+
Err(VssError::new(status, &payload))
69+
}
70+
}
71+
72+
pub async fn list_key_versions(
73+
&self, store: &str, key_prefix: &str, page_size: Option<i32>, page_token: Option<String>,
74+
) -> Result<ListKeyVersionsResponse, VssError> {
75+
let url = format!("{}/listKeyVersions", self.base_url);
76+
77+
let request = ListKeyVersionsRequest {
78+
store_id: store.to_string(),
79+
key_prefix: Some(key_prefix.to_string()),
80+
page_size,
81+
page_token,
82+
};
83+
84+
let response_raw = self.client.post(url).body(request.encode_to_vec()).send().await?;
85+
let status = response_raw.status();
86+
let payload = &response_raw.bytes().await?;
87+
88+
if status.is_success() {
89+
let response = ListKeyVersionsResponse::decode(&payload[..])?;
90+
Ok(response)
91+
} else {
92+
Err(VssError::new(status, &payload))
93+
}
94+
}
9595
}

‎vss-accessor/src/vss_error.rs

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
1-
use std::error::Error;
2-
use std::fmt::{Display, Formatter};
3-
use prost::{DecodeError, Message};
1+
use crate::vss::{ErrorCode, ErrorResponse};
42
use prost::bytes::Bytes;
3+
use prost::{DecodeError, Message};
54
use reqwest::StatusCode;
6-
use crate::vss::{ErrorCode, ErrorResponse};
5+
use std::error::Error;
6+
use std::fmt::{Display, Formatter};
77

88
#[derive(Debug)]
99
pub enum VssError {
10-
InvalidRequestError(ErrorResponse),
11-
ConflictError(ErrorResponse),
12-
InternalServerError(ErrorResponse),
13-
InternalError(String),
10+
InvalidRequestError(ErrorResponse),
11+
ConflictError(ErrorResponse),
12+
InternalServerError(ErrorResponse),
13+
InternalError(String),
1414
}
1515

1616
impl VssError {
17-
pub fn new(status: StatusCode, payload: &&Bytes) -> VssError {
18-
match ErrorResponse::decode(&payload[..]) {
19-
Ok(error_response) => VssError::from(error_response),
20-
Err(e) => {
21-
let message = format!(
22-
"Unable to decode ErrorResponse from server, HttpStatusCode: {}, DecodeErr: {}",
23-
status, e);
24-
VssError::InternalError(message)
25-
}
26-
}
27-
}
17+
pub fn new(status: StatusCode, payload: &&Bytes) -> VssError {
18+
match ErrorResponse::decode(&payload[..]) {
19+
Ok(error_response) => VssError::from(error_response),
20+
Err(e) => {
21+
let message =
22+
format!("Unable to decode ErrorResponse from server, HttpStatusCode: {}, DecodeErr: {}", status, e);
23+
VssError::InternalError(message)
24+
}
25+
}
26+
}
2827
}
2928

3029
impl Display for VssError {
31-
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
32-
match *self {
33-
VssError::InvalidRequestError(ref error_response) => {
34-
write!(f, "Request sent to VSS Server was invalid : {}", error_response.message)
35-
}
36-
VssError::ConflictError(ref error_response) => {
37-
write!(f, "Potential version conflict in write operation : {}", error_response.message)
38-
}
39-
VssError::InternalServerError(ref error_response) => {
40-
write!(f, "InternalServerError : {}", error_response.message)
41-
}
42-
VssError::InternalError(ref message) => {
43-
write!(f, "InternalError : {}", message)
44-
}
45-
}
46-
}
30+
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
31+
match *self {
32+
VssError::InvalidRequestError(ref error_response) => {
33+
write!(f, "Request sent to VSS Server was invalid : {}", error_response.message)
34+
}
35+
VssError::ConflictError(ref error_response) => {
36+
write!(f, "Potential version conflict in write operation : {}", error_response.message)
37+
}
38+
VssError::InternalServerError(ref error_response) => {
39+
write!(f, "InternalServerError : {}", error_response.message)
40+
}
41+
VssError::InternalError(ref message) => {
42+
write!(f, "InternalError : {}", message)
43+
}
44+
}
45+
}
4746
}
4847

4948
impl Error for VssError {}
5049

5150
impl From<ErrorResponse> for VssError {
52-
fn from(error_response: ErrorResponse) -> Self {
53-
return match error_response.error_code() {
54-
ErrorCode::InvalidRequestException => { VssError::InvalidRequestError(error_response) }
55-
ErrorCode::ConflictException => { VssError::ConflictError(error_response) }
56-
ErrorCode::InternalServerException => { VssError::InternalServerError(error_response) }
57-
_ => {
58-
VssError::InternalError(format!("Server responded with an unknown error code: {}, \
59-
message: {}", error_response.error_code, error_response.message))
60-
}
61-
};
62-
}
51+
fn from(error_response: ErrorResponse) -> Self {
52+
return match error_response.error_code() {
53+
ErrorCode::InvalidRequestException => VssError::InvalidRequestError(error_response),
54+
ErrorCode::ConflictException => VssError::ConflictError(error_response),
55+
ErrorCode::InternalServerException => VssError::InternalServerError(error_response),
56+
_ => VssError::InternalError(format!(
57+
"Server responded with an unknown error code: {}, \
58+
message: {}",
59+
error_response.error_code, error_response.message
60+
)),
61+
};
62+
}
6363
}
6464

6565
impl From<DecodeError> for VssError {
66-
fn from(err: DecodeError) -> Self {
67-
VssError::InternalError(err.to_string())
68-
}
66+
fn from(err: DecodeError) -> Self {
67+
VssError::InternalError(err.to_string())
68+
}
6969
}
7070

7171
impl From<reqwest::Error> for VssError {
72-
fn from(err: reqwest::Error) -> Self {
73-
VssError::InternalError(err.to_string())
74-
}
72+
fn from(err: reqwest::Error) -> Self {
73+
VssError::InternalError(err.to_string())
74+
}
7575
}

0 commit comments

Comments
 (0)