REMOVE: legacy tag from reth (#2191)

* FIX: Molecule Test * REMOVE: legacy tag from reth * small fix
stereum-dev · Feb 19, 2025 · f44bbbb · f44bbbb
1 parent b72302d
commit f44bbbb
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 42 deletions.
diff --git a/controls/roles/manage-service/molecule/notifications/verify.yml b/controls/roles/manage-service/molecule/notifications/verify.yml
@@ -3,41 +3,41 @@
   hosts: all
   gather_facts: false
   tasks:
-  - uri:
-      url: http://localhost:3000/api/alertmanager/grafana/config/api/v1/alerts
-      body_format: json
-    register: alertmanager_list
-  - debug:
-      msg: "{{ alertmanager_list }}"
-  - assert:
-      that:
-      - alertmanager_list.json.alertmanager_config.receivers[0].name == "stereum-notifier"
-  - shell: docker ps
-    register: stereum_docker_ps
-  - debug:
-      msg: "{{ stereum_docker_ps }}"
-  - assert:
-      that:
-      - stereum_docker_ps.stdout.find("grafana/grafana") != -1
-      - stereum_docker_ps.stdout.find("prom/prometheus") != -1
-      - stereum_docker_ps.stdout.find("stereum/notifications") != -1
-      - stereum_docker_ps.stdout.find("prom/node-exporter") != -1
-      - (stereum_docker_ps.stdout|regex_findall("Up")|length) == 4
-  - docker_container_info:
-      name: stereum-1738844e-3164-47de-85a8-ac7d07f2ee31
-    register: notification_container
-  - debug:
-      msg: "{{ notification_container }}"
-  - assert:
-      that:
-      - notification_container.container.NetworkSettings.Networks.stereum.Aliases is search("notifications")
-  
-  - stat: path=/opt/app/services/62aa1873-7b62-410b-ae8e-2cd8615165b9/grafana/provisioning/alerting/HardwareAlerts.yaml
-    register: grafana_alerts
-  - debug:
-      msg: "{{ grafana_alerts }}"
-  - name: Check for grafana alert files
-    assert:
-      that:
-        - grafana_alerts.stat.exists
+    - uri:
+        url: http://localhost:3000/api/alertmanager/grafana/config/api/v1/alerts
+        body_format: json
+      register: alertmanager_list
+    - debug:
+        msg: "{{ alertmanager_list }}"
+    - assert:
+        that:
+          - alertmanager_list.json.alertmanager_config.receivers | selectattr("name", "equalto", "stereum-notifier") | list | length == 1
+    - shell: docker ps
+      register: stereum_docker_ps
+    - debug:
+        msg: "{{ stereum_docker_ps }}"
+    - assert:
+        that:
+          - stereum_docker_ps.stdout.find("grafana/grafana") != -1
+          - stereum_docker_ps.stdout.find("prom/prometheus") != -1
+          - stereum_docker_ps.stdout.find("stereum/notifications") != -1
+          - stereum_docker_ps.stdout.find("prom/node-exporter") != -1
+          - (stereum_docker_ps.stdout|regex_findall("Up")|length) == 4
+    - docker_container_info:
+        name: stereum-1738844e-3164-47de-85a8-ac7d07f2ee31
+      register: notification_container
+    - debug:
+        msg: "{{ notification_container }}"
+    - assert:
+        that:
+          - notification_container.container.NetworkSettings.Networks.stereum.Aliases is search("notifications")
+
+    - stat: path=/opt/app/services/62aa1873-7b62-410b-ae8e-2cd8615165b9/grafana/provisioning/alerting/HardwareAlerts.yaml
+      register: grafana_alerts
+    - debug:
+        msg: "{{ grafana_alerts }}"
+    - name: Check for grafana alert files
+      assert:
+        that:
+          - grafana_alerts.stat.exists
 # EOF
diff --git a/controls/roles/update-changes/molecule/224/prepare.yml b/controls/roles/update-changes/molecule/224/prepare.yml
@@ -239,6 +239,7 @@
             - --authrpc.jwtsecret=/engine.jwt
             - --metrics=0.0.0.0:6060
             - --color=never
+            - --engine.legacy
           entrypoint:
             - /usr/local/bin/reth
           env: {}

diff --git a/controls/roles/update-changes/molecule/224/verify.yml b/controls/roles/update-changes/molecule/224/verify.yml
@@ -77,5 +77,5 @@
           - PrysmValdiator_service_configuration.command | select('match', '--beacon-rest-api-provider') | length == 1
           - PrysmValdiator_service_configuration.command | select('match', '--enable-beacon-rest-api') | length == 1
           - PrysmValdiator_service_configuration.command | select('match', '--beacon-rpc-gateway-provider') | length == 0
-          - Reth_service_configuration.command | select('match', '--engine.legacy') | length == 1
+          - Reth_service_configuration.command | select('match', '--engine.legacy') | length == 0
 # EOF
diff --git a/controls/roles/update-changes/tasks/2.2.4/reth_changes.yaml b/controls/roles/update-changes/tasks/2.2.4/reth_changes.yaml
@@ -12,18 +12,18 @@
   ansible.utils.update_fact:
     updates:
       - path: service_configuration.command
-        value: "{{ service_configuration.command + ['--engine.legacy'] }}"
+        value: "{{ service_configuration.command | difference(['--engine.legacy']) }}"
   register: updated
   when:
     - service_configuration.service == "RethService"
-    - "'--engine.legacy' not in service_configuration.command"
+    - "'--engine.legacy' in service_configuration.command"
 
 - name: update config
   set_fact:
     service_configuration: "{{ updated.service_configuration }}"
   when:
     - service_configuration.service == "RethService"
-    - "'--engine.legacy' not in service_configuration.command"
+    - "'--engine.legacy' in service_configuration.command"
 
 - name: Write Config
   copy:

diff --git a/launcher/src/backend/ethereum-services/RethService.js b/launcher/src/backend/ethereum-services/RethService.js
@@ -20,7 +20,6 @@ export class RethService extends NodeService {
         `node`,
         `--chain=${network}`,
         `--datadir=${dataDir}`,
-        "--engine.legacy",
         "--http",
         "--http.port=8545",
         "--http.addr=0.0.0.0",