Fix some todos. (#265)

ocean_provider/validation/algo.py

@@ -290,7 +290,6 @@ def validate(self):
             self.error = "Service for main asset must be compute."
             return False
 
-        # TODO: add files to compute service (encryptedFiles)
         asset_urls = get_service_files_list(self.service, self.provider_wallet)
 
         if self.service.type == "compute" and not asset_urls:

tests/test_RBAC.py

@@ -20,7 +20,7 @@
 )
 from tests.test_helpers import (
     BLACK_HOLE_ADDRESS,
-    get_dataset_asset_with_access_service,
+    get_registered_asset,
     mint_100_datatokens,
     start_order,
 )
@@ -64,7 +64,7 @@ def test_encrypt_request_payload(consumer_wallet, publisher_wallet):
 def test_initialize_request_payload(
     client, publisher_wallet, consumer_wallet, provider_address, web3
 ):
-    asset = get_dataset_asset_with_access_service(client, publisher_wallet)
+    asset = get_registered_asset(publisher_wallet)
     service = asset.get_service_by_type(ServiceType.ACCESS)
     mint_100_datatokens(
         web3, service.datatoken_address, consumer_wallet.address, publisher_wallet
@@ -94,7 +94,7 @@ def test_initialize_request_payload(
 def test_access_request_payload(
     client, publisher_wallet, consumer_wallet, provider_address, web3
 ):
-    asset = get_dataset_asset_with_access_service(client, publisher_wallet)
+    asset = get_registered_asset(publisher_wallet)
     service = asset.get_service_by_type(ServiceType.ACCESS)
     mint_100_datatokens(
         web3, service.datatoken_address, consumer_wallet.address, publisher_wallet
@@ -189,13 +189,7 @@ def test_compute_request_payload(
     ddo2 = get_registered_asset(
         publisher_wallet,
         custom_services="vanilla_compute",
-        custom_services_args=[
-            {
-                "did": alg_ddo.did,
-                "filesChecksum": "TODO",
-                "containerSectionChecksum": "TODO",
-            }
-        ],
+        custom_services_args=ddo.services[0].compute_dict["publisherTrustedAlgorithms"],
     )
 
     web3 = get_web3()

tests/test_download.py

@@ -10,13 +10,13 @@
 from ocean_provider.utils.services import ServiceType
 from tests.test_helpers import (
     BLACK_HOLE_ADDRESS,
-    get_dataset_asset_with_access_service,
     get_dataset_ddo_disabled,
     get_dataset_ddo_with_denied_consumer,
     get_dataset_ddo_with_multiple_files,
     get_dataset_with_invalid_url_ddo,
     get_dataset_with_ipfs_url_ddo,
     get_nonce,
+    get_registered_asset,
     initialize_service,
     mint_100_datatokens,
     start_order,
@@ -25,7 +25,7 @@
 
 @pytest.mark.parametrize("userdata", [False, "valid", "invalid"])
 def test_download_service(client, publisher_wallet, consumer_wallet, web3, userdata):
-    asset = get_dataset_asset_with_access_service(client, publisher_wallet)
+    asset = get_registered_asset(publisher_wallet)
     service = asset.get_service_by_type(ServiceType.ACCESS)
     mint_100_datatokens(
         web3, service.datatoken_address, consumer_wallet.address, publisher_wallet

tests/test_fileinfo.py

@@ -6,15 +6,15 @@
 from ocean_provider.constants import BaseURLs
 from ocean_provider.utils.services import ServiceType
 from tests.test_helpers import (
-    get_dataset_asset_with_access_service,
     get_dataset_with_invalid_url_ddo,
+    get_registered_asset,
 )
 
 fileinfo_url = BaseURLs.SERVICES_URL + "/fileinfo"
 
 
 def test_asset_info(client, publisher_wallet):
-    asset = get_dataset_asset_with_access_service(client, publisher_wallet)
+    asset = get_registered_asset(publisher_wallet)
     service = asset.get_service_by_type(ServiceType.ACCESS)
     response = client.post(
         fileinfo_url,

tests/test_helpers.py

@@ -255,7 +255,6 @@ def get_registered_asset(
 
     ddo_string = json.dumps(ddo)
     ddo_bytes = ddo_string.encode("utf-8")
-    # TODO: Compress and encrypt DDO
     encrypted_ddo = ddo_bytes
     ddo_hash = sha256(ddo_bytes).hexdigest()
 
@@ -298,11 +297,6 @@ def set_metadata(
     return sign_send_and_wait_for_receipt(web3, transaction, from_wallet)
 
 
-def get_dataset_asset_with_access_service(client, wallet):
-    # TODO: remove this layer, use get_registered_asset directly
-    return get_registered_asset(wallet)
-
-
 def get_dataset_ddo_with_multiple_files(client, wallet):
     return get_registered_asset(
         wallet,

tests/test_routes.py

@@ -6,7 +6,7 @@
 from ocean_provider.run import get_provider_address, get_services_endpoints
 from ocean_provider.utils.accounts import sign_message
 from ocean_provider.utils.basics import get_provider_wallet
-from tests.test_helpers import get_dataset_asset_with_access_service, get_nonce
+from tests.test_helpers import get_registered_asset, get_nonce
 
 
 def test_get_provider_address(client):
@@ -47,7 +47,7 @@ def test_empty_payload_encryption(client):
 
 
 def test_encrypt_endpoint(client, provider_wallet, publisher_wallet):
-    asset = get_dataset_asset_with_access_service(client, publisher_wallet)
+    asset = get_registered_asset(publisher_wallet)
     files_list_str = '["https://raw.githubusercontent.com/tbertinmahieux/MSongsDB/master/Tasks_Demos/CoverSongs/shs_dataset_test.txt"]'
 
     nonce = get_nonce(client, provider_wallet.address)