From d57025cf12aa322be8b5af0c8564a5a9d5218bc3 Mon Sep 17 00:00:00 2001
From: bitromortac <bitromortac@protonmail.com>
Date: Sun, 31 Dec 2023 10:17:47 +0100
Subject: [PATCH] use correct macaroon in tests

---
 lndmanage/lib/node.py  |  6 ++++--
 test/testing_common.py | 23 ++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lndmanage/lib/node.py b/lndmanage/lib/node.py
index f1f7fd0..61164a2 100644
--- a/lndmanage/lib/node.py
+++ b/lndmanage/lib/node.py
@@ -65,7 +65,8 @@ class LndNode:
 
     def __init__(self, config_file: Optional[str] = None,
                  lnd_home: Optional[str] = None,
-                 lnd_host: Optional[str] = None, regtest=False):
+                 lnd_host: Optional[str] = None, regtest=False,
+                 use_admin=False):
         """
         :param config_file: path to the config file
         :param lnd_home: path to lnd home folder
@@ -85,12 +86,13 @@ class LndNode:
         # configure lndmanage home: (TODO: separate into config)
         # if no lnd_home is given, then use the paths from the config,
         # else override them with default file paths in lnd_home
+        macaroon = 'readonly.macaroon' if not use_admin else 'admin.macaroon'
         if self.lnd_home is not None:
             self.cert_file_path = os.path.join(self.lnd_home, 'tls.cert')
             bitcoin_network = 'regtest' if self.regtest else 'mainnet'
             self.macaroon_file_path = os.path.join(
                 self.lnd_home, 'data/chain/bitcoin/',
-                bitcoin_network, 'readonly.macaroon')
+                bitcoin_network, macaroon)
             if self.lnd_host is None:
                 raise ValueError(
                     'if lnd_home is given, lnd_host must be given')
diff --git a/test/testing_common.py b/test/testing_common.py
index 5b33588..f27481a 100644
--- a/test/testing_common.py
+++ b/test/testing_common.py
@@ -2,6 +2,15 @@
 import os
 import shutil
 from unittest import TestCase
+import logging.config
+
+from lnregtest.lib.network import Network
+
+from lndmanage import settings
+from lndmanage.lib.node import LndNode
+
+logger = logging.getLogger()
+logger.setLevel(logging.INFO)
 
 # testing base folder
 test_dir = os.path.dirname(os.path.realpath(__file__))
@@ -14,19 +23,11 @@ test_data_dir = os.path.join(test_dir, 'test_data')
 lndmanage_home = os.path.join(test_data_dir, 'lndmanage')
 os.makedirs(lndmanage_home, exist_ok=True)
 
-# create empty config and set env var to not trigger error when importing settings
+# create empty config and set env var to not trigger error when importing
+# settings
 open(os.path.join(lndmanage_home, 'config.ini'), 'a').close()
 os.environ.setdefault('LNDMANAGE_HOME', lndmanage_home)
 
-from lnregtest.lib.network import Network
-
-from lndmanage.lib.node import LndNode
-
-import logging.config
-logger = logging.getLogger()
-logger.setLevel(logging.INFO)
-
-from lndmanage import settings
 settings.CACHING_RETENTION_MINUTES = 0
 
 # constants for testing
@@ -95,7 +96,7 @@ class TestNetwork(TestCase):
         self.lndnode = LndNode(
             lnd_home=master_node_data_dir,
             lnd_host='localhost:' + str(master_node_port),
-            regtest=True
+            regtest=True, use_admin=True,
         )
         self.graph_test()