vinteumorg · Davidson-Souza · Mar 12, 2025 · Mar 6, 2025
diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
@@ -13,23 +13,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install poetry
-        run: pipx install poetry
-
-      - uses: actions/setup-python@v5
+      # see more at
+      # https://docs.astral.sh/uv/guides/integration/github/
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: "3.12"
-          cache: "poetry"
-          cache-dependency-path: "./poetry.lock"
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
 
       - name: Prepare environment
-        run: poetry install --no-root
+        run: uv sync --all-extras --dev
 
       - name: Run black formatting
-        run: poetry run poe format --check --verbose
+        run: uv run black --check --verbose ./tests
 
       - name: Run pylint linter
-        run: poetry run poe lint --verbose
+        run: uv run pylint --verbose ./tests
 
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2

diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,9 @@ config.toml
 # IDE configurations
 .idea/
 .vscode/
+
+# uv python management
+.venv
+
+# tests pycache
+tests/**/__pycache__/*
diff --git a/README.md b/README.md
@@ -258,53 +258,82 @@ cargo test --release
 
 Additional functional tests are available (minimum python version: 3.12).
 
-* Install [poetry dependencies manager](https://python-poetry.org/docs/#installation). There are many ways to do this:
+* Recommended: install [uv: a rust-based python package and project manager](https://docs.astral.sh/uv/).
+
+* Configure an isolated environment:
 
 ```bash
-# recomended way
-pipx install poetry
+# create a virtual environment
+# (it's good to not mess up with your os)
+uv venv
+
+# Alternatively, you can specify a python version (e.g, 3.12),
+uv venv --python 3.12
+
+# activate the python virtual environment
+source .venv/bin/activate
+
+# check if the python path was modified
+which python
 ```
 
+* Install module dependencies:
+
 ```bash
-# official installer (linux / mac)
-curl -sSL https://install.python-poetry.org | python3 -
-```
+# installs dependencies listed in pyproject.toml.
+# in local development environment
+# it do not remove existing packages.
+uv pip install -r pyproject.toml
+
+# if you're a old-school pythonist,
+# install from requirements.txt
+# without remove existing packages.
+uv pip install -r tests/requirements.txt
 
-```pwsh
-# official isntaller (windows - powershell)
-(Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | py -
+# Alternatively, you can synchronize it
+# uses the uv.lock file to enforce
+# reproducible installations.
+uv sync
 ```
 
+* Format code
 ```bash
-# mannually
-python3 -m venv $VENV_PATH
-$VENV_PATH/bin/pip install -U pip setuptools
-$VENV_PATH/bin/pip install poetry
+uv run black ./tests
+
+# if you want to just check
+uv run black --check --verbose ./tests
 ```
 
-* Configure an isolated environment and install module dependencies:
 
+* Lint code
 ```bash
-poetry install --no-root
+uv run pylint ./tests
 ```
 
 * Run tests:
 
+Our tests are separated by "test suites". Suites are folders located in `./tests/<suite>` and the tests are the `./tests/<suite>/*-test.py` files. To run all suites, type:
+
+```bash
+uv run tests/run_tests.py
+```
+
+You can list all suites with:
+
 ```bash
-poetry run poe tests
+uv run tests/run_tests.py --list-suites
 ```
 
-* Before run tests, check the pre-commit:
+To run a specific suite:
 
 ```bash
-poetry run poe pre-commit
+uv run tests/run_tests.py --test-suite <suite>
 ```
 
-* Manual way without poetry: install dependencies and run the test script. This is discouraged since that can lead to inconsistences between different python versions:
+You can even add more:
 
 ```bash
-pip3 install -r tests/requirements.txt
-python tests/run_tests.py
+uv run tests/run_tests.py --test-suite <suite_A> --test-suite <suite_B>
 ```
 
 ## Running Benchmarks

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,67 +1,20 @@
-# With this the user can use a custom
-# python environment, like those created
-# with venv or pyenv. The default will be
-# the system python.
-[virtualenvs]
-prefer-active-python = true
-
-# This isn't really needed on pratical aspect
-# since this is only for organize the functional tests
-# but is necessary since its a requirement for poetry.
-[tool.poetry]
+[project]
 name = "floresta-functional-tests"
-version = "0.0.1"
-description = "collection of tools to help with functional testing of Floresta"
-authors = ["The Floresta Project Developers"]
-license = "MIT"
-
-# To add a new dependency, use `poetry add <package>`.
-# To update, first find outdated packages with `poetry show --outdated`,
-# then re-install with `poetry add <package>@<version>`.
-[tool.poetry.dependencies]
-python = ">=3.12"
-jsonrpclib = "^0.2.1"
-requests = "^2.32.3"
-black = "^24.10.0"
-pylint = "^3.3.2"
-poethepoet = "^0.31.1"
-
-# Here we can define some custom tasks
-# (even bash or rust ones can be defined).
-# All of them will run on virtualenv environment.
-# For more information, see guidelines in https://poethepoet.natn.io
-[tool.poe.tasks]
-format = "black ./tests"
-lint = "pylint ./tests"
-example-test = "python tests/run_tests.py --test-name example_test"
-restart-test = "python tests/run_tests.py --test-name restart"
-florestacli-getblockchaininfo-test = "python tests/run_tests.py --test-name floresta_cli_getblockchaininfo"
-florestacli-getblockhash-test = "python tests/run_tests.py --test-name floresta_cli_getblockhash"
-florestacli-getblockheader-test = "python tests/run_tests.py --test-name floresta_cli_getblockheader"
-florestacli-getblock-test = "python tests/run_tests.py --test-name floresta_cli_getblock"
-florestacli-getpeerinfo-test = "python tests/run_tests.py --test-name floresta_cli_getpeerinfo"
-florestacli-addnode-test = "python tests/run_tests.py --test-name floresta_cli_addnode"
-florestacli-stop-test = "python tests/run_tests.py --test-name floresta_cli_stop"
-florestacli-getroots-test = "python tests/run_tests.py --test-name floresta_cli_getroots"
-florestacli-getrpcinfo-test = "python tests/run_tests.py --test-name floresta_cli_getrpcinfo"
-florestacli-getmemoryinfo-test = "python tests/run_tests.py --test-name floresta_cli_getmemoryinfo"
-florestacli-uptime-test = "python tests/run_tests.py --test-name floresta_cli_uptime"
-tests = [
-  "restart-test",
-  "florestacli-getblockchaininfo-test",
-  "florestacli-getblockhash-test",
-  "florestacli-getblockheader-test",
-  "florestacli-getblock-test",
-  "florestacli-getpeerinfo-test",
-  "florestacli-addnode-test",
-  "florestacli-stop-test",
-  "florestacli-getroots-test",
-  "florestacli-getrpcinfo-test",
-  "florestacli-getmemoryinfo-test",
-  "florestacli-uptime-test"
+version = "0.0.2"
+description = "Collection of tools to help with functional testing of Floresta"
+authors = [{name = "The Floresta Project Developers"}]
+license = {text = "MIT"}
+requires-python = ">=3.12"
+dependencies = [
+    "jsonrpclib>=0.2.1",
+    "requests>=2.32.3",
+    "black>=24.10.0",
+    "pylint>=3.3.2",
 ]
-pre-commit = ["format", "lint", "tests"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["tests/test_framework"]
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/example_test.py → tests/example/example-test.py b/tests/example_test.py → tests/example/example-test.py
@@ -11,19 +11,19 @@
 Any attempt to define a test without these methods will raise a TypeError.
 
 Other methods are available to do more things. Some of them make sense only in `set_test_params`
-and others make sense only in `run_tests`. 
+and others make sense only in `run_tests`.
 
 - `add_node_settings`: register a node settings to create a node after. A node will be a spawned
                        `cargo run --features json-rpc --bin florestad -- --network <chain>` process.
                        In summary, its a `FlorestaRPC` instance.
-                       
+
                        The chain can be one of ["regtest", "signet", "testnet"].
                        You can pass some extra arguments with `extra_args` and it will be appended
                        to the process command. The `rpcserver` is a dictionary defining a "host",
                        "port", "username" and "password". The "data_dir" is optional and can be
                        used to create a temporary directory to store files. It will return an
                        integer pointing an index of a list of nodes.
-                       
+
 - `get_node_settings`: get a registered node settings
 
 - `run_node`: run a node for a registered node settings at some index,

diff --git a/tests/floresta_cli_addnode.py → tests/floresta-cli/addnode-test.py b/tests/floresta_cli_addnode.py → tests/floresta-cli/addnode-test.py
diff --git a/tests/floresta_cli_getblock.py → tests/floresta-cli/getblock-test.py b/tests/floresta_cli_getblock.py → tests/floresta-cli/getblock-test.py
diff --git a/tests/floresta_cli_getblockchaininfo.py → tests/floresta-cli/getblockchaininfo-test.py b/tests/floresta_cli_getblockchaininfo.py → tests/floresta-cli/getblockchaininfo-test.py
diff --git a/tests/floresta_cli_getblockhash.py → tests/floresta-cli/getblockhash-test.py b/tests/floresta_cli_getblockhash.py → tests/floresta-cli/getblockhash-test.py
diff --git a/tests/floresta_cli_getblockheader.py → tests/floresta-cli/getblockheader-test.py b/tests/floresta_cli_getblockheader.py → tests/floresta-cli/getblockheader-test.py
diff --git a/tests/floresta_cli_getmemoryinfo.py → tests/floresta-cli/getmemoryinfo-test.py b/tests/floresta_cli_getmemoryinfo.py → tests/floresta-cli/getmemoryinfo-test.py
diff --git a/tests/floresta_cli_getpeerinfo.py → tests/floresta-cli/getpeerinfo-test.py b/tests/floresta_cli_getpeerinfo.py → tests/floresta-cli/getpeerinfo-test.py
diff --git a/tests/floresta_cli_getroots.py → tests/floresta-cli/getroots-test.py b/tests/floresta_cli_getroots.py → tests/floresta-cli/getroots-test.py
diff --git a/tests/floresta_cli_getrpcinfo.py → tests/floresta-cli/getrpcinfo-test.py b/tests/floresta_cli_getrpcinfo.py → tests/floresta-cli/getrpcinfo-test.py
diff --git a/tests/floresta_cli_stop.py → tests/floresta-cli/stop-test.py b/tests/floresta_cli_stop.py → tests/floresta-cli/stop-test.py
diff --git a/tests/floresta_cli_uptime.py → tests/floresta-cli/uptime-test.py b/tests/floresta_cli_uptime.py → tests/floresta-cli/uptime-test.py
diff --git a/tests/restart.py → tests/florestad/restart-test.py b/tests/restart.py → tests/florestad/restart-test.py
diff --git a/tests/prepare.sh b/tests/prepare.sh
@@ -35,11 +35,11 @@ then
 	exit 1
 fi
 
-poetry -V  &>/dev/null
+uv -V  &>/dev/null
 
 if [ $? -ne 0 ]
 then
-	echo "You must have poetry installed to run those tests!"
+	echo "You must have uv installed to run those tests!"
 	exit 1
 fi
 

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,2 +1,4 @@
-jsonrpclib==0.2.1
-requests==2.32.3
+jsonrpclib>=0.2.1
+requests>=2.32.3
+black>=24.10.0
+pylint>=3.3.2
diff --git a/tests/run.sh b/tests/run.sh
@@ -26,6 +26,7 @@ ORIGINAL_PATH=$PATH
 export PATH="$FLORESTA_BIN_DIR:$UTREEXO_BIN_DIR:$PATH"
 
 # Actually runs the tests
-poetry run poe tests
+uv run tests/run_tests.py
+
 # Restores the original PATH
 export PATH=$ORIGINAL_PATH