f - Use consistent cases when naming structs

Author: jkczyz

lightning-block-sync/src/rest.rs

@@ -4,12 +4,12 @@ use std::convert::TryFrom;
 use std::convert::TryInto;
 
 /// A simple REST client for requesting resources using HTTP `GET`.
-pub struct RESTClient {
+pub struct RestClient {
 	endpoint: HttpEndpoint,
 	client: HttpClient,
 }
 
-impl RESTClient {
+impl RestClient {
 	pub fn new(endpoint: HttpEndpoint) -> std::io::Result<Self> {
 		let client = HttpClient::connect(&endpoint)?;
 		Ok(Self { endpoint, client })
@@ -48,7 +48,7 @@ mod tests {
 	#[tokio::test]
 	async fn request_unknown_resource() {
 		let server = HttpServer::responding_with_not_found();
-		let mut client = RESTClient::new(server.endpoint()).unwrap();
+		let mut client = RestClient::new(server.endpoint()).unwrap();
 
 		match client.request_resource::<BinaryResponse, u32>("/").await {
 			Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::NotFound),
@@ -59,7 +59,7 @@ mod tests {
 	#[tokio::test]
 	async fn request_malformed_resource() {
 		let server = HttpServer::responding_with_ok(MessageBody::Content("foo"));
-		let mut client = RESTClient::new(server.endpoint()).unwrap();
+		let mut client = RestClient::new(server.endpoint()).unwrap();
 
 		match client.request_resource::<BinaryResponse, u32>("/").await {
 			Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::InvalidData),
@@ -70,7 +70,7 @@ mod tests {
 	#[tokio::test]
 	async fn request_valid_resource() {
 		let server = HttpServer::responding_with_ok(MessageBody::Content(42));
-		let mut client = RESTClient::new(server.endpoint()).unwrap();
+		let mut client = RestClient::new(server.endpoint()).unwrap();
 
 		match client.request_resource::<BinaryResponse, u32>("/").await {
 			Err(e) => panic!("Unexpected error: {:?}", e),

lightning-block-sync/src/rpc.rs

@@ -8,14 +8,14 @@ use std::convert::TryInto;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 /// A simple RPC client for calling methods using HTTP `POST`.
-pub struct RPCClient {
+pub struct RpcClient {
 	basic_auth: String,
 	endpoint: HttpEndpoint,
 	client: HttpClient,
 	id: AtomicUsize,
 }
 
-impl RPCClient {
+impl RpcClient {
 	pub fn new(user_auth: &str, endpoint: HttpEndpoint) -> std::io::Result<Self> {
 		let client = HttpClient::connect(&endpoint)?;
 		Ok(Self {
@@ -79,7 +79,7 @@ mod tests {
 	#[tokio::test]
 	async fn call_method_returning_unknown_response() {
 		let server = HttpServer::responding_with_not_found();
-		let mut client = RPCClient::new("credentials", server.endpoint()).unwrap();
+		let mut client = RpcClient::new("credentials", server.endpoint()).unwrap();
 
 		match client.call_method::<u64>("getblockcount", &[]).await {
 			Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::NotFound),
@@ -91,7 +91,7 @@ mod tests {
 	async fn call_method_returning_malfomred_response() {
 		let response = serde_json::json!("foo");
 		let server = HttpServer::responding_with_ok(MessageBody::Content(response));
-		let mut client = RPCClient::new("credentials", server.endpoint()).unwrap();
+		let mut client = RpcClient::new("credentials", server.endpoint()).unwrap();
 
 		match client.call_method::<u64>("getblockcount", &[]).await {
 			Err(e) => {
@@ -108,7 +108,7 @@ mod tests {
 			"error": { "code": -8, "message": "invalid parameter" },
 		});
 		let server = HttpServer::responding_with_ok(MessageBody::Content(response));
-		let mut client = RPCClient::new("credentials", server.endpoint()).unwrap();
+		let mut client = RpcClient::new("credentials", server.endpoint()).unwrap();
 
 		let invalid_block_hash = serde_json::json!("foo");
 		match client.call_method::<u64>("getblock", &[invalid_block_hash]).await {
@@ -124,7 +124,7 @@ mod tests {
 	async fn call_method_returning_missing_result() {
 		let response = serde_json::json!({ "result": null });
 		let server = HttpServer::responding_with_ok(MessageBody::Content(response));
-		let mut client = RPCClient::new("credentials", server.endpoint()).unwrap();
+		let mut client = RpcClient::new("credentials", server.endpoint()).unwrap();
 
 		match client.call_method::<u64>("getblockcount", &[]).await {
 			Err(e) => {
@@ -139,7 +139,7 @@ mod tests {
 	async fn call_method_returning_valid_result() {
 		let response = serde_json::json!({ "result": 654470 });
 		let server = HttpServer::responding_with_ok(MessageBody::Content(response));
-		let mut client = RPCClient::new("credentials", server.endpoint()).unwrap();
+		let mut client = RpcClient::new("credentials", server.endpoint()).unwrap();
 
 		match client.call_method::<u64>("getblockcount", &[]).await {
 			Err(e) => panic!("Unexpected error: {:?}", e),