apply.cpp renamed to eosio.system.cpp #2227

contracts/eosio.system/CMakeLists.txt

@@ -2,7 +2,6 @@ file(GLOB ABI_FILES "*.abi")
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET eosio.system
-  SOURCE_FILES apply.cpp
   INCLUDE_FOLDERS ${STANDARD_INCLUDE_FOLDERS}
   LIBRARIES libc++ libc eosiolib eosio.token
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}

contracts/eosio.system/apply.cpp

-#include "eosio.system.hpp"
-#include <eosiolib/dispatcher.hpp>
-
-#include "delegate_bandwidth.cpp"
-#include "producer_pay.cpp"
-#include "voting.cpp"
-
-EOSIO_ABI( eosiosystem::system_contract,
-           // delegate_bandwith.cpp
-           (delegatebw)(undelegatebw)(refund)
-           (regproxy)
-           // voting.cpp
-           (unregproxy)(regproducer)(unregprod)(voteproducer)(onblock)
-           // producer_pay.cpp
-           (claimrewards)
-           // native.hpp
-           //XXX
-           (newaccount)(updateauth)(deleteauth)(linkauth)(unlinkauth)(postrecovery)(passrecovery)(vetorecovery)(onerror)(canceldelay)
-           // defined in eosio.system.hpp
-           (nonce)
-)

contracts/eosio.system/eosio.system.cpp

-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
+#include "eosio.system.hpp"
+#include <eosiolib/dispatcher.hpp>
 
-#include <eosio.system/eosio.system.hpp> 
+#include "delegate_bandwidth.cpp"
+#include "producer_pay.cpp"
+#include "voting.cpp"
 
-using namespace eosiosystem;
-
-extern "C" {
-
-    /// The apply method implements the dispatch of events to this contract
-    void apply( uint64_t receiver, uint64_t code, uint64_t act ) {
-       //print( eosio::name(code), "::", eosio::name(act) );
-       eosiosystem::contract<N(eosio)>::apply( receiver, code, act );
-    }
-}
+EOSIO_ABI( eosiosystem::system_contract,
+           // delegate_bandwith.cpp
+           (delegatebw)(undelegatebw)(refund)
+           (regproxy)
+           // voting.cpp
+           (unregproxy)(regproducer)(unregprod)(voteproducer)(onblock)
+           // producer_pay.cpp
+           (claimrewards)
+           // native.hpp
+           //XXX
+           (newaccount)(updateauth)(deleteauth)(linkauth)(unlinkauth)(postrecovery)(passrecovery)(vetorecovery)(onerror)(canceldelay)
+           // defined in eosio.system.hpp
+           (nonce)
+)