pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 04:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove BlockNumber <-> u64 conversions from light-client related code (#2666)

Browse Source 
* Remove As usage from CHT

* Remove As usage from CHT (continue)

* Restrict BN <-> int conversions in CT

* more BN <-> u64 conversions removed

* upd spec_version

* Apply suggestions from code review

Co-Authored-By: Gavin Wood <github@gavwood.com>

* Apply suggestions from code review

Co-Authored-By: Gavin Wood <github@gavwood.com>

* more grumbles

* fix last grumbles + compilation

* too long lines

* too long lines
This commit is contained in:
Svyatoslav Nikolsky
2019-05-28 16:07:16 +03:00
committed by Gavin Wood
parent 25b88f1a1f
commit 549d9e1da1
41 changed files with 1087 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/executor/src/sandbox.rs
+3 -1
View File
@@ -569,9 +569,11 @@ mod tests {
use crate::allocator;
use crate::sandbox::trap;
use crate::wasm_executor::WasmExecutor;
use state_machine::TestExternalities;
use state_machine::TestExternalities as CoreTestExternalities;
use wabt;
type TestExternalities<H> = CoreTestExternalities<H, u64>;
#[test]
fn sandbox_should_work() {
let mut ext = TestExternalities::<Blake2Hasher>::default();
substrate/core/executor/src/wasm_executor.rs
+6 -3
View File
@@ -414,7 +414,7 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
.map_err(|_| UserError("Invalid attempt to write written_out in ext_child_storage_root"))?;
Ok(offset)
},
ext_storage_changes_root(parent_hash_data: *const u8, parent_hash_len: u32, parent_number: u64, result: *mut u8) -> u32 => {
ext_storage_changes_root(parent_hash_data: *const u8, parent_hash_len: u32, result: *mut u8) -> u32 => {
let mut parent_hash = H256::default();
if parent_hash_len != parent_hash.as_ref().len() as u32 {
return Err(UserError("Invalid parent_hash_len in ext_storage_changes_root").into());
@@ -422,7 +422,8 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
let raw_parent_hash = this.memory.get(parent_hash_data, parent_hash_len as usize)
.map_err(|_| UserError("Invalid attempt to get parent_hash in ext_storage_changes_root"))?;
parent_hash.as_mut().copy_from_slice(&raw_parent_hash[..]);
let r = this.ext.storage_changes_root(parent_hash, parent_number);
let r = this.ext.storage_changes_root(parent_hash)
.map_err(|_| UserError("Invaid parent_hash passed to ext_storage_changes_root"))?;
if let Some(r) = r {
this.memory.set(result, &r[..]).map_err(|_| UserError("Invalid attempt to set memory in ext_storage_changes_root"))?;
Ok(1)
@@ -896,10 +897,12 @@ mod tests {
use parity_codec::Encode;
use state_machine::TestExternalities;
use state_machine::TestExternalities as CoreTestExternalities;
use hex_literal::hex;
use primitives::map;
type TestExternalities<H> = CoreTestExternalities<H, u64>;
#[test]
fn returning_should_work() {
let mut ext = TestExternalities::default();