Fix the compile errors after merging

dacplayproject · May 29, 2015 · 87b88b5 · 87b88b5
1 parent f48f84a
commit 87b88b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/libraries/game/v8_api.cpp b/libraries/game/v8_api.cpp
@@ -402,7 +402,7 @@ namespace bts { namespace game {
         Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
         void* ptr = wrap->Value();
 
-        auto trx_data = v8_helper::json_to_cpp<transaction_data>(args.GetIsolate(), args[0] );
+        auto trx_data = v8_helper::json_to_cpp<transaction_info>(args.GetIsolate(), args[0] );
 
         static_cast<v8_wallet*>(ptr)->_wallet->store_transaction( trx_data );
     }

diff --git a/libraries/game/v8_helper.cpp b/libraries/game/v8_helper.cpp
@@ -46,7 +46,8 @@ namespace bts { namespace game {
         try {
             EscapableHandleScope handle_scope(args.GetIsolate());
 
-            auto hash = fc::ripemd160::hash( v8_helper::ToCString(String::Utf8Value(args[0]->ToString(args.GetIsolate()))) );
+            std::string str_to_hash(v8_helper::ToCString(String::Utf8Value(args[0]->ToString(args.GetIsolate()))));
+            auto hash = fc::ripemd160::hash( str_to_hash );
 
             args.GetReturnValue().Set( v8_helper::cpp_to_json( args.GetIsolate(), hash ) );
         } catch ( ... )

diff --git a/libraries/wallet/transaction_ledger.cpp b/libraries/wallet/transaction_ledger.cpp
@@ -1766,7 +1766,7 @@ bool wallet_impl::scan_game( const game_operation& op, wallet_transaction_record
 
     if ( ogame.valid() )
     {
-        return _game_client->get_v8_engine( ogame->name )->scan(trx_rec, self->shared_from_this(), op.input.data );
+        return _game_client->get_v8_engine( ogame->name )->scan_ledger(trx_rec, self->shared_from_this(), op.input.data );
     }
 
     return false;