Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Alternative #3597

Merged
merged 2 commits into from
Sep 11, 2019
Merged

Alternative #3597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a9f455
Update with_std.rs
gavofyork Sep 11, 2019
32506e5
Update with_std.rs
gavofyork Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions core/sr-io/with_std.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ impl StorageApi for () {

fn read_storage(key: &[u8], value_out: &mut [u8], value_offset: usize) -> Option<usize> {
ext::with(|ext| ext.storage(key).map(|value| {
if value_offset < value.len() {
let value = &value[value_offset..];
let written = std::cmp::min(value.len(), value_out.len());
value_out[..written].copy_from_slice(&value[..written]);
}
let value = &value[value_offset.min(value.len())..];
let written = std::cmp::min(value.len(), value_out.len());
value_out[..written].copy_from_slice(&value[..written]);
value.len()
})).expect("read_storage cannot be called outside of an Externalities-provided environment.")
}
Expand Down Expand Up @@ -87,11 +85,9 @@ impl StorageApi for () {
let storage_key = child_storage_key_or_panic(storage_key);
ext.child_storage(storage_key, key)
.map(|value| {
if value_offset < value.len() {
let value = &value[value_offset..];
let written = std::cmp::min(value.len(), value_out.len());
value_out[..written].copy_from_slice(&value[..written]);
}
let value = &value[value_offset.min(value.len())..];
let written = std::cmp::min(value.len(), value_out.len());
value_out[..written].copy_from_slice(&value[..written]);
value.len()
})
})
Expand Down