Merge pull request #1282 from EOSIO/master-noop-1242

Fixed build issues

contracts/noop/noop.hpp

@@ -4,10 +4,9 @@
  */
 #pragma once
 
-#include <eoslib/eos.hpp>
-#include <eoslib/dispatcher.hpp>
-#include <eoslib/types.hpp>
-#include <eoslib/string.hpp>
+#include <eosiolib/eosio.hpp>
+#include <eosiolib/dispatcher.hpp>
+#include <eosiolib/string.hpp>
 
 using namespace eosio;
 

tests/wasm_tests/wasm_tests.cpp

@@ -581,7 +581,7 @@ BOOST_FIXTURE_TEST_CASE(noop, tester) try {
 
       set_tapos(trx);
       trx.sign(get_private_key(N(noop), "active"), chain_id_type());
-      control->push_transaction(trx);
+      push_transaction(trx);
       produce_block();
 
       BOOST_REQUIRE_EQUAL(true, chain_has_transaction(trx.id()));
@@ -605,7 +605,7 @@ BOOST_FIXTURE_TEST_CASE(noop, tester) try {
 
       set_tapos(trx);
       trx.sign(get_private_key(N(alice), "active"), chain_id_type());
-      control->push_transaction(trx);
+      push_transaction(trx);
       produce_block();
 
       BOOST_REQUIRE_EQUAL(true, chain_has_transaction(trx.id()));