Move client only primitives to another dir (#9220)

* Move alloc primitive (not used in /pallets)

* Move to alternative location as not shared

* moved crates to different dir

* ren sp_chain_spec to sc_chain_spec_primatives

* merged sc-chain-spec and moved allocation up one.

* no no_std

* nudge

* Bump CI
This commit is contained in:
Squirrel
2021-06-30 11:06:39 +01:00
committed by GitHub
parent b707a48737
commit d7804c0929
28 changed files with 76 additions and 134 deletions
@@ -24,7 +24,7 @@ use crate::util;
use std::{cell::RefCell, rc::Rc};
use log::trace;
use codec::{Encode, Decode};
use sp_allocator::FreeingBumpHeapAllocator;
use sc_allocator::FreeingBumpHeapAllocator;
use sc_executor_common::error::Result;
use sc_executor_common::sandbox::{self, SandboxCapabilities, SupervisorFuncIndex};
use sp_core::sandbox as sandbox_primitives;
@@ -340,7 +340,7 @@ impl InstanceWrapper {
let range = util::checked_range(address.into(), data.len(), memory.len())
.ok_or_else(|| Error::Other("memory write is out of bounds".into()))?;
&mut memory[range].copy_from_slice(data);
memory[range].copy_from_slice(data);
Ok(())
}
}
@@ -351,7 +351,7 @@ impl InstanceWrapper {
/// to get more details.
pub fn allocate(
&self,
allocator: &mut sp_allocator::FreeingBumpHeapAllocator,
allocator: &mut sc_allocator::FreeingBumpHeapAllocator,
size: WordSize,
) -> Result<Pointer<u8>> {
unsafe {
@@ -368,7 +368,7 @@ impl InstanceWrapper {
/// Returns `Err` in case the given memory region cannot be deallocated.
pub fn deallocate(
&self,
allocator: &mut sp_allocator::FreeingBumpHeapAllocator,
allocator: &mut sc_allocator::FreeingBumpHeapAllocator,
ptr: Pointer<u8>,
) -> Result<()> {
unsafe {
@@ -31,7 +31,7 @@ use sc_executor_common::{
runtime_blob::{DataSegmentsSnapshot, ExposedMutableGlobalsSet, GlobalsSnapshot, RuntimeBlob},
wasm_runtime::{WasmModule, WasmInstance, InvokeMethod},
};
use sp_allocator::FreeingBumpHeapAllocator;
use sc_allocator::FreeingBumpHeapAllocator;
use sp_runtime_interface::unpack_ptr_and_len;
use sp_wasm_interface::{Function, Pointer, WordSize, Value};
use wasmtime::{Engine, Store};