Wallet rpc consolidation

Author: everoddandeven

src/cpp/wallet/py_monero_wallet_model.cpp

@@ -603,11 +603,11 @@ void PyMoneroTxWallet::from_property_tree_with_transfer(const boost::property_tr
       }
     }
     else if (key == std::string("amount_in")) tx->m_input_sum = it->second.get_value<uint64_t>();
-    else if (key == std::string("amount_out")) tx->m_input_sum = it->second.get_value<uint64_t>();
+    else if (key == std::string("amount_out")) tx->m_output_sum = it->second.get_value<uint64_t>();
     else if (key == std::string("change_address") && !it->second.data().empty()) tx->m_change_address = it->second.data();
     else if (key == std::string("change_amount")) tx->m_change_amount = it->second.get_value<uint64_t>();
     else if (key == std::string("dummy_outputs")) tx->m_num_dummy_outputs = it->second.get_value<uint64_t>();
-    //else if (key == std::string("extra")) tx->m_extra = it->second.data();
+    else if (key == std::string("extra")) tx->m_extra_hex = it->second.data();
     else if (key == std::string("ring_size")) tx->m_ring_size = it->second.get_value<uint32_t>();
     else if (key == std::string("spent_key_images")) {
       auto node2 = it->second;
@@ -714,14 +714,14 @@ void PyMoneroTxWallet::from_property_tree_with_output(const boost::property_tree
   tx->m_in_tx_pool = false;
 
   auto output = std::make_shared<monero::monero_output_wallet>();
-  auto key_image = std::make_shared<monero::monero_key_image>();
   output->m_tx = tx;
 
   for(auto it = node.begin(); it != node.end(); ++it) {
     std::string key = it->first;
     if (key == std::string("amount")) output->m_amount = it->second.get_value<uint64_t>();
     else if (key == std::string("spent")) output->m_is_spent = it->second.get_value<bool>();
-    else if (key == std::string("key_image")) {
+    else if (key == std::string("key_image") && !it->second.data().empty()) {
+      auto key_image = std::make_shared<monero::monero_key_image>();
       key_image->m_hex = it->second.data();
       output->m_key_image = key_image;
     }
@@ -1440,7 +1440,7 @@ rapidjson::Value PyMoneroKeyImage::to_rapidjson_val(rapidjson::Document::Allocat
 
   // set string values
   rapidjson::Value value_str(rapidjson::kStringType);
-  if (m_hex != boost::none) monero_utils::add_json_member("keyImage", m_hex.get(), allocator, root, value_str);
+  if (m_hex != boost::none) monero_utils::add_json_member("key_image", m_hex.get(), allocator, root, value_str);
   if (m_signature != boost::none) monero_utils::add_json_member("signature", m_signature.get(), allocator, root, value_str);
 
   // return root

tests/test_monero_wallet_rpc.py

@@ -41,19 +41,11 @@ def get_test_wallet(cls) -> MoneroWalletRpc:
 
     @override
     def _open_wallet(self, config: MoneroWalletConfig | None) -> MoneroWalletRpc:
-        try:
-            return Utils.open_wallet_rpc(config)
-        except Exception:
-            Utils.free_wallet_rpc_resources()
-            raise
+        return Utils.open_wallet_rpc(config)
 
     @override
     def _create_wallet(self, config: MoneroWalletConfig) -> MoneroWalletRpc:
-        try:
-            return Utils.create_wallet_rpc(config)
-        except Exception:
-            Utils.free_wallet_rpc_resources()
-            raise
+        return Utils.create_wallet_rpc(config)
 
     @override
     def _close_wallet(self, wallet: MoneroWallet, save: bool = False) -> None:
@@ -123,7 +115,6 @@ def test_get_subaddress_address_out_of_range(self, wallet: MoneroWallet) -> None
 
     # Can create a wallet with a randomly generated seed
     @pytest.mark.skipif(Utils.TEST_NON_RELAYS is False, reason="TEST_NON_RELAYS disabled")
-    @pytest.mark.xfail(reason="TODO setup another docker wallet-rpc")
     def test_create_wallet_random_rpc(self) -> None:
         # create random wallet with defaults
         path: str = StringUtils.get_random_string()
@@ -146,14 +137,12 @@ def test_create_wallet_random_rpc(self) -> None:
         wallet = self._create_wallet(config)
         MoneroUtils.validate_mnemonic(wallet.get_seed())
         assert seed != wallet.get_seed()
+        seed = wallet.get_seed()
         MoneroUtils.validate_address(wallet.get_primary_address(), Utils.NETWORK_TYPE)
 
         # attempt to create wallet which already exists
         try:
-            config = MoneroWalletConfig()
-            config.path = path
-            config.language = "Spanish"
-            self._create_wallet(config)
+            wallet.create_wallet(config)
         except MoneroError as e:
             err_msg: str = str(e)
             assert err_msg == f"Wallet already exists: {path}", err_msg
@@ -209,10 +198,8 @@ def test_create_wallet_from_seed_rpc(self, daemon: MoneroDaemonRpc) -> None:
 
     # Can open wallets
     @pytest.mark.skipif(Utils.TEST_NON_RELAYS is False, reason="TEST_NON_RELAYS disabled")
-    @pytest.mark.skip(reason="TODO setup another docker monero-wallet-rpc resource")
     def test_open_wallet(self)-> None:
         # create names of tests wallets
-        # TODO setup more wallet-rpc instances
         num_test_wallets: int = 1
         names: list[str] = [ ]
         for i in range(num_test_wallets):
@@ -238,23 +225,16 @@ def test_open_wallet(self)-> None:
             assert seeds[i] == wallet.get_seed()
             wallets.append(wallet)
 
-        # attempt to re-open already opened wallet
-        try:
-            config: MoneroWalletConfig = MoneroWalletConfig()
-            self._open_wallet(config)
-            raise Exception("Cannot open wallet wich is already open")
-        except MoneroError as e:
-            # -1 indicates wallet does not exist (or is open by another app)
-            logger.critical(str(e))
-
         # attempt to open non-existent
         try:
             config: MoneroWalletConfig = MoneroWalletConfig()
             config.path = "btc_integrity"
             config.password = Utils.WALLET_PASSWORD
+            self._open_wallet(config)
             raise Exception("Cannot open non-existent wallet")
-        except MoneroError as e:
-            logger.critical(e)
+        except Exception as e:
+            e_msg: str = str(e)
+            assert e_msg != "Cannot open non-existent wallet", e_msg
 
         # close wallets:
         for wallet in wallets:
@@ -356,9 +336,4 @@ def test_get_public_spend_key(self, wallet: MoneroWallet) -> None:
     def test_import_key_images(self, wallet: MoneroWallet) -> None:
         return super().test_import_key_images(wallet)
 
-    @pytest.mark.skip(reason="TODO setup another docker monero-wallet-rpc resource")
-    @override
-    def test_view_only_and_offline_wallets(self, wallet: MoneroWallet) -> None:
-        return super().test_view_only_and_offline_wallets(wallet)
-
     #endregion