Merge pull request #1478 from larryk85/fix/reintegrate_wasm_tests

Fix/reintegrate wasm tests
EOSIO · Feb 26, 2018 · 2fee26e · 2fee26e
2 parents 356a8c2 + 51cf15c
commit 2fee26e
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 702 deletions.
diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
@@ -23,11 +23,10 @@ void apply_context::exec_one()
             // get code from cache
             auto code = mutable_controller.get_wasm_cache().checkout_scoped(a.code_version, a.code.data(),
                                                                             a.code.size());
-
             // get wasm_interface
             auto &wasm = wasm_interface::get();
             wasm.apply(code, *this);
-         }
+      }
       }
    } FC_CAPTURE_AND_RETHROW((_pending_console_output.str()));
 
@@ -95,7 +94,6 @@ void apply_context::exec_one()
 void apply_context::exec()
 {
    _notified.push_back(act.account);
-
    for( uint32_t i = 0; i < _notified.size(); ++i ) {
       receiver = _notified[i];
       exec_one();

diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -245,7 +245,7 @@ class apply_context {
                if (itr->t_id != tab->id) return -1;
 
                itr_cache.cache_table(*tab);
-               return itr_cache(*itr);
+               return itr_cache.add(*itr);
             }
 
             int next_primary( int iterator, uint64_t& primary ) {

diff --git a/libraries/wasm-jit/Source/WASM/WASMSerialization.cpp b/libraries/wasm-jit/Source/WASM/WASMSerialization.cpp
@@ -558,7 +558,7 @@ namespace WASM
 		Serialization::OutputStream& byteStream;
 		FunctionDef& functionDef;
 	};
-
+   
 	template<typename Injection>
    struct WasmSerializationImpl
    {

diff --git a/scripts/eosio-build_darwin.sh b/scripts/eosio-build_darwin.sh