test upgrade fix

tests/integration_tests/test_upgrade.py

@@ -19,6 +19,7 @@
     wait_for_block,
     wait_for_block_time,
     wait_for_port,
+    find_log_event_attrs,
 )
 
 
@@ -117,12 +118,24 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
         },
     )
     assert rsp["code"] == 0, rsp["raw_log"]
-
+    print("Rsp: ", rsp)
     # get proposal_id
-    ev = parse_events(rsp["logs"])["submit_proposal"]
+
+    rsp = cli.event_query_tx_for(rsp["txhash"])
+    print("Rsp: ", rsp)
+
+    def cb(attrs):
+        return "proposal_id" in attrs
+
+    ev = find_log_event_attrs(rsp["events"], "submit_proposal", cb)
+
+    print("Ev: ", rsp)
+
     proposal_id = ev["proposal_id"]
 
     rsp = cli.gov_vote("validator", proposal_id, "yes")
+    print("Rsp: ", rsp)
+
     assert rsp["code"] == 0, rsp["raw_log"]
     # rsp = custom_ethermint.cosmos_cli(1).gov_vote("validator", proposal_id, "yes")
     # assert rsp["code"] == 0, rsp["raw_log"]

tests/integration_tests/utils.py

@@ -249,6 +249,13 @@ def parse_events(logs):
         for ev in logs[0]["events"]
     }
 
+def find_log_event_attrs(events, ev_type, cond=None):
+    for ev in events:
+        if ev["type"] == ev_type:
+            attrs = {attr["key"]: attr["value"] for attr in ev["attributes"]}
+            if cond is None or cond(attrs):
+                return attrs
+    return None
 
 def derive_new_account(n=1):
     # derive a new address