runtime: Fix TypeArray deserialization

AS has changed `byteLength` to actually be
the byte length.

Author: leoyvens

runtime/wasm/src/asc_abi/class.rs

@@ -113,9 +113,7 @@ pub(crate) struct TypedArray<T> {
     pub buffer: AscPtr<ArrayBuffer<T>>,
     /// Byte position in `buffer` of the array start.
     byte_offset: u32,
-    /// Byte position in `buffer` of the array end, which is 1 byte past the
-    /// last byte of the payload. Called `byteLength` in Asc.
-    end_byte: u32,
+    byte_length: u32,
 }
 
 impl<T: AscValue> TypedArray<T> {
@@ -124,15 +122,14 @@ impl<T: AscValue> TypedArray<T> {
         TypedArray {
             buffer: AscPtr::alloc_obj(&buffer, heap),
             byte_offset: 0,
-            end_byte: buffer.byte_length,
+            byte_length: buffer.byte_length,
         }
     }
 
     pub(crate) fn to_vec<H: AscHeap>(&self, heap: &H) -> Vec<T> {
-        self.buffer.read_ptr(heap).get(
-            self.byte_offset,
-            (self.end_byte - self.byte_offset) / size_of::<T>() as u32,
-        )
+        self.buffer
+            .read_ptr(heap)
+            .get(self.byte_offset, self.byte_length / size_of::<T>() as u32)
     }
 }
 

runtime/wasm/src/module/mod.rs

@@ -4,7 +4,7 @@ use std::ops::Deref;
 use wasmi::{
     nan_preserving_float::F64, Error, Externals, FuncInstance, FuncRef, HostError, ImportsBuilder,
     MemoryRef, Module, ModuleImportResolver, ModuleInstance, ModuleRef, NopExternals, RuntimeArgs,
-    RuntimeValue, Signature, Trap, ValueType,
+    RuntimeValue, Signature, Trap,
 };
 
 use graph::components::ethereum::*;
@@ -599,10 +599,7 @@ pub struct EnvModuleResolver;
 impl ModuleImportResolver for EnvModuleResolver {
     fn resolve_func(&self, field_name: &str, signature: &Signature) -> Result<FuncRef, Error> {
         Ok(match field_name {
-            "abort" => FuncInstance::alloc_host(
-                signature.clone(),
-                ABORT_FUNC_INDEX,
-            ),
+            "abort" => FuncInstance::alloc_host(signature.clone(), ABORT_FUNC_INDEX),
             _ => {
                 return Err(Error::Instantiation(format!(
                     "Export '{}' not found",

runtime/wasm/src/module/test.rs

@@ -3,20 +3,16 @@ extern crate ipfs_api;
 extern crate parity_wasm;
 
 use self::graph_mock::FakeStore;
-use ethabi::{LogParam, Token};
+use ethabi::Token;
 use failure::Error;
 use futures::sync::mpsc::{channel, Sender};
 use graph::components::ethereum::*;
 use graph::components::store::*;
-use graph::components::subgraph::*;
 use graph::data::store::scalar;
 use graph::data::subgraph::*;
-use graph::util;
-use graph::web3::types::{Bytes, *};
+use graph::web3::types::*;
 use hex;
-use std::collections::HashMap;
 use std::io::Cursor;
-use std::iter::FromIterator;
 use std::str::FromStr;
 
 use super::*;