pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-02 04:47:24 +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/state-machine/src/lib.rs
+22 -21
View File
@@ -219,7 +219,7 @@ pub trait Externalities<H: Hasher> {
fn child_storage_root(&mut self, storage_key: ChildStorageKey<H>) -> Vec<u8>;
/// Get the change trie root of the current storage overlay at a block with given parent.
fn storage_changes_root(&mut self, parent: H::Out, parent_num: u64) -> Option<H::Out> where H::Out: Ord;
fn storage_changes_root(&mut self, parent: H::Out) -> Result<Option<H::Out>, ()> where H::Out: Ord;
/// Submit extrinsic.
///
@@ -338,7 +338,7 @@ pub fn always_wasm<E, R: Decode>() -> ExecutionManager<DefaultHandler<R, E>> {
}
/// Creates new substrate state machine.
pub fn new<'a, H, B, T, O, Exec>(
pub fn new<'a, H, N, B, T, O, Exec>(
backend: &'a B,
changes_trie_storage: Option<&'a T>,
offchain_ext: Option<&'a mut O>,
@@ -346,7 +346,7 @@ pub fn new<'a, H, B, T, O, Exec>(
exec: &'a Exec,
method: &'a str,
call_data: &'a [u8],
) -> StateMachine<'a, H, B, T, O, Exec> {
) -> StateMachine<'a, H, N, B, T, O, Exec> {
StateMachine {
backend,
changes_trie_storage,
@@ -360,7 +360,7 @@ pub fn new<'a, H, B, T, O, Exec>(
}
/// The substrate state machine.
pub struct StateMachine<'a, H, B, T, O, Exec> {
pub struct StateMachine<'a, H, N, B, T, O, Exec> {
backend: &'a B,
changes_trie_storage: Option<&'a T>,
offchain_ext: Option<&'a mut O>,
@@ -368,16 +368,17 @@ pub struct StateMachine<'a, H, B, T, O, Exec> {
exec: &'a Exec,
method: &'a str,
call_data: &'a [u8],
_hasher: PhantomData<H>,
_hasher: PhantomData<(H, N)>,
}
impl<'a, H, B, T, O, Exec> StateMachine<'a, H, B, T, O, Exec> where
impl<'a, H, N, B, T, O, Exec> StateMachine<'a, H, N, B, T, O, Exec> where
H: Hasher,
Exec: CodeExecutor<H>,
B: Backend<H>,
T: ChangesTrieStorage<H>,
T: ChangesTrieStorage<H, N>,
O: OffchainExt,
H::Out: Ord,
H::Out: Ord + 'static,
N: crate::changes_trie::BlockNumber,
{
/// Execute a call using the given state backend, overlayed changes, and call executor.
/// Produces a state-backend-specific "transaction" which can be used to apply the changes
@@ -568,7 +569,7 @@ where
B: Backend<H>,
H: Hasher,
Exec: CodeExecutor<H>,
H::Out: Ord,
H::Out: Ord + 'static,
{
let trie_backend = backend.try_into_trie_backend()
.ok_or_else(|| Box::new(ExecutionError::UnableToGenerateProof) as Box<Error>)?;
@@ -595,12 +596,12 @@ where
S: trie_backend_essence::TrieBackendStorage<H>,
H: Hasher,
Exec: CodeExecutor<H>,
H::Out: Ord,
H::Out: Ord + 'static,
{
let proving_backend = proving_backend::ProvingBackend::new(trie_backend);
let mut sm = StateMachine {
backend: &proving_backend,
changes_trie_storage: None as Option<&changes_trie::InMemoryStorage<H>>,
changes_trie_storage: None as Option<&changes_trie::InMemoryStorage<H, u64>>,
offchain_ext: NeverOffchainExt::new(),
overlay,
exec,
@@ -629,7 +630,7 @@ pub fn execution_proof_check<H, Exec>(
where
H: Hasher,
Exec: CodeExecutor<H>,
H::Out: Ord,
H::Out: Ord + 'static,
{
let trie_backend = create_proof_check_backend::<H>(root.into(), proof)?;
execution_proof_check_on_trie_backend(&trie_backend, overlay, exec, method, call_data)
@@ -646,11 +647,11 @@ pub fn execution_proof_check_on_trie_backend<H, Exec>(
where
H: Hasher,
Exec: CodeExecutor<H>,
H::Out: Ord,
H::Out: Ord + 'static,
{
let mut sm = StateMachine {
backend: trie_backend,
changes_trie_storage: None as Option<&changes_trie::InMemoryStorage<H>>,
changes_trie_storage: None as Option<&changes_trie::InMemoryStorage<H, u64>>,
offchain_ext: NeverOffchainExt::new(),
overlay,
exec,
@@ -892,7 +893,7 @@ mod tests {
fn execute_works() {
assert_eq!(new(
&trie_backend::tests::test_trie(),
Some(&InMemoryChangesTrieStorage::new()),
Some(&InMemoryChangesTrieStorage::<Blake2Hasher, u64>::new()),
NeverOffchainExt::new(),
&mut Default::default(),
&DummyCodeExecutor {
@@ -913,7 +914,7 @@ mod tests {
fn execute_works_with_native_else_wasm() {
assert_eq!(new(
&trie_backend::tests::test_trie(),
Some(&InMemoryChangesTrieStorage::new()),
Some(&InMemoryChangesTrieStorage::<Blake2Hasher, u64>::new()),
NeverOffchainExt::new(),
&mut Default::default(),
&DummyCodeExecutor {
@@ -934,7 +935,7 @@ mod tests {
let mut consensus_failed = false;
assert!(new(
&trie_backend::tests::test_trie(),
Some(&InMemoryChangesTrieStorage::new()),
Some(&InMemoryChangesTrieStorage::<Blake2Hasher, u64>::new()),
NeverOffchainExt::new(),
&mut Default::default(),
&DummyCodeExecutor {
@@ -1003,7 +1004,7 @@ mod tests {
};
{
let changes_trie_storage = InMemoryChangesTrieStorage::new();
let changes_trie_storage = InMemoryChangesTrieStorage::<Blake2Hasher, u64>::new();
let mut ext = Ext::new(&mut overlay, &backend, Some(&changes_trie_storage), NeverOffchainExt::new());
ext.clear_prefix(b"ab");
}
@@ -1026,7 +1027,7 @@ mod tests {
#[test]
fn set_child_storage_works() {
let backend = InMemory::<Blake2Hasher>::default().try_into_trie_backend().unwrap();
let changes_trie_storage = InMemoryChangesTrieStorage::new();
let changes_trie_storage = InMemoryChangesTrieStorage::<Blake2Hasher, u64>::new();
let mut overlay = OverlayedChanges::default();
let mut ext = Ext::new(
&mut overlay,
@@ -1106,7 +1107,7 @@ mod tests {
fn cannot_change_changes_trie_config() {
assert!(new(
&trie_backend::tests::test_trie(),
Some(&InMemoryChangesTrieStorage::new()),
Some(&InMemoryChangesTrieStorage::<Blake2Hasher, u64>::new()),
NeverOffchainExt::new(),
&mut Default::default(),
&DummyCodeExecutor {
@@ -1126,7 +1127,7 @@ mod tests {
fn cannot_change_changes_trie_config_with_native_else_wasm() {
assert!(new(
&trie_backend::tests::test_trie(),
Some(&InMemoryChangesTrieStorage::new()),
Some(&InMemoryChangesTrieStorage::<Blake2Hasher, u64>::new()),
NeverOffchainExt::new(),
&mut Default::default(),
&DummyCodeExecutor {