tests: Fix running integration tests multiple times

When running integration tests multiple times, we need to make sure that we
emit events only once, not once per run. Change the topic-filter test to do
just that

Author: lutter

tests/src/contract.rs

@@ -9,7 +9,7 @@ use web3::{
     api::{Eth, Namespace},
     contract::{tokens::Tokenize, Contract as Web3Contract, Options},
     transports::Http,
-    types::{Address, Block, BlockId, BlockNumber, Bytes, TransactionReceipt, H256},
+    types::{Address, Block, BlockId, BlockNumber, Bytes, TransactionReceipt, H256, U256},
 };
 // web3 version 0.18 does not expose this; once the graph crate updates to
 // version 0.19, we can use web3::signing::SecretKey from the graph crate
@@ -34,19 +34,19 @@ lazy_static! {
             },
             Contract {
                 name: "LimitedContract".to_string(),
-                address: Address::from_str("0xb7f8bc63bbcad18155201308c8f3540b07f84f5e").unwrap(),
+                address: Address::from_str("0x0b306bf915c4d645ff596e518faf3f9669b97016").unwrap(),
             },
             Contract {
                 name: "RevertingContract".to_string(),
-                address: Address::from_str("0xa51c1fc2f0d1a1b8494ed1fe312d7c3a78ed91c0").unwrap(),
+                address: Address::from_str("0x959922be3caee4b8cd9a407cc3ac1c251c2007b1").unwrap(),
             },
             Contract {
                 name: "OverloadedContract".to_string(),
-                address: Address::from_str("0x0dcd1bf9a1b36ce34237eeafef220932846bcd82").unwrap(),
+                address: Address::from_str("0x9a9f2ccfde556a7e9ff0848998aa4a0cfd8863ae").unwrap(),
             },
             Contract {
                 name: "DeclaredCallsContract".to_string(),
-                address: Address::from_str("0x9a676e781a523b5d0c0e43731313a708cb607508").unwrap(),
+                address: Address::from_str("0x68b1d87f95878fe05b998f19b66f4baba5de1aed").unwrap(),
             },
         ]
     };
@@ -195,6 +195,42 @@ impl Contract {
                         .await
                         .unwrap();
                 }
+                // The topic-filter test needs some events emitted
+                if contract.name == "SimpleContract" {
+                    status!("contracts", "Emitting anotherTrigger from SimpleContract");
+                    let args = &[
+                        (
+                            U256::from(1),
+                            U256::from(2),
+                            U256::from(3),
+                            "abc".to_string(),
+                        ),
+                        (
+                            U256::from(1),
+                            U256::from(1),
+                            U256::from(1),
+                            "abc".to_string(),
+                        ),
+                        (
+                            U256::from(4),
+                            U256::from(2),
+                            U256::from(3),
+                            "abc".to_string(),
+                        ),
+                        (
+                            U256::from(4),
+                            U256::from(4),
+                            U256::from(3),
+                            "abc".to_string(),
+                        ),
+                    ];
+                    for arg in args {
+                        contract
+                            .call("emitAnotherTrigger", arg.clone())
+                            .await
+                            .unwrap();
+                    }
+                }
             } else {
                 status!(
                     "contracts",

tests/tests/gnd_tests.rs

@@ -104,7 +104,7 @@ async fn gnd_tests() -> anyhow::Result<()> {
         .enumerate()
         .map(|(index, case)| {
             let subgraph_name = format!("subgraph-{}", num_sources + index);
-            case.check_health_and_test(&contracts, subgraph_name)
+            case.check_health_and_test(subgraph_name)
         })
         .buffered(CONFIG.num_parallel_tests);
 

tests/tests/integration_tests.rs

@@ -32,7 +32,6 @@ use graph_tests::{error, status, CONFIG};
 use tokio::process::Child;
 use tokio::task::JoinError;
 use tokio::time::sleep;
-use web3::types::U256;
 
 const SUBGRAPH_LAST_GRAFTING_BLOCK: i32 = 3;
 
@@ -44,7 +43,6 @@ type TestFn = Box<
 
 pub struct TestContext {
     pub subgraph: Subgraph,
-    pub contracts: Vec<Contract>,
 }
 
 pub enum TestStatus {
@@ -234,11 +232,7 @@ impl TestCase {
         Ok(subgraph_name)
     }
 
-    pub async fn check_health_and_test(
-        self,
-        contracts: &[Contract],
-        subgraph_name: String,
-    ) -> TestResult {
+    pub async fn check_health_and_test(self, subgraph_name: String) -> TestResult {
         status!(
             &self.name,
             "Waiting for subgraph ({}) to become ready",
@@ -264,7 +258,6 @@ impl TestCase {
 
         let ctx = TestContext {
             subgraph: subgraph.clone(),
-            contracts: contracts.to_vec(),
         };
 
         status!(&self.name, "Starting test");
@@ -323,7 +316,7 @@ impl TestCase {
                 }
             };
 
-        self.check_health_and_test(contracts, subgraph_name).await
+        self.check_health_and_test(subgraph_name).await
     }
 
     async fn prepare_multiple_sources(
@@ -671,63 +664,7 @@ async fn test_topic_filters(ctx: TestContext) -> anyhow::Result<()> {
     let subgraph = ctx.subgraph;
     assert!(subgraph.healthy);
 
-    let contract = ctx
-        .contracts
-        .iter()
-        .find(|x| x.name == "SimpleContract")
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(1),
-                U256::from(2),
-                U256::from(3),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(1),
-                U256::from(1),
-                U256::from(1),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(4),
-                U256::from(2),
-                U256::from(3),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(4),
-                U256::from(4),
-                U256::from(3),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
+    // Events we need are already emitted from Contract::deploy_all
 
     let exp = json!({
         "anotherTriggerEntities": [
@@ -1211,8 +1148,6 @@ pub async fn test_multiple_subgraph_datasources(ctx: TestContext) -> anyhow::Res
     let subgraph = ctx.subgraph;
     assert!(subgraph.healthy);
 
-    println!("subgraph: {:?}", subgraph);
-
     // Test querying data aggregated from multiple sources
     let exp = json!({
         "aggregatedDatas": [