From 706c7297fa0b8621eddcc0aca614ea583d28fd7a Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 19 Mar 2018 16:47:50 -0400
Subject: [PATCH] Remove error() call in to a contract; this is no longer used

---
 libraries/chain/include/eosio/chain/wasm_interface.hpp       | 1 -
 .../include/eosio/chain/webassembly/runtime_interface.hpp    | 1 -
 libraries/chain/wasm_interface.cpp                           | 4 ----
 libraries/chain/webassembly/binaryen.cpp                     | 5 -----
 libraries/chain/webassembly/wavm.cpp                         | 5 -----
 5 files changed, 16 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index bd2660721..5b68bc89a 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -47,7 +47,6 @@ namespace eosio { namespace chain {
 
          //Calls apply or error on a given code
          void apply(const digest_type& code_id, const shared_vector<char>& code, apply_context& context);
-         void error(const digest_type& code_id, const shared_vector<char>& code, apply_context& context);
 
       private:
          wasm_interface();
diff --git a/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp b/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
index 29fa8722b..8158c7278 100644
--- a/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
@@ -9,7 +9,6 @@ class apply_context;
 class wasm_instantiated_module_interface {
    public:
       virtual void apply(apply_context& context) = 0;
-      virtual void error(apply_context& context) = 0;
 
       virtual ~wasm_instantiated_module_interface();
 };
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index ca2b2bc63..1508913ea 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -50,10 +50,6 @@ namespace eosio { namespace chain {
       my->get_instantiated_module(code_id, code)->apply(context);
    }
 
-   void wasm_interface::error( const digest_type& code_id, const shared_vector<char>& code, apply_context& context ) {
-      my->get_instantiated_module(code_id, code)->error(context);
-   }
-
    wasm_instantiated_module_interface::~wasm_instantiated_module_interface() {}
    wasm_runtime_interface::~wasm_runtime_interface() {}
 
diff --git a/libraries/chain/webassembly/binaryen.cpp b/libraries/chain/webassembly/binaryen.cpp
index 578631a27..921a3fb19 100644
--- a/libraries/chain/webassembly/binaryen.cpp
+++ b/libraries/chain/webassembly/binaryen.cpp
@@ -27,11 +27,6 @@ class binaryen_instantiated_module : public wasm_instantiated_module_interface {
          call("apply", args, context);
       }
 
-      void error(apply_context& context) override {
-         LiteralList args = {/* */};
-         call("error", args, context);
-      }
-
    private:
       linear_memory_type&        _shared_linear_memory;      
       std::vector<uint8_t>       _initial_memory;
diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
index e752d425e..cb001f308 100644
--- a/libraries/chain/webassembly/wavm.cpp
+++ b/libraries/chain/webassembly/wavm.cpp
@@ -33,11 +33,6 @@ class wavm_instantiated_module : public wasm_instantiated_module_interface {
          call("apply", args, context);
       }
 
-      void error(apply_context& context) override {
-         vector<Value> args = {/* */};
-         call("error", args, context);
-      }
-
       ~wavm_instantiated_module() {
          delete _instance;
          delete _module;
-- 
GitLab