Test fixes

everoddandeven · everoddandeven · commit 8e9e167d1052 · 2025-04-17T23:32:26.000+02:00
diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ For example: `export LD_PRELOAD=/path/to/libjemalloc.a` then run your app.
 	1. Download and install [Monero CLI](https://web.getmonero.org/downloads/).
 	2. Start monerod, e.g.: `./monerod --stagenet` (or use a remote daemon).
 	3. Start monero-wallet-rpc, e.g.: `./monero-wallet-rpc --daemon-address http://localhost:38081 --stagenet --rpc-bind-port 38083 --rpc-login rpc_user:abc123 --wallet-dir ./`
-4. Configure the appropriate RPC endpoints, authentication, and other settings in [test_utils.py](tests/test_utils.py).
+4. Configure the appropriate RPC endpoints, authentication, and other settings in [monero_test_utils.py](tests/utils/monero_test_utils.py).
 5. Run all *.py files in tests folder with `pytest`.
 
 
diff --git a/src/monero_bindings.cpp b/src/monero_bindings.cpp
@@ -699,6 +699,10 @@ class PyMoneroDaemonRpc : public PyMoneroDaemon {
         m_rpc->set_credentials(username, password);
     }
 
+    std::shared_ptr<PyMoneroRpcConnection> get_rpc_connection() const {
+        return m_rpc;
+    }
+
     std::shared_ptr<monero::monero_block> get_block_by_hash(const std::string& hash) override {
         auto result = std::make_shared<monero::monero_block>();
 
@@ -2661,7 +2665,10 @@ PYBIND11_MODULE(monero, m) {
     py::class_<PyMoneroDaemonRpc, PyMoneroDaemon, std::shared_ptr<PyMoneroDaemonRpc>>(m, "MoneroDaemonRpc")
         .def(py::init<>())
         .def(py::init<std::shared_ptr<PyMoneroRpcConnection>>(), py::arg("rpc"))
-        .def(py::init<std::string&, std::string&, std::string&>(), py::arg("uri"), py::arg("username") = "", py::arg("password") = "");
+        .def(py::init<std::string&, std::string&, std::string&>(), py::arg("uri"), py::arg("username") = "", py::arg("password") = "")
+        .def("get_rpc_connection", [](const PyMoneroRpcConnection& self) {
+            MONERO_CATCH_AND_RETHROW(self.get_rpc_connection());
+        });
 
     // monero_wallet
     py::class_<monero::monero_wallet, PyMoneroWallet, std::shared_ptr<monero::monero_wallet>>(m, "MoneroWallet")
diff --git a/tests/test_monero_wallet_full.py b/tests/test_monero_wallet_full.py
diff --git a/tests/test_monero_wallet_keys.py b/tests/test_monero_wallet_keys.py
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
@@ -1 +1,2 @@
 from .monero_test_utils import MoneroTestUtils
+from .wallet_sync_printer import WalletSyncPrinter
diff --git a/tests/utils/monero_test_utils.py b/tests/utils/monero_test_utils.py
@@ -1,80 +1,164 @@
 from typing import Any, Optional
-from monero import MoneroNetworkType, MoneroUtils
+from monero import MoneroNetworkType, MoneroUtils, MoneroWalletFull, MoneroRpcConnection, MoneroWalletConfig, MoneroDaemonRpc
+
+from wallet_sync_printer import WalletSyncPrinter
 
 class MoneroTestUtils:
+  _WALLET_FULL: MoneroWalletFull
+  # monero daemon rpc endpoint configuration (change per your configuration)
+  DAEMON_RPC_URI: str = "localhost:28081"
+  DAEMON_RPC_USERNAME: str = ""
+  DAEMON_RPC_PASSWORD: str = ""
 
-    @classmethod
-    def assert_false(cls, expr: Any):
-        assert expr == False
-
-    @classmethod
-    def assert_true(cls, expr: Any):
-        assert expr == True
-
-    @classmethod
-    def assert_not_none(cls, expr: Any):
-        assert expr is not None
-
-    @classmethod
-    def test_invalid_address(cls, address: Optional[str], networkType: MoneroNetworkType) -> None:
-        if address is None:
-            return
-
-        cls.assert_false(MoneroUtils.is_valid_address(address, networkType))
-        try:
-            MoneroUtils.validate_address(address, networkType)
-            raise Exception("Should have thrown exception")
-        except Exception as e:
-            cls.assert_false(len(str(e)) == 0)
-
-    @classmethod
-    def test_invalid_private_view_key(cls, privateViewKey: Optional[str]):
-        if privateViewKey is None:
-            return
-        
-        cls.assert_false(MoneroUtils.is_valid_private_view_key(privateViewKey));
-        try:
-            MoneroUtils.validate_private_view_key(privateViewKey);
-            raise Exception("Should have thrown exception");
-        except Exception as e:
-            cls.assert_false(len(str(e)) == 0)
+  # monero wallet rpc configuration (change per your configuration)
+  WALLET_RPC_PORT_START: int = 28084 # test wallet executables will bind to consecutive ports after these
+  WALLET_RPC_ZMQ_ENABLED: bool = False
+  WALLET_RPC_ZMQ_PORT_START: int = 58083
+  WALLET_RPC_ZMQ_BIND_PORT_START: int = 48083  # TODO: zmq bind port necessary?
+  WALLET_RPC_USERNAME: str = "rpc_user"
+  WALLET_RPC_PASSWORD: str = "abc123"
+  WALLET_RPC_ZMQ_DOMAIN: str = "127.0.0.1"
+  WALLET_RPC_DOMAIN: str = "localhost"
+  WALLET_RPC_URI = WALLET_RPC_DOMAIN + ":" + str(WALLET_RPC_PORT_START)
+  WALLET_RPC_ZMQ_URI = "tcp:#" + WALLET_RPC_ZMQ_DOMAIN + ":" + str(WALLET_RPC_ZMQ_PORT_START)
+  WALLET_RPC_ACCESS_CONTROL_ORIGINS = "http:#localhost:8080" # cors access from web browser
+
+  # test wallet config
+  WALLET_NAME = "test_wallet_1"
+  WALLET_PASSWORD = "supersecretpassword123"
+  TEST_WALLETS_DIR = "./test_wallets"
+  WALLET_FULL_PATH = TEST_WALLETS_DIR + "/" + WALLET_NAME
+
+  # test wallet constants
+  MAX_FEE = 7500000*10000
+  NETWORK_TYPE: MoneroNetworkType = MoneroNetworkType.TESTNET
+  LANGUAGE: str = "English"
+  SEED: str = "silk mocked cucumber lettuce hope adrenalin aching lush roles fuel revamp baptism wrist long tender teardrop midst pastry pigment equip frying inbound pinched ravine frying"
+  ADDRESS: str = "A1y9sbVt8nqhZAVm3me1U18rUVXcjeNKuBd1oE2cTs8biA9cozPMeyYLhe77nPv12JA3ejJN3qprmREriit2fi6tJDi99RR"
+  FIRST_RECEIVE_HEIGHT: int = 171 # NOTE: this value must be the height of the wallet's first tx for tests
+  SYNC_PERIOD_IN_MS: int = 5000 # period between wallet syncs in milliseconds
+  OFFLINE_SERVER_URI: str = "offline_server_uri" # dummy server uri to remain offline because wallet2 connects to default if not given
+  AUTO_CONNECT_TIMEOUT_MS: int = 3000
+
+  @classmethod
+  def assert_false(cls, expr: Any):
+    assert expr == False
+
+  @classmethod
+  def assert_true(cls, expr: Any):
+    assert expr == True
+
+  @classmethod
+  def assert_not_none(cls, expr: Any):
+    assert expr is not None
+
+  @classmethod
+  def get_daemon_rpc(cls) -> MoneroDaemonRpc:
+    raise Exception("not implemented")
+
+  @classmethod
+  def get_wallet_full_config(cls, daemon_connection: MoneroRpcConnection) -> MoneroWalletConfig:
+    config = MoneroWalletConfig()
+    config.path = cls.WALLET_FULL_PATH
+    config.password = cls.WALLET_PASSWORD
+    config.network_type = cls.NETWORK_TYPE
+    config.seed = cls.SEED
+    config.server = daemon_connection
+    config.restore_height = cls.FIRST_RECEIVE_HEIGHT
+
+    return config
   
+  @classmethod
+  def get_wallet_full(cls) -> MoneroWalletFull:
+    if cls._WALLET_FULL is None:
+      # create wallet from seed if it doesn't exist
+      if not MoneroWalletFull.wallet_exists(cls.WALLET_FULL_PATH):
+        
+        # create directory for test wallets if it doesn't exist
+        #File testWalletsDir = new File(TestUtils.TEST_WALLETS_DIR);
+        #if (!testWalletsDir.exists()) testWalletsDir.mkdirs();
+        
+        # create wallet with connection
+        daemon_connection = MoneroRpcConnection(cls.DAEMON_RPC_URI, cls.DAEMON_RPC_USERNAME, cls.DAEMON_RPC_PASSWORD)
+        config = cls.get_wallet_full_config(daemon_connection)
+        cls._WALLET_FULL = MoneroWalletFull.create_wallet(config)
+        assert MoneroTestUtils.FIRST_RECEIVE_HEIGHT, cls._WALLET_FULL.get_restore_height()
+        assert daemon_connection == cls._WALLET_FULL.get_daemon_connection()
+
+      # otherwise open existing wallet and update daemon connection
+      else:
+        cls._WALLET_FULL = MoneroWalletFull.open_wallet(cls.WALLET_FULL_PATH, cls.WALLET_PASSWORD, cls.NETWORK_TYPE)
+        cls._WALLET_FULL.set_daemon_connection(cls.get_daemon_rpc().get_rpc_connection())
 
-    @classmethod
-    def test_invalid_public_view_key(cls, public_view_key: Optional[str]) -> None:
-        if public_view_key is None:
-            return
-
-        cls.assert_false(MoneroUtils.is_valid_public_view_key(public_view_key))
-        try:
-            MoneroUtils.validate_public_view_key(public_view_key)
-            raise Exception("Should have thrown exception")
-        except Exception as e:
-            cls.assert_false(len(str(e)) == 0)
-
-    @classmethod
-    def test_invalid_private_spend_key(cls, privateSpendKey: Optional[str]):
-        if privateSpendKey is None:
-            return
-
-        try:
-            cls.assert_false(MoneroUtils.is_valid_private_spend_key(privateSpendKey))
-            MoneroUtils.validate_private_spend_key(privateSpendKey)
-            raise Exception("Should have thrown exception")
-        except Exception as e:
-            cls.assert_false(len(str(e)) == 0)
-
-
-    @classmethod
-    def test_invalid_public_spend_key(cls, publicSpendKey: Optional[str]):
-        if publicSpendKey is None:
-            return
+    # sync and save wallet
+    listener = WalletSyncPrinter()
+    cls._WALLET_FULL.sync(listener)
+    cls._WALLET_FULL.save()
+    cls._WALLET_FULL.start_syncing(cls.SYNC_PERIOD_IN_MS) # start background synchronizing with sync period
         
-        cls.assert_false(MoneroUtils.is_valid_public_spend_key(publicSpendKey))
-        try:
-            MoneroUtils.validate_public_spend_key(publicSpendKey)
-            raise Exception("Should have thrown exception")
-        except Exception as e:
-            cls.assert_false(len(str(e)) == 0)
+    # ensure we're testing the right wallet
+    assert MoneroTestUtils.SEED == cls._WALLET_FULL.get_seed()
+    assert MoneroTestUtils.ADDRESS == cls._WALLET_FULL.get_primary_address()
+    return cls._WALLET_FULL
+
+  @classmethod
+  def test_invalid_address(cls, address: Optional[str], networkType: MoneroNetworkType) -> None:
+    if address is None:
+      return
+
+    cls.assert_false(MoneroUtils.is_valid_address(address, networkType))
+    try:
+      MoneroUtils.validate_address(address, networkType)
+      raise Exception("Should have thrown exception")
+    except Exception as e:
+      cls.assert_false(len(str(e)) == 0)
+
+  @classmethod
+  def test_invalid_private_view_key(cls, privateViewKey: Optional[str]):
+    if privateViewKey is None:
+      return
+    
+    cls.assert_false(MoneroUtils.is_valid_private_view_key(privateViewKey))
+    try:
+      MoneroUtils.validate_private_view_key(privateViewKey)
+      raise Exception("Should have thrown exception")
+    except Exception as e:
+      cls.assert_false(len(str(e)) == 0)
+  
+  @classmethod
+  def test_invalid_public_view_key(cls, public_view_key: Optional[str]) -> None:
+    if public_view_key is None:
+      return
+
+    cls.assert_false(MoneroUtils.is_valid_public_view_key(public_view_key))
+    try:
+      MoneroUtils.validate_public_view_key(public_view_key)
+      raise Exception("Should have thrown exception")
+    except Exception as e:
+      cls.assert_false(len(str(e)) == 0)
+
+  @classmethod
+  def test_invalid_private_spend_key(cls, privateSpendKey: Optional[str]):
+    if privateSpendKey is None:
+      return
+
+    try:
+      cls.assert_false(MoneroUtils.is_valid_private_spend_key(privateSpendKey))
+      MoneroUtils.validate_private_spend_key(privateSpendKey)
+      raise Exception("Should have thrown exception")
+    except Exception as e:
+      cls.assert_false(len(str(e)) == 0)
+
+  @classmethod
+  def test_invalid_public_spend_key(cls, publicSpendKey: Optional[str]):
+    if publicSpendKey is None:
+      return
+    
+    cls.assert_false(MoneroUtils.is_valid_public_spend_key(publicSpendKey))
+    try:
+      MoneroUtils.validate_public_spend_key(publicSpendKey)
+      raise Exception("Should have thrown exception")
+    except Exception as e:
+      cls.assert_false(len(str(e)) == 0)
   
   
diff --git a/tests/utils/wallet_sync_printer.py b/tests/utils/wallet_sync_printer.py
@@ -0,0 +1,20 @@
+from typing_extensions import override
+from monero import MoneroWalletListener
+
+class WalletSyncPrinter(MoneroWalletListener):
+
+  next_increment: float
+  sync_resolution: float
+
+  def __init__(self, sync_resolution: float = 0.05) -> None:
+    super().__init__()
+    self.next_increment = 0
+    self.sync_resolution = sync_resolution
+  
+  @override
+  def on_sync_progress(self, height: int, start_height: int, end_height: int, percent_done: float, message: str):
+    if (percent_done == 1.0 or percent_done >= self.next_increment):
+      msg = f"on_sync_progess({height}, {start_height}, {end_height}, {percent_done}, {message})"
+      print(msg)
+      self.next_increment += self.sync_resolution
+    

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`from .monero_test_utils import MoneroTestUtils`
	`2`	`+from .wallet_sync_printer import WalletSyncPrinter`