fix stop block implementation for test-run

Author: sduchesneau

core/src/subgraph/instance_manager.rs

@@ -623,16 +623,6 @@ where
 
             let block_ptr = block.ptr();
 
-            match ctx.inputs.stop_block.clone() {
-                Some(stop_block) => {
-                    if block_ptr.number > stop_block {
-                        info!(&logger, "stop block reached for subgraph");
-                        return Ok(());
-                    }
-                }
-                _ => {}
-            }
-
             if block.trigger_count() > 0 {
                 subgraph_metrics
                     .block_trigger_count
@@ -680,6 +670,16 @@ where
             let elapsed = start.elapsed().as_secs_f64();
             subgraph_metrics.block_processing_duration.observe(elapsed);
 
+            match ctx.inputs.stop_block.clone() {
+                Some(stop_block) => {
+                    if block_ptr.number > stop_block {
+                        info!(&logger, "stop block reached for subgraph");
+                        return Ok(());
+                    }
+                }
+                _ => {}
+            }
+
             match res {
                 Ok(needs_restart) => {
                     // Keep trying to unfail subgraph for everytime it advances block(s) until it's

node/src/manager/commands/test_run.rs

@@ -196,6 +196,7 @@ pub async fn run(
             info!(&logger, "subgraph now at block {}, reached stop block {}", block_ptr.number, stop_block);
             break;
         }
+        info!(&logger, "subgraph not at block ok, block {}, wanted {}", block_ptr.number, stop_block);
 
     }
     info!(&logger, "Removing subgraph {}", name);