Skip to content

Replace input buffer with scratch buffer #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2019
Merged

Replace input buffer with scratch buffer #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3098f50
[examples] fix erc20 tests
ascjones Jun 24, 2019
6ed0e22
[core] ditch input buffer, read from scratch instead
ascjones Jun 24, 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
12 changes: 1 addition & 11 deletions core/src/env/srml/srml_only/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,7 @@ where
T: EnvTypes,
{
fn input() -> Vec<u8> {
let size = unsafe { sys::ext_input_size() };
if size == 0 {
Vec::new()
} else {
let mut buffer = Vec::new();
buffer.resize(size as usize, 0);
unsafe {
sys::ext_input_copy(buffer.as_mut_ptr() as u32, 0, size);
}
buffer
}
read_scratch_buffer()
Copy link
Collaborator

@Robbepop Robbepop Jun 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the simplicity of this change. 👍

}

impl_getters_for_srml_env!(
Expand Down
6 changes: 0 additions & 6 deletions core/src/env/srml/srml_only/sys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ extern "C" {
/// Copies the contents of the scratch buffer to `dest_ptr`.
pub fn ext_scratch_copy(dest_ptr: u32, offset: u32, len: u32);

/// Returns the length of the input buffer.
pub fn ext_input_size() -> u32;

/// Copies the contents of the input buffer to `dest_ptr`.
pub fn ext_input_copy(dest_ptr: u32, offset: u32, len: u32);

/// Immediately returns contract execution to the caller
/// with the provided data at `data_ptr`.
pub fn ext_return(data_ptr: u32, data_len: u32) -> !;
Expand Down
2 changes: 1 addition & 1 deletion examples/lang/erc20/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ contract! {
mod tests {
use super::*;
use ink_core::env;
type Types = ink_types_node_runtime::NodeRuntimeTypes;
type Types = ink_core::env::DefaultSrmlTypes;

#[test]
fn deployment_works() {
Expand Down