clean up some cruft in wasm contract generation and fix abi.hpp generation for asserter

CMakeModules/wasm.cmake

@@ -149,6 +149,7 @@ macro(add_wast_target target INCLUDE_FOLDERS DESTINATION_FOLDER)
       VERBATIM
     )
     set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${target}.abi.hpp)
+    set(extra_target_dependency   ${DESTINATION_FOLDER}/${target}.abi.hpp)
   else()
   endif()
   
@@ -160,17 +161,3 @@ macro(add_wast_target target INCLUDE_FOLDERS DESTINATION_FOLDER)
   set(extra_target_dependency)
 
 endmacro(add_wast_target)
-
-function(add_wast_abi_target target INCLUDE_FOLDERS SOURCE_FOLDER DESTINATION_FOLDER)
-  add_custom_command(OUTPUT ${DESTINATION_FOLDER}/${target}.abi.hpp
-    DEPENDS ${SOURCE_FOLDER}/${target}.abi
-    COMMAND echo "const char* ${target}_abi = R\"=====("  > ${DESTINATION_FOLDER}/${target}.abi.hpp
-    COMMAND cat ${SOURCE_FOLDER}/${target}.abi >> ${DESTINATION_FOLDER}/${target}.abi.hpp
-    COMMAND echo ")=====\";"  >> ${DESTINATION_FOLDER}/${target}.abi.hpp
-    COMMENT "Generating ${target}.abi.hpp"
-    VERBATIM
-  )
-  set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${target}.abi.hpp)
-  set(extra_target_dependency   ${DESTINATION_FOLDER}/${target}.abi.hpp)
-  add_wast_target(${target} "${INCLUDE_FOLDERS}" ${CMAKE_CURRENT_BINARY_DIR})
-endfunction(add_wast_abi_target)

contracts/asserter/CMakeLists.txt

 file(GLOB ABI_FILES "*.abi")
-add_wast_target(asserter "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
+add_wast_target(asserter "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})

tests/api_tests/table_abi_test/CMakeLists.txt

 file(GLOB SOURCE_FILES "*.cpp")
-add_wast_abi_target(table_abi_test "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
+add_wast_target(table_abi_test "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})

tests/wasm_tests/wasm_tests.cpp

@@ -2,6 +2,7 @@
 #include <eosio/testing/tester.hpp>
 #include <eosio/chain/contracts/abi_serializer.hpp>
 #include <asserter/asserter.wast.hpp>
+#include <asserter/asserter.abi.hpp>
 
 #include <fc/variant_object.hpp>
 
@@ -38,41 +39,6 @@ struct provereset {
 
 FC_REFLECT_EMPTY(provereset);
 
-const char* const asserter_abi = R"EOF(
-{
-   "types": [],
-   "structs": [
-      {
-         "name": "assertdef",
-         "base": "",
-         "fields": [
-            {
-               "name": "condition",
-               "type": "int8"
-            },{
-               "name": "message",
-               "type": "string"
-            }
-         ]
-      }, {
-         "name": "nothing",
-         "base": "",
-         "fields": []
-      }
-   ],
-   "actions": [
-      {
-         "name": "procassert",
-         "type": "assertdef"
-      }, {
-         "name": "provereset",
-         "type": "nothing"
-      }
-   ],
-   "tables": []
-}
-)EOF";
-
 BOOST_AUTO_TEST_SUITE(wasm_tests)
 
 /**