fix contract code response encoding; add test
This commit is contained in:
parent
3e8ee9d423
commit
64ebcd0f24
@ -863,7 +863,7 @@ impl LightProtocol {
|
|||||||
stream.append(&req_id).append(&cur_buffer);
|
stream.append(&req_id).append(&cur_buffer);
|
||||||
|
|
||||||
for code in response {
|
for code in response {
|
||||||
stream.append_raw(&code, 1);
|
stream.append(&code);
|
||||||
}
|
}
|
||||||
|
|
||||||
stream.out()
|
stream.out()
|
||||||
|
@ -31,7 +31,7 @@ use provider::Provider;
|
|||||||
use request::{self, Request, Headers};
|
use request::{self, Request, Headers};
|
||||||
|
|
||||||
use rlp::*;
|
use rlp::*;
|
||||||
use util::{Bytes, H256};
|
use util::{Bytes, H256, U256};
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
@ -126,7 +126,7 @@ impl Provider for TestProvider {
|
|||||||
req.requests.into_iter()
|
req.requests.into_iter()
|
||||||
.map(|req| {
|
.map(|req| {
|
||||||
match req.key2 {
|
match req.key2 {
|
||||||
Some(key2) => ::util::sha3::SHA3_NULL_RLP.to_owned(),
|
Some(_) => ::util::sha3::SHA3_NULL_RLP.to_vec(),
|
||||||
None => {
|
None => {
|
||||||
// sort of a leaf node
|
// sort of a leaf node
|
||||||
let mut stream = RlpStream::new_list(2);
|
let mut stream = RlpStream::new_list(2);
|
||||||
@ -139,7 +139,11 @@ impl Provider for TestProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn contract_code(&self, req: request::ContractCodes) -> Vec<Bytes> {
|
fn contract_code(&self, req: request::ContractCodes) -> Vec<Bytes> {
|
||||||
req.code_requests.into_iter().map(|_| Vec::new()).collect()
|
req.code_requests.into_iter()
|
||||||
|
.map(|req| {
|
||||||
|
req.account_key.iter().chain(req.account_key.iter()).cloned().collect()
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn header_proofs(&self, req: request::HeaderProofs) -> Vec<Bytes> {
|
fn header_proofs(&self, req: request::HeaderProofs) -> Vec<Bytes> {
|
||||||
@ -406,48 +410,99 @@ fn get_block_receipts() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn get_block_bodies() {
|
fn get_state_proofs() {
|
||||||
let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
|
let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
|
||||||
let capabilities = capabilities();
|
let capabilities = capabilities();
|
||||||
|
|
||||||
let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
|
let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
|
||||||
|
|
||||||
let cur_status = status(provider.client.chain_info());
|
|
||||||
let my_status = write_handshake(&cur_status, &capabilities, &flow_params);
|
|
||||||
|
|
||||||
provider.client.add_blocks(100, EachBlockWith::Nothing);
|
|
||||||
|
|
||||||
let cur_status = status(provider.client.chain_info());
|
let cur_status = status(provider.client.chain_info());
|
||||||
|
|
||||||
{
|
{
|
||||||
let packet_body = write_handshake(&cur_status, &capabilities, &flow_params);
|
let packet_body = write_handshake(&cur_status, &capabilities, &flow_params);
|
||||||
proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
|
proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
|
||||||
proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
|
proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
|
||||||
}
|
}
|
||||||
|
|
||||||
let request = request::Bodies {
|
let req_id = 112;
|
||||||
block_hashes: (0..10).map(|i| provider.client.block_hash(BlockID::Number(i)).unwrap()).collect(),
|
let key1 = U256::from(11223344).into();
|
||||||
};
|
let key2 = U256::from(99988887).into();
|
||||||
|
|
||||||
let req_id = 111;
|
let request = Request::StateProofs (request::StateProofs {
|
||||||
|
requests: vec![
|
||||||
|
request::StateProof { block: H256::default(), key1: key1, key2: None, from_level: 0 },
|
||||||
|
request::StateProof { block: H256::default(), key1: key1, key2: Some(key2), from_level: 0},
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
let request_body = encode_request(&Request::Bodies(request.clone()), req_id);
|
let request_body = encode_request(&request, req_id);
|
||||||
let response = {
|
let response = {
|
||||||
let bodies: Vec<_> = (0..10).map(|i| provider.client.block_body(BlockID::Number(i + 1)).unwrap()).collect();
|
let proofs = vec![
|
||||||
assert_eq!(bodies.len(), 10);
|
{ let mut stream = RlpStream::new_list(2); stream.append(&key1).append_empty_data(); stream.out() },
|
||||||
|
::util::sha3::SHA3_NULL_RLP.to_vec(),
|
||||||
|
];
|
||||||
|
|
||||||
let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Bodies, 10);
|
let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::StateProofs, 2);
|
||||||
|
|
||||||
let mut response_stream = RlpStream::new_list(12);
|
let mut response_stream = RlpStream::new_list(4);
|
||||||
|
|
||||||
response_stream.append(&req_id).append(&new_buf);
|
response_stream.append(&req_id).append(&new_buf);
|
||||||
for body in bodies {
|
for proof in proofs {
|
||||||
response_stream.append_raw(&body, 1);
|
response_stream.append_raw(&proof, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
response_stream.out()
|
response_stream.out()
|
||||||
};
|
};
|
||||||
|
|
||||||
let expected = Expect::Respond(packet::BLOCK_BODIES, response);
|
let expected = Expect::Respond(packet::PROOFS, response);
|
||||||
proto.handle_packet(&expected, &1, packet::GET_BLOCK_BODIES, &request_body);
|
proto.handle_packet(&expected, &1, packet::GET_PROOFS, &request_body);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn get_contract_code() {
|
||||||
|
let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
|
||||||
|
let capabilities = capabilities();
|
||||||
|
|
||||||
|
let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
|
||||||
|
|
||||||
|
let cur_status = status(provider.client.chain_info());
|
||||||
|
|
||||||
|
{
|
||||||
|
let packet_body = write_handshake(&cur_status, &capabilities, &flow_params);
|
||||||
|
proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
|
||||||
|
proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
|
||||||
|
}
|
||||||
|
|
||||||
|
let req_id = 112;
|
||||||
|
let key1 = U256::from(11223344).into();
|
||||||
|
let key2 = U256::from(99988887).into();
|
||||||
|
|
||||||
|
let request = Request::Codes (request::ContractCodes {
|
||||||
|
code_requests: vec![
|
||||||
|
request::ContractCode { block_hash: H256::default(), account_key: key1 },
|
||||||
|
request::ContractCode { block_hash: H256::default(), account_key: key2 },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
let request_body = encode_request(&request, req_id);
|
||||||
|
let response = {
|
||||||
|
let codes: Vec<Vec<_>> = vec![
|
||||||
|
key1.iter().chain(key1.iter()).cloned().collect(),
|
||||||
|
key2.iter().chain(key2.iter()).cloned().collect(),
|
||||||
|
];
|
||||||
|
|
||||||
|
let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Codes, 2);
|
||||||
|
|
||||||
|
let mut response_stream = RlpStream::new_list(4);
|
||||||
|
|
||||||
|
response_stream.append(&req_id).append(&new_buf);
|
||||||
|
for code in codes {
|
||||||
|
response_stream.append(&code);
|
||||||
|
}
|
||||||
|
|
||||||
|
response_stream.out()
|
||||||
|
};
|
||||||
|
|
||||||
|
let expected = Expect::Respond(packet::CONTRACT_CODES, response);
|
||||||
|
proto.handle_packet(&expected, &1, packet::GET_CONTRACT_CODES, &request_body);
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user