Apply cargo fmt (#1146)

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
This commit is contained in:
Alexandru Vasile
2023-08-28 16:03:29 +03:00
committed by GitHub
parent b413e5e84e
commit 91a56fd580
18 changed files with 157 additions and 74 deletions
+10 -9
View File
@@ -187,7 +187,7 @@ impl BackgroundTask {
Ok(RpcResponse::Error { id, error }) => {
let Ok(id) = id.parse::<usize>() else {
tracing::warn!(target: LOG_TARGET, "Cannot send error. Id={id} is not a valid number");
return
return;
};
if let Some(sender) = self.requests.remove(&id) {
@@ -216,7 +216,7 @@ impl BackgroundTask {
Ok(RpcResponse::Method { id, result }) => {
let Ok(id) = id.parse::<usize>() else {
tracing::warn!(target: LOG_TARGET, "Cannot send response. Id={id} is not a valid number");
return
return;
};
// Send the response back.
@@ -232,12 +232,13 @@ impl BackgroundTask {
.get()
.trim_start_matches('"')
.trim_end_matches('"')
.parse::<usize>() else {
tracing::warn!(
target: LOG_TARGET,
"Subscription id={result} is not a valid number",
);
return;
.parse::<usize>()
else {
tracing::warn!(
target: LOG_TARGET,
"Subscription id={result} is not a valid number",
);
return;
};
tracing::trace!(target: LOG_TARGET, "Received subscription id={sub_id}");
@@ -256,7 +257,7 @@ impl BackgroundTask {
Ok(RpcResponse::Subscription { method, id, result }) => {
let Ok(id) = id.parse::<usize>() else {
tracing::warn!(target: LOG_TARGET, "Cannot send subscription. Id={id} is not a valid number");
return
return;
};
if let Some(sender) = self.subscriptions.get_mut(&id) {
+20 -7
View File
@@ -114,7 +114,9 @@ impl PlatformRef for SubxtPlatform {
Box::pin(future::poll_fn(|cx| {
// The `connect` is expected to be called before this method and would populate
// the buffers properly. When the buffers are empty, this future is shortly dropped.
let Some((read_buffer, write_buffer)) = stream.buffers.as_mut() else { return Poll::Pending };
let Some((read_buffer, write_buffer)) = stream.buffers.as_mut() else {
return Poll::Pending;
};
// Whether the future returned by `update_stream` should return `Ready` or `Pending`.
let mut update_stream_future_ready = false;
@@ -246,7 +248,7 @@ impl PlatformRef for SubxtPlatform {
stream.buffers.as_mut().map(|(r, _)| r)
else {
assert_eq!(extra_bytes, 0);
return
return;
};
assert!(cursor.start + extra_bytes <= cursor.end);
@@ -254,8 +256,14 @@ impl PlatformRef for SubxtPlatform {
}
fn writable_bytes(&self, stream: &mut Self::Stream) -> usize {
let Some(StreamWriteBuffer::Open { ref mut buffer, must_close: false, ..}) =
stream.buffers.as_mut().map(|(_, w)| w) else { return 0 };
let Some(StreamWriteBuffer::Open {
ref mut buffer,
must_close: false,
..
}) = stream.buffers.as_mut().map(|(_, w)| w)
else {
return 0;
};
buffer.capacity() - buffer.len()
}
@@ -265,15 +273,20 @@ impl PlatformRef for SubxtPlatform {
// Because `writable_bytes` returns 0 if the writing side is closed, and because `data`
// must always have a size inferior or equal to `writable_bytes`, we know for sure that
// the writing side isn't closed.
let Some(StreamWriteBuffer::Open { ref mut buffer, .. } )=
stream.buffers.as_mut().map(|(_, w)| w) else { panic!() };
let Some(StreamWriteBuffer::Open { ref mut buffer, .. }) =
stream.buffers.as_mut().map(|(_, w)| w)
else {
panic!()
};
buffer.reserve(data.len());
buffer.extend(data.iter().copied());
}
fn close_send(&self, stream: &mut Self::Stream) {
// It is not illegal to call this on an already-reset stream.
let Some((_, write_buffer)) = stream.buffers.as_mut() else { return };
let Some((_, write_buffer)) = stream.buffers.as_mut() else {
return;
};
match write_buffer {
StreamWriteBuffer::Open {