Cleaned up a bit

contracts/eosiolib/account.hpp

@@ -72,7 +72,7 @@ struct PACKED(account_balance) {
  *  @param account_balance    stream to write
  *  @ret true if account's balance is found
  */
-bool get(account_balance& b) {
+bool get( account_name currency, account_balance& b) {
 
 //   return account_balance_get(&b, sizeof(account_balance));
 }

contracts/test_api/test_api.cpp

@@ -16,7 +16,7 @@
 #include "test_crypto.cpp"
 #include "test_chain.cpp"
 #include "test_transaction.cpp"
-//#include "test_priviledged.cpp"
+#include "test_privileged.cpp"
 #include "test_checktime.cpp"
 
 extern "C" {
@@ -138,6 +138,9 @@ extern "C" {
       // test checktime
       WASM_TEST_HANDLER(test_checktime, checktime_pass);
       WASM_TEST_HANDLER(test_checktime, checktime_failure);
+
+      //test privileged
+      WASM_TEST_HANDLER(test_privileged, test_is_privileged);
 #if 0
       // test account
       WASM_TEST_HANDLER(test_account, test_balance_acc1);

contracts/test_api/test_api.hpp

@@ -237,3 +237,7 @@ struct test_checktime {
    static void checktime_pass();
    static void checktime_failure();
 };
+
+struct test_privileged {
+   static void test_is_privileged();
+};

libraries/chain/wasm_interface.cpp

@@ -1242,39 +1242,6 @@ class compiler_builtins : public context_aware_api {
       static constexpr uint32_t SHIFT_WIDTH = (sizeof(uint64_t)*8)-1;
 };
 
-#if 0
-class account_api : public context_aware_api {
-   public:
-      using context_aware_api::context_aware_api;
-      PACKED_STRUCT (
-         account_balance {
-            account_name account;
-            asset        balance;
-      })
-
-      bool account_balance_get(array_ptr<const char> balance, uint32_t len) {
-         account_balance* acc_balance = (account_balance*)balance.value();
-         const auto* tbl = context.db.find<contracts::table_id_object, contracts::by_code_scope_table>(boost::make_tuple(code, acc_balance.account, N(account)));
-         share_type result = 0;
-
-         // the balance is implied to be 0 if either the table or row does not exist
-         if (tbl) {
-            const auto *obj = context.db.find<contracts::key_value_object, contracts::by_scope_primary>(boost::make_tuple(tbl->id, asset_symbol.value()));
-            if (obj) {
-               fc::datastream<const char *> ds(obj->value.data(), obj->value.size());
-               fc::raw::unpack(ds, result);
-            }
-         }
-         return true; //asset(result, asset_symbol);
-/*
-         const uint32_t account_balance_size = sizeof(account_balance);
-         auto mem = Runtime::getDefaultMemory(code.instance);
-         FC_ASSERT(len == account_balance_size, "passed in len ${len} is not equal to the size of an account_balance struct == ${real_len}", ("len",len)("real_len",account_balance_size));
-         account_balance& total_balance = memoryRef<account_balance>(mem, balance);
-         */
-      }
-};
-#endif
 class math_api : public context_aware_api {
    public:
       using context_aware_api::context_aware_api;
@@ -1427,10 +1394,10 @@ REGISTER_INTRINSICS( database_api,
 REGISTER_INTRINSICS(crypto_api,
    (assert_recover_key,     void(int, int, int, int, int) )
    (recover_key,            int(int, int, int, int, int)  )
-   (assert_sha256,      void(int, int, int)           )
-   (assert_sha1,        void(int, int, int)           )
-   (assert_sha512,      void(int, int, int)           )
-   (assert_ripemd160,   void(int, int, int)           )
+   (assert_sha256,          void(int, int, int)           )
+   (assert_sha1,            void(int, int, int)           )
+   (assert_sha512,          void(int, int, int)           )
+   (assert_ripemd160,       void(int, int, int)           )
    (sha1,                   void(int, int, int)           )
    (sha256,                 void(int, int, int)           )
    (sha512,                 void(int, int, int)           )
@@ -1447,12 +1414,6 @@ REGISTER_INTRINSICS(system_api,
    (now,          int())
 );
 
-/*
-REGISTER_INTRINSICS(account_api,
-   (account_balance_get,   int(int, int32_t)   )
-);
-*/
-
 REGISTER_INTRINSICS(action_api,
    (read_action,            int(int, int)  )
    (action_size,            int()          )
@@ -1497,8 +1458,6 @@ REGISTER_INTRINSICS(memory_api,
    (sbrk,                   int(int)            )
 );
 
-
-
 #define DB_METHOD_SEQ(SUFFIX) \
    (store,        int32_t(int64_t, int64_t, int64_t, int, int),   "store_"#SUFFIX ) \
    (update,       int32_t(int64_t, int64_t, int64_t, int, int),   "update_"#SUFFIX ) \

tests/api_tests/api_tests.cpp

@@ -202,51 +202,6 @@ uint32_t last_fnc_err = 0;
 	}
 
 
-#if 0
-// TODO missing intrinsic account_balance_get
-/*************************************************************************************
- * account_tests test case
- *************************************************************************************/
-BOOST_FIXTURE_TEST_CASE(account_tests, tester) { try {
-	produce_blocks(2);
-	create_account( N(testapi), asset::from_string("1000.0000 EOS") );
-	create_account( N(acc1), asset::from_string("0.0000 EOS") );
-	create_account( N(acc2), asset::from_string("0.0000 EOS") );
-	produce_blocks(1000);
-	transfer( N(inita), N(testapi), "100.0000 EOS", "memo" );
-	//transfer( N(inita), N(acc1), "1000.0000 EOS", "test");
-#if 0
-	eosio::chain::signed_transaction trx;
-	trx.write_scope = { N(acc1), N(inita) };
-
-	trx.actions.emplace_back(vector<permission_level>{{N(inita), config::active_name}}, 
-									 contracts::transfer{N(inita), N(acc1), 1000, "memo"});
-
-
-	trx.expiration = control->head_block_time() + fc::seconds(100);
-	trx.set_reference_block(control->head_block_id());
-
-	trx.sign(get_private_key(N(inita), "active"), chain_id_type());
-	push_transaction(trx);
-#endif
-	produce_blocks(1000);
-	set_code( N(testapi), test_api_wast );
-	produce_blocks(1);
-
-   transfer( N(inita), N(acc1), "24.0000 EOS", "memo" );
-	produce_blocks(1000);
-   BOOST_CHECK_EQUAL(get_balance(N(acc1)), 240000);
-
-   transfer( N(inita), N(acc1), "1.0000 EOS", "memo" );
-	produce_blocks(1000);
-   BOOST_CHECK_EQUAL(get_balance(N(acc1)), 250000);
-
-   transfer( N(inita), N(acc1), "5000.0000 EOS", "memo" );
-   BOOST_CHECK_EQUAL(get_balance(N(acc1)), 50250000);
-} FC_LOG_AND_RETHROW() }
-#endif
-
-
 /*************************************************************************************
  * action_tests test case
  *************************************************************************************/
@@ -1015,5 +970,19 @@ BOOST_FIXTURE_TEST_CASE(types_tests, tester) { try {
 	CALL_TEST_FUNCTION( *this, "test_types", "name_class", {});
 } FC_LOG_AND_RETHROW() }
 
+/*************************************************************************************
+ * privileged_tests test case
+ *************************************************************************************/
+BOOST_FIXTURE_TEST_CASE(privileged_tests, tester) { try {
+	produce_blocks(2);
+	create_account( N(testapi) ); 
+	create_account( N(acc1) ); 
+	produce_blocks(100);
+	set_code( N(testapi), test_api_wast );
+	produce_blocks(1);
+ 
+	CALL_TEST_FUNCTION( *this, "test_privileged", "test_is_privileged", {});
+
+} FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_SUITE_END()