Functional tests update

.github/workflows/dev.yml

@@ -69,6 +69,6 @@ jobs:
           export FORMER_SNET_TEST_INFURA_KEY=${{ secrets.FORM_INF_KEY }}
           export PIP_BREAK_SYSTEM_PACKAGES=1
           export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
-#          sh -ex ./snet/cli/test/utils/run_all_functional.sh
+          # sh -ex ./snet/cli/test/utils/run_all_functional.sh
           python3 ./snet/cli/test/functional_tests/test_entry_point.py
           python3 ./snet/cli/test/functional_tests/func_tests.py

.github/workflows/master.yml

@@ -71,3 +71,4 @@ jobs:
           export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
           # sh -ex ./snet/cli/test/utils/run_all_functional.sh
           python3 ./snet/cli/test/functional_tests/test_entry_point.py
+          python3 ./snet/cli/test/functional_tests/func_tests.py

.github/workflows/test.yml

@@ -0,0 +1,66 @@
+name: tests_functional_tests_update
+on:
+  push:
+    branches: [ "functional-tests-update" ]
+#  pull_request:
+#    branches: [ "development" ]
+  workflow_dispatch:
+
+jobs:
+    run_tests_functional_tests_update:
+      runs-on: ubuntu-latest
+      container: node:20-bookworm
+      steps:
+
+      - name: install packs
+        run: |
+          apt update
+          apt install -y libudev-dev libusb-1.0-0-dev curl jq
+          apt install -y python3-pip python3.11-venv
+
+      - name: clone repo
+        uses: actions/checkout@v3
+
+      - name: install pip packages
+        run: |
+          pip3 install -r requirements.txt --break-system-packages
+          # pip3 install nose --break-system-packages
+          # pip3 uninstall pyreadline --break-system-packages
+          # pip3 install pyreadline3 --break-system-packages
+
+      - name: install snet-cli
+        run: |
+          # ./scripts/blockchain install
+          pip3 install -e . --break-system-packages
+
+      # - name: install platform-contracts
+      #   run: |
+      #     cd ..
+      #     git clone https://github.com/singnet/platform-contracts.git
+      #     cd platform-contracts
+      #     npm install
+      #     npm install ganache-cli
+      #     npm run-script compile
+
+      # - name: build example service
+      #   run: |
+      #     git clone https://github.com/singnet/example-service.git
+      #     cd example-service
+      #     pip3 install -r requirements.txt --break-system-packages
+      #     sh buildproto.sh
+
+      # - name: unit tests
+      #   run: |
+      #     cd ./snet/cli/test
+      #     nosetests -v --with-doctest
+
+      - name: functional tests for cli
+        run: |
+          export SNET_TEST_WALLET_PRIVATE_KEY=${{ secrets.PRIV_KEY }}
+          export SNET_TEST_INFURA_KEY=${{ secrets.INF_KEY }}
+          export SNET_TEST_WALLET_ADDRESS=${{ secrets.ADDR }}
+          export FORMER_SNET_TEST_INFURA_KEY=${{ secrets.FORM_INF_KEY }}
+          export PIP_BREAK_SYSTEM_PACKAGES=1
+          export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
+          # sh -ex ./snet/cli/test/utils/run_all_functional.sh
+          python3 ./snet/cli/test/functional_tests/test_entry_point.py

snet/cli/arguments.py

@@ -1153,7 +1153,7 @@ def add_mpe_service_options(parser):
     p.add_argument("name", help="Name of the contributor")
     p.add_argument("email_id", help="Email of the contributor")
 
-    p = subparsers.add_parser("metadata-remove-contributor", help="Add contributor")
+    p = subparsers.add_parser("metadata-remove-contributor", help="Remove contributor")
     p.set_defaults(fn="metadata_remove_contributor")
     add_p_metadata_file_opt(p)
     p.add_argument("email_id", help="Email of the contributor")

snet/cli/config.py

@@ -106,7 +106,7 @@ def set_session_field(self, key, value, out_f):
             self.set_identity_field(session_identity, key, value)
             print("set {}={} for identity={}".format(key, value, session_identity), file=out_f)
         else:
-            all_keys = get_session_network_keys() + get_session_identity_keys() + ["default_ipfs_endpoint"]
+            all_keys = get_session_keys()
             raise Exception("key {} not in {}".format(key, all_keys))
 
     def unset_session_field(self, key, out_f):

snet/cli/test/functional_tests/func_tests.py

@@ -1,12 +1,8 @@
 import warnings
 import argcomplete
 import unittest
-import unittest.mock as mock
-import shutil
 import os
 
-from snet.cli.commands.commands import BlockchainCommand
-
 with warnings.catch_warnings():
     # Suppress the eth-typing package`s warnings related to some new networks
     warnings.filterwarnings("ignore", "Network .* does not have a valid ChainId. eth-typing should be "
@@ -15,6 +11,12 @@
 
 from snet.cli.config import Config
 
+INFURA_KEY = os.environ.get("SNET_TEST_INFURA_KEY")
+PRIVATE_KEY = os.environ.get("SNET_TEST_WALLET_PRIVATE_KEY")
+ADDR = os.environ.get("SNET_TEST_WALLET_ADDRESS")
+INFURA = f"https://sepolia.infura.io/v3/{INFURA_KEY}"
+IDENTITY = "sepolia"
+
 
 class StringOutput:
     def __init__(self):
@@ -32,102 +34,18 @@ def execute(args_list, parser, conf):
         except TypeError:
             args = parser.parse_args(argv + ["-h"])
         f = StringOutput()
-        getattr(args.cmd(conf, args, out_f = f), args.fn)()
+        getattr(args.cmd(conf, args, out_f=f), args.fn)()
         return f.text
     except Exception as e:
         raise
 
+
 class BaseTest(unittest.TestCase):
     def setUp(self):
         self.conf = Config()
         self.parser = arguments.get_root_parser(self.conf)
         argcomplete.autocomplete(self.parser)
 
 
-class TestCommands(BaseTest):
-    def test_balance_output(self):
-        result = execute(["account", "balance"], self.parser, self.conf)
-        assert len(result.split("\n")) >= 4
-
-    def test_balance_address(self):
-        result = execute(["account", "balance"], self.parser, self.conf)
-        assert result.split("\n")[0].split()[1] == "0xe5D1fA424DE4689F9d2687353b75D7a8987900fD"
-
-class TestDepositWithdraw(BaseTest):
-    def setUp(self):
-        super().setUp()
-        self.balance_1: int
-        self.balance_2: int
-        self.amount = 0.1
-
-    def test_deposit(self):
-        result = execute(["account", "balance"], self.parser, self.conf)
-        self.balance_1 = float(result.split("\n")[3].split()[1])
-        execute(["account", "deposit", f"{self.amount}", "-y", "-q"], self.parser, self.conf)
-        result = execute(["account", "balance"], self.parser, self.conf)
-        self.balance_2 = float(result.split("\n")[3].split()[1])
-        assert self.balance_2 == self.balance_1 + self.amount
-
-    def test_withdraw(self):
-        result = execute(["account", "balance"], self.parser, self.conf)
-        self.balance_1 = float(result.split("\n")[3].split()[1])
-        execute(["account", "withdraw", f"{self.amount}", "-y", "-q"], self.parser, self.conf)
-        result = execute(["account", "balance"], self.parser, self.conf)
-        self.balance_2 = float(result.split("\n")[3].split()[1])
-        assert self.balance_2 == self.balance_1 - self.amount
-
-
-class TestGenerateLibrary(BaseTest):
-    def setUp(self):
-        super().setUp()
-        self.path = './temp_files'
-        self.org_id = '26072b8b6a0e448180f8c0e702ab6d2f'
-        self.service_id = 'Exampleservice'
-
-    def test_generate(self):
-        execute(["sdk", "generate-client-library", self.org_id, self.service_id, self.path], self.parser, self.conf)
-        assert os.path.exists(f'{self.path}/{self.org_id}/{self.service_id}/python/')
-
-    def tearDown(self):
-        shutil.rmtree(self.path)
-
-
-class TestEncryptionKey(BaseTest):
-    def setUp(self):
-        super().setUp()
-        self.key = "1234567890123456789012345678901234567890123456789012345678901234"
-        self.password = "some_pass"
-        self.name = "some_name"
-        self.default_name = "default_name"
-        result = execute(["identity", "list"], self.parser, self.conf)
-        if self.default_name not in result:
-            execute(["identity", "create", self.default_name, "key", "--private-key", self.key, "-de"],
-                             self.parser,
-                             self.conf)
-
-    def test_1_create_identity_with_encryption_key(self):
-        with mock.patch('getpass.getpass', return_value=self.password):
-            execute(["identity", "create", self.name, "key", "--private-key", self.key],
-                             self.parser,
-                             self.conf)
-            result = execute(["identity", "list"], self.parser, self.conf)
-            assert self.name in result
-
-    def test_2_get_encryption_key(self):
-        with mock.patch('getpass.getpass', return_value=self.password):
-            execute(["identity", self.name], self.parser, self.conf)
-            cmd = BlockchainCommand(self.conf, self.parser.parse_args(['session']))
-            enc_key = cmd.config.get_session_field("private_key")
-            res_key = cmd._get_decrypted_secret(enc_key)
-            assert res_key == self.key
-
-    def test_3_delete_identity(self):
-        with mock.patch('getpass.getpass', return_value=self.password):
-            execute(["identity", self.default_name], self.parser, self.conf)
-            execute(["identity", "delete", self.name], self.parser, self.conf)
-            result = execute(["identity", "list"], self.parser, self.conf)
-            assert self.name not in result
-
-
 if __name__ == "__main__":
     unittest.main()