making identity_tests work after merges

libraries/testing/include/eosio/testing/tester.hpp

@@ -2,6 +2,7 @@
 #include <eosio/chain/chain_controller.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <iostream>
 
 namespace eosio { namespace testing {
 
@@ -14,6 +15,8 @@ namespace eosio { namespace testing {
     */
    class tester {
       public:
+         typedef string ActionResult;
+
          tester();
 
          void              close();
@@ -24,7 +27,7 @@ namespace eosio { namespace testing {
 
          transaction_trace push_transaction( packed_transaction& trx );
          transaction_trace push_transaction( signed_transaction& trx );
-         string            push_action(action&& cert_act, uint64_t authorizer);
+         ActionResult      push_action(action&& cert_act, uint64_t authorizer);
          void              set_tapos( signed_transaction& trx ) const;
 
          void              create_accounts( vector<account_name> names, asset init_bal, bool multisig = false ) {
@@ -64,6 +67,18 @@ namespace eosio { namespace testing {
                                                              const symbol&       asset_symbol,
                                                              const account_name& account ) const;
 
+        static vector<uint8_t> to_uint8_vector(const string& s);
+
+        static vector<uint8_t> to_uint8_vector(uint64_t x);
+
+        static uint64_t to_uint64(fc::variant x);
+
+        static string to_string(fc::variant x);
+
+        static ActionResult success() { return string(); }
+
+        static ActionResult error(const string& msg) { return msg; }
+
       private:
          fc::temp_directory                            tempdir;
          chain_controller::controller_config           cfg;
@@ -87,4 +102,5 @@ namespace eosio { namespace testing {
       string expected;
    };
 
+
 } } /// eosio::testing

libraries/testing/tester.cpp

@@ -111,7 +111,7 @@ namespace eosio { namespace testing {
       return push_transaction( ptrx );
    }
 
-   string tester::push_action(action&& cert_act, uint64_t authorizer) {
+   tester::ActionResult tester::push_action(action&& cert_act, uint64_t authorizer) {
       signed_transaction trx;
       if (authorizer) {
          cert_act.authorization = vector<permission_level>{{authorizer, config::active_name}};
@@ -302,5 +302,31 @@ namespace eosio { namespace testing {
       return asset(result, asset_symbol);
    }
 
+   vector<uint8_t> tester::to_uint8_vector(const string& s) {
+      vector<uint8_t> v(s.size());
+      copy(s.begin(), s.end(), v.begin());
+      return v;
+   };
+
+   vector<uint8_t> tester::to_uint8_vector(uint64_t x) {
+      vector<uint8_t> v(sizeof(x));
+      *reinterpret_cast<uint64_t*>(v.data()) = x;
+      return v;
+   };
+
+   uint64_t tester::to_uint64(fc::variant x) {
+      vector<uint8_t> blob;
+      fc::from_variant<uint8_t>(x, blob);
+      FC_ASSERT(8 == blob.size());
+      return *reinterpret_cast<uint64_t*>(blob.data());
+   }
+
+   string tester::to_string(fc::variant x) {
+      vector<uint8_t> v;
+      fc::from_variant<uint8_t>(x, v);
+      string s(v.size(), 0);
+      copy(v.begin(), v.end(), s.begin());
+      return s;
+   }
 
 } }  /// eosio::test

plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp

@@ -196,13 +196,13 @@ public:
 
    fc::variant get_currency_stats( const get_currency_stats_params& params )const;
 
-   void copy_row(const chain::contracts::key_value_object& obj, vector<char>& data)const {
+   static void copy_row(const chain::contracts::key_value_object& obj, vector<char>& data) {
       data.resize( sizeof(uint64_t) + obj.value.size() );
       memcpy( data.data(), &obj.primary_key, sizeof(uint64_t) );
       memcpy( data.data()+sizeof(uint64_t), obj.value.data(), obj.value.size() );
    }
 
-   void copy_row(const chain::contracts::keystr_value_object& obj, vector<char>& data)const {
+   static void copy_row(const chain::contracts::keystr_value_object& obj, vector<char>& data) {
       data.resize( obj.primary_key.size() + obj.value.size() + 8 );
       fc::datastream<char*> ds(data.data(), data.size());
       fc::raw::pack(ds, obj.primary_key);
@@ -210,14 +210,14 @@ public:
       data.resize(ds.tellp());
    }
 
-   void copy_row(const chain::contracts::key128x128_value_object& obj, vector<char>& data)const {
+   static void copy_row(const chain::contracts::key128x128_value_object& obj, vector<char>& data) {
       data.resize( 2*sizeof(uint128_t) + obj.value.size() );
       memcpy( data.data(), &obj.primary_key, sizeof(uint128_t) );
       memcpy( data.data()+sizeof(uint128_t), &obj.secondary_key, sizeof(uint128_t) );
       memcpy( data.data()+2*sizeof(uint128_t), obj.value.data(), obj.value.size() );
    }
 
-   void copy_row(const chain::contracts::key64x64x64_value_object& obj, vector<char>& data)const {
+   static void copy_row(const chain::contracts::key64x64x64_value_object& obj, vector<char>& data) {
       data.resize( 3*sizeof(uint64_t) + obj.value.size() );
       memcpy( data.data(), &obj.primary_key, sizeof(uint64_t) );
       memcpy( data.data()+sizeof(uint64_t), &obj.secondary_key, sizeof(uint64_t) );

tests/wasm_tests/identity_tests.cpp

@@ -21,7 +21,6 @@ using namespace eosio::chain_apis;
 using namespace eosio::testing;
 using namespace fc;
 
-#if 0
 class identity_tester : public tester {
 public:
 
@@ -87,7 +86,7 @@ public:
       return get_result_uint64();
    }
 
-   string create_identity(const string& account_name, uint64_t identity, bool auth = true) {
+   ActionResult create_identity(const string& account_name, uint64_t identity, bool auth = true) {
       action create_act;
       create_act.account = N(identity);
       create_act.name = N(create);
@@ -114,7 +113,7 @@ public:
       return abi_ser.binary_to_variant("identrow", data);
    }
 
-   string certify(const string& certifier, uint64_t identity, const vector<fc::variant>& fields, bool auth = true) {
+   ActionResult certify(const string& certifier, uint64_t identity, const vector<fc::variant>& fields, bool auth = true) {
       action cert_act;
       cert_act.account = N(identity);
       cert_act.name = N(certprop);
@@ -164,7 +163,7 @@ public:
       }
    }
 
-   string settrust(const string& trustor, const string& trusting, uint64_t trust, bool auth = true)
+   ActionResult settrust(const string& trustor, const string& trusting, uint64_t trust, bool auth = true)
    {
       signed_transaction trx;
       action settrust_act;
@@ -649,4 +648,3 @@ BOOST_FIXTURE_TEST_CASE( ownership_contradiction, identity_tester ) try {
 } FC_LOG_AND_RETHROW() //ownership_contradiction
 
 BOOST_AUTO_TEST_SUITE_END()
-#endif