Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: move subgraph param to TestContext #5342

Merged
merged 1 commit into from
Apr 15, 2024
Merged

tests: move subgraph param to TestContext #5342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions tests/integration-tests/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,10 +904,10 @@
which "2.0.2"
yaml "1.10.2"

"@graphprotocol/graph-ts@0.31.0":
version "0.31.0"
resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.31.0.tgz#730668c0369828b31bef81e8d9bc66b9b48e3480"
integrity sha512-xreRVM6ho2BtolyOh2flDkNoGZximybnzUnF53zJVp0+Ed0KnAlO1/KOCUYw06euVI9tk0c9nA2Z/D5SIQV2Rg==
"@graphprotocol/graph-ts@0.34.0":
version "0.34.0"
resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.34.0.tgz#ca47398295b114f25b412faa364b98af31fa2bb7"
integrity sha512-gnhjai65AV4YMYe9QHGz+HP/jdzI54z/nOfEXZFfh6m987EP2iy3ycLXrTi+ahcogHH7vtoWFdXbUzZbE8bCAg==
dependencies:
assemblyscript "0.19.10"

Expand Down
51 changes: 33 additions & 18 deletions tests/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ use tokio::task::JoinError;
use tokio::time::sleep;

type TestFn = Box<
dyn FnOnce(Subgraph, TestContext) -> Pin<Box<dyn Future<Output = anyhow::Result<()>> + Send>>
dyn FnOnce(TestContext) -> Pin<Box<dyn Future<Output = anyhow::Result<()>> + Send>>
+ Sync
+ Send,
>;

struct TestContext {}
struct TestContext {
subgraph: Subgraph,
}

enum TestStatus {
Ok,
Expand Down Expand Up @@ -94,15 +96,15 @@ struct TestCase {
}

impl TestCase {
fn new<T>(name: &str, test: fn(Subgraph, TestContext) -> T) -> Self
fn new<T>(name: &str, test: fn(TestContext) -> T) -> Self
where
T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
{
fn force_boxed<T>(f: fn(Subgraph, TestContext) -> T) -> TestFn
fn force_boxed<T>(f: fn(TestContext) -> T) -> TestFn
where
T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
{
Box::new(move |sg, ctx| Box::pin(f(sg, ctx)))
Box::new(move |ctx| Box::pin(f(ctx)))
}

Self {
Expand Down Expand Up @@ -142,11 +144,13 @@ impl TestCase {
status!(&self.name, "Subgraph ({}) has failed", subgraph.deployment);
}

let ctx = TestContext {};
let ctx = TestContext {
subgraph: subgraph.clone(),
};

status!(&self.name, "Starting test");
let subgraph2 = subgraph.clone();
let res = tokio::spawn(async move { (self.test)(subgraph, ctx).await }).await;
let res = tokio::spawn(async move { (self.test)(ctx).await }).await;
let status = match res {
Ok(Ok(())) => {
status!(&self.name, "Test succeeded");
Expand Down Expand Up @@ -227,7 +231,8 @@ pub async fn query_succeeds(
* the `cases` variable in `integration_tests`.
*/

async fn test_int8(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_int8(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);

let resp = subgraph
Expand Down Expand Up @@ -259,7 +264,8 @@ async fn test_int8(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()>
* the `cases` variable in `integration_tests`.
*/

async fn test_timestamp(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_timestamp(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);

let resp = subgraph
Expand All @@ -286,7 +292,8 @@ async fn test_timestamp(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result
Ok(())
}

async fn test_block_handlers(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_block_handlers(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);

// test non-filtered blockHandler
Expand Down Expand Up @@ -423,7 +430,8 @@ async fn test_block_handlers(subgraph: Subgraph, _ctx: TestContext) -> anyhow::R
Ok(())
}

async fn test_eth_api(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_eth_api(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);

let expected_response = json!({
Expand All @@ -445,7 +453,8 @@ async fn test_eth_api(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<(
Ok(())
}

async fn test_ganache_reverts(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_ganache_reverts(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);

let exp = json!({
Expand Down Expand Up @@ -473,12 +482,14 @@ async fn test_ganache_reverts(subgraph: Subgraph, _ctx: TestContext) -> anyhow::
Ok(())
}

async fn test_host_exports(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_host_exports(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);
Ok(())
}

async fn test_non_fatal_errors(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_non_fatal_errors(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(!subgraph.healthy);

let query = "query GetSubgraphFeatures($deployment: String!) {
Expand Down Expand Up @@ -522,7 +533,8 @@ async fn test_non_fatal_errors(subgraph: Subgraph, _ctx: TestContext) -> anyhow:
Ok(())
}

async fn test_overloaded_functions(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_overloaded_functions(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
// all overloads of the contract function are called
assert!(subgraph.healthy);

Expand Down Expand Up @@ -552,7 +564,8 @@ async fn test_overloaded_functions(subgraph: Subgraph, _ctx: TestContext) -> any
Ok(())
}

async fn test_value_roundtrip(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_value_roundtrip(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);

let exp = json!({
Expand All @@ -570,7 +583,8 @@ async fn test_value_roundtrip(subgraph: Subgraph, _ctx: TestContext) -> anyhow::
Ok(())
}

async fn test_remove_then_update(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_remove_then_update(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
assert!(subgraph.healthy);

let exp = json!({
Expand All @@ -588,7 +602,8 @@ async fn test_remove_then_update(subgraph: Subgraph, _ctx: TestContext) -> anyho
Ok(())
}

async fn test_poi_for_failed_subgraph(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
async fn test_poi_for_failed_subgraph(ctx: TestContext) -> anyhow::Result<()> {
let subgraph = ctx.subgraph;
const INDEXING_STATUS: &str = r#"
query statuses($subgraphName: String!) {
statuses: indexingStatusesForSubgraphName(subgraphName: $subgraphName) {
Expand Down
Loading