depend-o-pocalipse (#9450)

Remove unneeded dependencies and dev-dependencies.
Made self_destruct test not dependent on wasm bin size.  
Updated code related to deprecated warning on tracing-subscriber `scope()` 
( See https://github.com/tokio-rs/tracing/issues/1429 )
This commit is contained in:
Squirrel
2021-08-13 15:18:37 +01:00
committed by GitHub
parent 76504e56d7
commit 7e9b8d278e
129 changed files with 487 additions and 726 deletions
@@ -213,14 +213,15 @@ where
) -> Result<Reply<B>, Error> {
use schema::v1::light::response::Response;
match response.response {
Some(Response::RemoteCallResponse(response)) =>
Some(Response::RemoteCallResponse(response)) => {
if let Request::Call { request, .. } = request {
let proof = Decode::decode(&mut response.proof.as_ref())?;
let reply = self.checker.check_execution_proof(request, proof)?;
Ok(Reply::VecU8(reply))
} else {
Err(Error::UnexpectedResponse)
},
}
},
Some(Response::RemoteReadResponse(response)) => match request {
Request::Read { request, .. } => {
let proof = Decode::decode(&mut response.proof.as_ref())?;
@@ -234,7 +235,7 @@ where
},
_ => Err(Error::UnexpectedResponse),
},
Some(Response::RemoteChangesResponse(response)) =>
Some(Response::RemoteChangesResponse(response)) => {
if let Request::Changes { request, .. } = request {
let max_block = Decode::decode(&mut response.max.as_ref())?;
let roots_proof = Decode::decode(&mut response.roots_proof.as_ref())?;
@@ -259,8 +260,9 @@ where
Ok(Reply::VecNumberU32(reply))
} else {
Err(Error::UnexpectedResponse)
},
Some(Response::RemoteHeaderResponse(response)) =>
}
},
Some(Response::RemoteHeaderResponse(response)) => {
if let Request::Header { request, .. } = request {
let header = if response.header.is_empty() {
None
@@ -272,7 +274,8 @@ where
Ok(Reply::Header(reply))
} else {
Err(Error::UnexpectedResponse)
},
}
},
None => Err(Error::UnexpectedResponse),
}
}
@@ -779,8 +782,9 @@ impl<B: Block> Request<B> {
Request::Header { request, sender } => match result {
Err(e) => send(Err(e), sender),
Ok(Reply::Header(x)) => send(Ok(x), sender),
reply =>
log::error!("invalid reply for header request: {:?}, {:?}", reply, request),
reply => {
log::error!("invalid reply for header request: {:?}, {:?}", reply, request)
},
},
Request::Read { request, sender } => match result {
Err(e) => send(Err(e), sender),
@@ -790,8 +794,9 @@ impl<B: Block> Request<B> {
Request::ReadChild { request, sender } => match result {
Err(e) => send(Err(e), sender),
Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
reply =>
log::error!("invalid reply for read child request: {:?}, {:?}", reply, request),
reply => {
log::error!("invalid reply for read child request: {:?}, {:?}", reply, request)
},
},
Request::Call { request, sender } => match result {
Err(e) => send(Err(e), sender),
@@ -801,8 +806,9 @@ impl<B: Block> Request<B> {
Request::Changes { request, sender } => match result {
Err(e) => send(Err(e), sender),
Ok(Reply::VecNumberU32(x)) => send(Ok(x), sender),
reply =>
log::error!("invalid reply for changes request: {:?}, {:?}", reply, request),
reply => {
log::error!("invalid reply for changes request: {:?}, {:?}", reply, request)
},
},
}
}