diff --git a/raiden_contracts/deploy/__main__.py b/raiden_contracts/deploy/__main__.py
index d33c85c..ff1fc24 100644
--- a/raiden_contracts/deploy/__main__.py
+++ b/raiden_contracts/deploy/__main__.py
@@ -51,9 +51,17 @@ def validate_address(_, _param, value):
         raise click.BadParameter('must be a valid ethereum address')
 
 
-def error_removed_option(_, param, value):
-    if value is not None:
-        raise click.NoSuchOption(f'--{param.name.replace("_", "-")} is no longer a valid option')
+def error_removed_option(message: str):
+    """ Takes a message and returns a callback that raises NoSuchOption
+
+    if the value is not None. The message is used as an argument to NoSuchOption. """
+    def f(_, param, value):
+        if value is not None:
+            raise click.NoSuchOption(
+                f'--{param.name.replace("_", "-")} is no longer a valid option. ' +
+                message,
+            )
+    return f
 
 
 def common_options(func):
@@ -373,7 +381,7 @@ def token(
 @click.option(
     '--registry-address',
     default=None,
-    callback=error_removed_option,
+    callback=error_removed_option('Use --token-network-registry-address'),
     hidden=True,
     help='Renamed into --token-network-registry-address',
 )

Suggest the new option --token-network-registry-address when refusing --registry-address
When `deploy register` is called with `--registry-address`, the script shows
```
Error: no such option: --registry-address is no longer a valid option
```

The script should also show the new option `--token-network-registry-address`.
diff --git a/raiden_contracts/tests/test_deploy_script.py b/raiden_contracts/tests/test_deploy_script.py
index 58b17b7..18a21d2 100644
--- a/raiden_contracts/tests/test_deploy_script.py
+++ b/raiden_contracts/tests/test_deploy_script.py
@@ -451,4 +451,4 @@ def test_red_eyes_deployer(web3):
 def test_error_removed_option_raises():
     with pytest.raises(NoSuchOption):
         mock = MagicMock()
-        error_removed_option(None, mock, '0xaabbcc')
+        error_removed_option('msg')(None, mock, '0xaabbcc')

pip install -U -r requirements-dev.txt && pip install -e .
parse_log_pytest
requirements.txt
pytest
3.7
requirements.txt requirements-dev.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
asn1crypto==1.5.1
astroid==2.3.0
attrdict==2.0.1
attrs==24.2.0
bump2version==1.0.1
certifi @ file:///croot/certifi_1671487769961/work/certifi
cffi==1.15.1
charset-normalizer==3.4.1
click==8.1.8
coincurve==18.0.0
coverage==7.2.7
cryptography==2.9.2
cytoolz==0.12.3
eth-abi==1.2.2
eth-account==0.3.0
eth-bloom==1.0.4
eth-hash==0.3.3
eth-keyfile==0.5.1
eth-keys==0.2.4
eth-rlp==0.2.1
eth-tester==0.1.0b32
eth-typing==1.3.0
eth-utils==1.8.1
exceptiongroup==1.2.2
flake8==3.5.0
flake8-bugbear==23.3.12
flake8-commas==2.1.0
flake8-tuple==0.4.1
hexbytes==0.3.1
hypothesis==3.44.14
idna==3.10
importlib-metadata==6.7.0
iniconfig==2.0.0
isort==4.3.21
lazy-object-proxy==1.9.0
lru-dict==1.2.0
mccabe==0.6.1
mypy==0.670
mypy-extensions==0.4.4
packaging==24.0
parsimonious==0.8.1
pluggy==1.2.0
py-ecc==1.4.7
py-evm==0.2.0a32
py-solc==3.2.0
pycodestyle==2.3.1
pycparser==2.21
pycryptodome==3.22.0
pyethash==0.1.27
pyfakefs==5.8.0
pyflakes==1.6.0
pylint==2.4.4
pylint-quotes==0.2.1
pytest==7.4.4
pytest-cov==4.1.0
-e git+https://github.com/raiden-network/raiden-contracts.git@a299650f47ddb81de2c2bacd3d43a9af9ffcc935#egg=raiden_contracts
requests==2.31.0
requests-mock==1.12.1
rlp==1.2.0
semantic-version==2.10.0
semver==3.0.4
six==1.17.0
tomli==2.0.1
toolz==0.12.1
trie==1.4.0
typed-ast==1.3.5
typing_extensions==4.7.1
urllib3==2.0.7
web3==4.10.0
websockets==6.0
wrapt==1.16.0
zipp==3.15.0

name: raiden-contracts
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2022.12.7=py37h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=22.3.1=py37h06a4308_0
  - python=3.7.16=h7a1cb2a_0
  - readline=8.2=h5eee18b_0
  - setuptools=65.6.3=py37h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.38.4=py37h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - asn1crypto==1.5.1
      - astroid==2.3.0
      - attrdict==2.0.1
      - attrs==24.2.0
      - bump2version==1.0.1
      - cffi==1.15.1
      - charset-normalizer==3.4.1
      - click==8.1.8
      - coincurve==18.0.0
      - coverage==7.2.7
      - cryptography==2.9.2
      - cytoolz==0.12.3
      - eth-abi==1.2.2
      - eth-account==0.3.0
      - eth-bloom==1.0.4
      - eth-hash==0.3.3
      - eth-keyfile==0.5.1
      - eth-keys==0.2.4
      - eth-rlp==0.2.1
      - eth-tester==0.1.0b32
      - eth-typing==1.3.0
      - eth-utils==1.8.1
      - exceptiongroup==1.2.2
      - flake8==3.5.0
      - flake8-bugbear==23.3.12
      - flake8-commas==2.1.0
      - flake8-tuple==0.4.1
      - hexbytes==0.3.1
      - hypothesis==3.44.14
      - idna==3.10
      - importlib-metadata==6.7.0
      - iniconfig==2.0.0
      - isort==4.3.21
      - lazy-object-proxy==1.9.0
      - lru-dict==1.2.0
      - mccabe==0.6.1
      - mypy==0.670
      - mypy-extensions==0.4.4
      - packaging==24.0
      - parsimonious==0.8.1
      - pluggy==1.2.0
      - py-ecc==1.4.7
      - py-evm==0.2.0a32
      - py-solc==3.2.0
      - pycodestyle==2.3.1
      - pycparser==2.21
      - pycryptodome==3.22.0
      - pyethash==0.1.27
      - pyfakefs==5.8.0
      - pyflakes==1.6.0
      - pylint==2.4.4
      - pylint-quotes==0.2.1
      - pytest==7.4.4
      - pytest-cov==4.1.0
      - requests==2.31.0
      - requests-mock==1.12.1
      - rlp==1.2.0
      - semantic-version==2.10.0
      - semver==3.0.4
      - six==1.17.0
      - tomli==2.0.1
      - toolz==0.12.1
      - trie==1.4.0
      - typed-ast==1.3.5
      - typing-extensions==4.7.1
      - urllib3==2.0.7
      - web3==4.10.0
      - websockets==6.0
      - wrapt==1.16.0
      - zipp==3.15.0
prefix: /opt/conda/envs/raiden-contracts

raiden_contracts/tests/test_deploy_script.py::test_error_removed_option_raises
raiden_contracts/tests/test_deploy_script.py::test_contract_version_with_max_token_networks[0.3._-False] raiden_contracts/tests/test_deploy_script.py::test_contract_version_with_max_token_networks[0.4.0-False] raiden_contracts/tests/test_deploy_script.py::test_contract_version_with_max_token_networks[0.8.0-False] raiden_contracts/tests/test_deploy_script.py::test_contract_version_with_max_token_networks[0.9.0-True] raiden_contracts/tests/test_deploy_script.py::test_contract_version_with_max_token_networks[0.10.0-True] raiden_contracts/tests/test_deploy_script.py::test_contract_version_with_max_token_networks[None-True] raiden_contracts/tests/test_deploy_script.py::test_deploy_script_raiden[None-1] raiden_contracts/tests/test_deploy_script.py::test_deploy_script_raiden[0.3._-None] raiden_contracts/tests/test_deploy_script.py::test_deploy_script_token raiden_contracts/tests/test_deploy_script.py::test_deploy_script_register raiden_contracts/tests/test_deploy_script.py::test_deploy_script_service raiden_contracts/tests/test_deploy_script.py::test_validate_address_on_none raiden_contracts/tests/test_deploy_script.py::test_validate_address_empty_string raiden_contracts/tests/test_deploy_script.py::test_validate_address_not_an_address raiden_contracts/tests/test_deploy_script.py::test_validate_address_happy_path raiden_contracts/tests/test_deploy_script.py::test_store_and_verify_raiden raiden_contracts/tests/test_deploy_script.py::test_store_and_verify_services raiden_contracts/tests/test_deploy_script.py::test_red_eyes_deployer
raiden_contracts/deploy/__main__.py
raiden_contracts/deploy/__main__.py