Debug C2d connection (towards #606)

.github/workflows/pytest.yml

@@ -33,27 +33,33 @@ jobs:
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
         run: |
-          bash -x start_ocean.sh --no-dashboard 2>&1 --with-rbac --with-provider2 --with-c2d --with-thegraph > start_ocean.log &
-      - name: Install dependencies
-        working-directory: ${{ github.workspace }}
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements_dev.txt
+          bash -x start_ocean.sh --no-dashboard 2>&1 --with-rbac --with-provider2 --with-c2d --with-thegraph --skip-subgraph-deploy > start_ocean.log &
       - name: Wait for contracts deployment and C2D cluster to be ready
         working-directory: ${{ github.workspace }}/barge
         run: |
           for i in $(seq 1 250); do
             sleep 10
             [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" -a -f "$HOME/.ocean/ocean-c2d/ready" ] && break
             done
-
+      - name: Verify deployments
+        run: |
+          netstat -lnpt
+          nc -zv 172.15.0.13 31000
+          cat $HOME/.ocean/ocean-contracts/artifacts/address.json
+          curl http://172.15.0.13:31000
+          nc -zv 172.15.0.16 8080
+      - name: Install dependencies
+        working-directory: ${{ github.workspace }}
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements_dev.txt
       - name: Test with pytest
         run: |
           coverage run --source ocean_provider -m pytest
           coverage report
           coverage xml
       - name:  docker logs
-        run: docker logs ocean_aquarius_1 && docker logs ocean_provider_1 && docker logs ocean_provider2_1
+        run: docker logs ocean_aquarius_1 && docker logs ocean_provider_1 && docker logs ocean_provider2_1 && docker logs ocean_ipfs_1
         if: ${{ failure() }}
       - name: Publish code coverage
         uses: paambaati/[email protected]

compose-env-values

@@ -7,7 +7,7 @@ PROVIDER_ADDRESS=068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0
 NETWORK_URL=wss://rinkeby.infura.io/ws/v3/357f2fe737db4304bd2f7285c5602d0d
 AQUARIUS_URL=https://aquarius.marketplace.dev-ocean.com
 OCEAN_PROVIDER_URL=http://0.0.0.0:8030
-OPERATOR_SERVICE_URL=https://operator-api.operator.dev-ocean.com/
+OPERATOR_SERVICE_URL=https://stagev4.c2d.oceanprotocol.com
 
 AZURE_ACCOUNT_NAME=
 AZURE_ACCOUNT_KEY=

conftest.py

@@ -96,19 +96,13 @@ def web3():
 
 @pytest.fixture
 def free_c2d_env():
-    try:
-        environments = get_c2d_environments(flat=True)
-    except AssertionError:
-        pytest.skip("C2D connection failed. Need fix in #610")
+    environments = get_c2d_environments(flat=True)
 
     return next(env for env in environments if float(env["priceMin"]) == float(0))
 
 
 @pytest.fixture
 def paid_c2d_env():
-    try:
-        environments = get_c2d_environments(flat=True)
-    except AssertionError:
-        pytest.skip("C2D connection failed. Need fix in #610")
+    environments = get_c2d_environments(flat=True)
 
     return next(env for env in environments if env["id"] == "ocean-compute-env2")

ocean_provider/utils/basics.py

@@ -53,7 +53,7 @@ def get_configured_chains():
 
     if not decoded:
         web3 = get_web3(os.environ.get("NETWORK_URL"))
-        return [web3.chain_id]
+        return [web3.eth.chain_id]
 
     return [int(key) for key in decoded.keys()]
 

ocean_provider/utils/compute_environments.py

@@ -2,6 +2,7 @@
 from urllib.parse import urljoin
 
 import requests
+
 from ocean_provider.requests_session import get_requests_session
 from ocean_provider.utils.address import get_provider_fee_token
 from ocean_provider.utils.basics import get_configured_chains
@@ -17,7 +18,7 @@ def get_c2d_environments(flat=False):
     if not os.getenv("OPERATOR_SERVICE_URL"):
         return []
 
-    standard_headers = {"Content-type": "application/json", "Connection": "close"}
+    standard_headers = {"Content-Type": "application/json", "Connection": "close"}
     all_environments = [] if flat else {}
 
     for chain in get_configured_chains():

start_provider.sh → start_local_provider.sh

@@ -2,7 +2,7 @@
 export PROVIDER_PRIVATE_KEY=0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215
 export TEST_PRIVATE_KEY1=0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209
 export TEST_PRIVATE_KEY2=0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8
-export OPERATOR_SERVICE_URL=https://c2d-dev.operator.oceanprotocol.com/
+export OPERATOR_SERVICE_URL=http://172.15.0.13:31000
 export ADDRESS_FILE=~/.ocean/ocean-contracts/artifacts/address.json
 export IPFS_GATEWAY=http://172.15.0.16:8080
 export AUTHORIZED_DECRYPTERS=[]

tests/test_compute.py

@@ -27,7 +27,6 @@
     get_registered_asset,
     mint_100_datatokens,
     post_to_compute,
-    skip_on,
     start_order,
 )
 from tests.helpers.ddo_dict_builders import build_metadata_dict_type_algorithm
@@ -44,7 +43,6 @@ def test_compute_rejected(client, monkeypatch):
 
 @pytest.mark.integration
 @pytest.mark.parametrize("allow_raw_algos", [True, False])
-@skip_on(AssertionError, "C2D connection failed. Need fix in #610")
 def test_compute_raw_algo(
     client,
     publisher_wallet,
@@ -120,7 +118,6 @@ def test_compute_raw_algo(
 
 
 @pytest.mark.integration
-@skip_on(AssertionError, "C2D connection failed. Need fix in #610")
 def test_compute_specific_algo_dids(
     client, publisher_wallet, consumer_wallet, consumer_address, free_c2d_env
 ):
@@ -166,7 +163,6 @@ def test_compute_specific_algo_dids(
 
 
 @pytest.mark.integration
-@skip_on(AssertionError, "C2D connection failed. Need fix in #610")
 def test_compute(client, publisher_wallet, consumer_wallet, free_c2d_env):
     valid_until = get_future_valid_until()
     ddo, tx_id, alg_ddo, alg_tx_id = build_and_send_ddo_with_compute_service(
@@ -293,7 +289,6 @@ def test_compute(client, publisher_wallet, consumer_wallet, free_c2d_env):
 
 
 @pytest.mark.integration
-@skip_on(AssertionError, "C2D connection failed. Need fix in #610")
 def test_compute_arweave(client, publisher_wallet, consumer_wallet, free_c2d_env):
     valid_until = get_future_valid_until()
     ddo, tx_id, alg_ddo, alg_tx_id = build_and_send_ddo_with_compute_service(
@@ -331,7 +326,6 @@ def test_compute_arweave(client, publisher_wallet, consumer_wallet, free_c2d_env
 
 
 @pytest.mark.integration
-@skip_on(requests.exceptions.ConnectionError, "C2D connection failed. Need fix in #610")
 def test_compute_diff_provider(client, publisher_wallet, consumer_wallet, free_c2d_env):
     valid_until = get_future_valid_until()
     ddo, tx_id, alg_ddo, alg_tx_id = build_and_send_ddo_with_compute_service(
@@ -367,7 +361,6 @@ def test_compute_diff_provider(client, publisher_wallet, consumer_wallet, free_c
 
 
 @pytest.mark.integration
-@skip_on(requests.exceptions.ConnectionError, "C2D connection failed. Need fix in #610")
 def test_compute_allow_all_published(
     client, publisher_wallet, consumer_wallet, free_c2d_env
 ):
@@ -415,7 +408,6 @@ def test_compute_allow_all_published(
 
 
 @pytest.mark.integration
-@skip_on(requests.exceptions.ConnectionError, "C2D connection failed. Need fix in #610")
 def test_compute_additional_input(
     client, publisher_wallet, consumer_wallet, monkeypatch, free_c2d_env, web3
 ):
@@ -501,7 +493,6 @@ def test_compute_additional_input(
 
 
 @pytest.mark.integration
-@skip_on(requests.exceptions.ConnectionError, "C2D connection failed. Need fix in #610")
 def test_compute_delete_job(
     client, publisher_wallet, consumer_wallet, consumer_address, free_c2d_env
 ):
@@ -567,7 +558,6 @@ def test_compute_delete_job(
 
 
 @pytest.mark.unit
-@skip_on(AssertionError, "C2D connection failed. Need fix in #610")
 def test_compute_environments():
     environments = get_c2d_environments()
 
@@ -577,7 +567,6 @@ def test_compute_environments():
 
 
 @pytest.mark.integration
-@skip_on(requests.exceptions.ConnectionError, "C2D connection failed. Need fix in #610")
 def test_compute_paid_env(
     client, publisher_wallet, consumer_wallet, paid_c2d_env, web3
 ):
@@ -627,7 +616,6 @@ def test_compute_paid_env(
 
 
 @pytest.mark.integration
-@skip_on(requests.exceptions.ConnectionError, "C2D connection failed. Need fix in #610")
 def test_compute_auth_token(client, publisher_wallet, consumer_wallet, free_c2d_env):
     valid_until = get_future_valid_until()
     ddo, tx_id, alg_ddo, alg_tx_id = build_and_send_ddo_with_compute_service(

tests/test_graphql.py

@@ -23,16 +23,16 @@ def test_download_graphql_asset(client, publisher_wallet, consumer_wallet, web3)
     unencrypted_files_list = [
         {
             "type": "graphql",
-            "url": "http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph",
+            "url": "http://172.15.0.15:8030/graphql",
             "query": """
-                    query{
-                        nfts(orderBy: createdTimestamp,orderDirection:desc){
-                            id
-                            symbol
-                            createdTimestamp
+                        query {
+                            indexingStatuses {
+                              subgraph
+                              chains
+                              node
+                            }
                         }
-                    }
-                    """,
+                        """,
         }
     ]
     asset = get_registered_asset(
@@ -79,15 +79,15 @@ def test_download_graphql_asset_with_userdata(
     unencrypted_files_list = [
         {
             "type": "graphql",
-            "url": "http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph",
+            "url": "http://172.15.0.15:8030/graphql",
             "query": """
-                    query nfts($nftAddress: String){
-                        nfts(where: {id:$nftAddress},orderBy: createdTimestamp,orderDirection:desc){
-                            id
-                            symbol
-                            createdTimestamp
+                    query GetSubgraph($name: [String!]){
+                          indexingStatuses(subgraphs: $name) {
+                            subgraph
+                            chains
+                            node
+                          }
                         }
-                    }
                     """,
         }
     ]
@@ -96,11 +96,12 @@ def test_download_graphql_asset_with_userdata(
         unencrypted_files_list=unencrypted_files_list,
         custom_userdata=[
             {
-                "name": "nftAddress",
+                "name": "name",
                 "type": "text",
-                "label": "nftAddress",
+                "label": "name",
                 "required": True,
-                "description": "Nft to search for",
+                "description": "Subgraph indexing status",
+                "default": ["subgraph"],
             }
         ],
     )
@@ -123,7 +124,7 @@ def test_download_graphql_asset_with_userdata(
         "consumerAddress": consumer_wallet.address,
         "transferTxId": tx_id,
         "fileIndex": 0,
-        "userdata": json.dumps({"nftAddress": asset.nftAddress.lower()}),
+        "userdata": json.dumps({"name": ["subgraph"]}),
     }
 
     download_endpoint = BaseURLs.SERVICES_URL + "/download"
@@ -137,7 +138,5 @@ def test_download_graphql_asset_with_userdata(
     )
     assert response.status_code == 200, f"{response.data}"
     reply = json.loads(response.data)
-    assert (
-        len(reply["data"]["nfts"]) == 1
-    )  # make sure our parametrized query works, otherwise we will get a lot of nfts
-    assert reply["data"]["nfts"][0]["id"] == asset.nftAddress.lower()
+    assert len(reply["data"]) == 1
+    assert "indexingStatuses" in reply["data"].keys()

tests/test_helpers.py

@@ -407,15 +407,6 @@ def get_dataset_with_invalid_url_ddo(client, wallet):
     )
 
 
-def get_dataset_with_ipfs_url_ddo(client, wallet):
-    return get_registered_asset(
-        wallet,
-        unencrypted_files_list=[
-            {"type": "ipfs", "hash": "QmXtkGkWCG47tVpiBr8f5FdHuCMPq8h2jhck4jgjSXKiWZ"}
-        ],
-    )
-
-
 def get_resource_path(dir_name, file_name):
     base = os.path.realpath(__file__).split(os.path.sep)[1:-1]
     if dir_name: