graphprotocol · neysofu · Feb 13, 2023 · Jan 3, 2023 · Jan 3, 2023 · Jan 3, 2023
diff --git a/.gitignore b/.gitignore
@@ -20,12 +20,11 @@ lcov.info
 /docker/parity/network/
 **/*/tests/fixtures/ipfs_folder/random.txt
 
-/tests/integration-tests/**/build
-/tests/integration-tests/**/generated
-/tests/integration-tests/**/node_modules
-/tests/integration-tests/**/yarn.lock
-/tests/integration-tests/**/yarn-error.log
+/tests/**/build
+/tests/**/generated
+/tests/**/node_modules
+/tests/**/yarn-error.log
 
 # Built solidity contracts.
-/tests/integration-tests/**/bin
-/tests/integration-tests/**/truffle_output
+/tests/**/bin
+/tests/**/truffle_output
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -4,31 +4,31 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-port_check = "0.1.5"
 anyhow = "1.0"
+assert-json-diff = "2.0.2"
+async-stream = "0.3.3"
+bollard = "0.10"
 futures = { version = "0.3", features = ["compat"] }
 graph = { path = "../graph" }
-tokio = { version = "1.16.1", features = ["rt", "macros", "process"] }
 graph-chain-ethereum = { path = "../chain/ethereum" }
-async-stream = "0.3.3"
 graph-node = { path = "../node" }
 graph-core = { path = "../core" }
 graph-mock = { path = "../mock" }
 graph-graphql = { path = "../graphql" }
 graph-store-postgres = { path = "../store/postgres" }
 graph-runtime-wasm = { path = "../runtime/wasm" }
 graph-server-index-node = { path = "../server/index-node" }
-slog = { version = "2.7.0", features = ["release_max_level_trace", "max_level_trace"] }
 graphql-parser = "0.4.0"
-hex = "0.4.3"
-serde_yaml = "0.8"
 hyper = "0.14"
 serde = "1.0"
-assert-json-diff = "2.0.2"
+serde_yaml = "0.8"
+slog = { version = "2.7.0", features = ["release_max_level_trace", "max_level_trace"] }
+tokio = { version = "1.16.1", features = ["rt", "macros", "process"] }
+uuid = { version = "1.2.2", features = ["v4"] }
 
 [dev-dependencies]
-bollard = "0.10"
 anyhow = "1.0.69"
+bollard = "0.10"
 lazy_static = "1.4.0"
 tokio-stream = "0.1"
 serde_yaml = "0.8"

diff --git a/...ation-tests/common/1_initial_migration.js → tests/common/1_initial_migration.js b/...ation-tests/common/1_initial_migration.js → tests/common/1_initial_migration.js
diff --git a/...ration-tests/common/2_deploy_contracts.js → tests/common/2_deploy_contracts.js b/...ration-tests/common/2_deploy_contracts.js → tests/common/2_deploy_contracts.js
diff --git a/...s/integration-tests/common/Migrations.sol → tests/common/Migrations.sol b/...s/integration-tests/common/Migrations.sol → tests/common/Migrations.sol
diff --git a/...tegration-tests/common/SimpleContract.sol → tests/common/SimpleContract.sol b/...tegration-tests/common/SimpleContract.sol → tests/common/SimpleContract.sol
diff --git a/...tegration-tests/common/build-contracts.sh → tests/common/build-contracts.sh b/...tegration-tests/common/build-contracts.sh → tests/common/build-contracts.sh
diff --git a/tests/integration-tests/api-version-v0-0-4/package.json b/tests/integration-tests/api-version-v0-0-4/package.json
@@ -2,7 +2,7 @@
   "name": "api-version-v0-0-4",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/api-version-v0-0-4 --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/api-version-v0-0-4/truffle.js b/tests/integration-tests/api-version-v0-0-4/truffle.js
@@ -2,8 +2,8 @@ require("babel-register");
 require("babel-polyfill");
 
 module.exports = {
-  contracts_directory: "../common",
-  migrations_directory: "../common",
+  contracts_directory: "../../common",
+  migrations_directory: "../../common",
   contracts_build_directory: "./truffle_output",
   networks: {
     test: {

diff --git a/tests/integration-tests/ganache-reverts/package.json b/tests/integration-tests/ganache-reverts/package.json
@@ -2,7 +2,7 @@
   "name": "ganache-reverts",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/ganache-reverts --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/host-exports/package.json b/tests/integration-tests/host-exports/package.json
@@ -2,7 +2,7 @@
   "name": "host-exports",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/host-exports --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/host-exports/truffle.js b/tests/integration-tests/host-exports/truffle.js
@@ -2,8 +2,8 @@ require("babel-register");
 require("babel-polyfill");
 
 module.exports = {
-  contracts_directory: "../common",
-  migrations_directory: "../common",
+  contracts_directory: "../../common",
+  migrations_directory: "../../common",
   contracts_build_directory: "./truffle_output",
   networks: {
     test: {

diff --git a/tests/integration-tests/non-fatal-errors/package.json b/tests/integration-tests/non-fatal-errors/package.json
@@ -2,7 +2,7 @@
   "name": "non-fatal-errors",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/non-fatal-errors --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/non-fatal-errors/truffle.js b/tests/integration-tests/non-fatal-errors/truffle.js
@@ -2,8 +2,8 @@ require("babel-register");
 require("babel-polyfill");
 
 module.exports = {
-  contracts_directory: "../common",
-  migrations_directory: "../common",
+  contracts_directory: "../../common",
+  migrations_directory: "../../common",
   contracts_build_directory: "./truffle_output",
   networks: {
     test: {

diff --git a/tests/integration-tests/overloaded-contract-functions/package.json b/tests/integration-tests/overloaded-contract-functions/package.json
@@ -2,7 +2,7 @@
   "name": "overloaded-contract-functions",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/overloaded-contract-functions --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/package.json b/tests/integration-tests/package.json
@@ -2,18 +2,12 @@
   "private": true,
   "workspaces": [
     "api-version-v0-0-4",
-    "data-source-revert",
-    "data-source-revert2",
-    "fatal-error",
     "ganache-reverts",
     "host-exports",
     "non-fatal-errors",
     "overloaded-contract-functions",
     "poi-for-failed-subgraph",
     "remove-then-update",
-    "typename",
-    "value-roundtrip",
-    "dynamic-data-source",
-    "file-data-sources"
+    "value-roundtrip"
   ]
 }
diff --git a/tests/integration-tests/poi-for-failed-subgraph/package.json b/tests/integration-tests/poi-for-failed-subgraph/package.json
@@ -2,7 +2,7 @@
   "name": "poi-for-failed-subgraph",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/poi-for-failed-subgraph --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/poi-for-failed-subgraph/truffle.js b/tests/integration-tests/poi-for-failed-subgraph/truffle.js
@@ -2,8 +2,8 @@ require("babel-register");
 require("babel-polyfill");
 
 module.exports = {
-  contracts_directory: "../common",
-  migrations_directory: "../common",
+  contracts_directory: "../../common",
+  migrations_directory: "../../common",
   contracts_build_directory: "./truffle_output",
   networks: {
     test: {

diff --git a/tests/integration-tests/remove-then-update/package.json b/tests/integration-tests/remove-then-update/package.json
@@ -2,7 +2,7 @@
   "name": "remove-then-update",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/remove-then-update --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/remove-then-update/truffle.js b/tests/integration-tests/remove-then-update/truffle.js
@@ -2,8 +2,8 @@ require("babel-register");
 require("babel-polyfill");
 
 module.exports = {
-  contracts_directory: "../common",
-  migrations_directory: "../common",
+  contracts_directory: "../../common",
+  migrations_directory: "../../common",
   contracts_build_directory: "./truffle_output",
   networks: {
     test: {

diff --git a/tests/integration-tests/value-roundtrip/package.json b/tests/integration-tests/value-roundtrip/package.json
@@ -2,7 +2,7 @@
   "name": "value-roundtrip",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/value-roundtrip --node $GRAPH_NODE_ADMIN_URI",

diff --git a/tests/integration-tests/value-roundtrip/truffle.js b/tests/integration-tests/value-roundtrip/truffle.js
@@ -2,8 +2,8 @@ require("babel-register");
 require("babel-polyfill");
 
 module.exports = {
-  contracts_directory: "../common",
-  migrations_directory: "../common",
+  contracts_directory: "../../common",
+  migrations_directory: "../../common",
   contracts_build_directory: "./truffle_output",
   networks: {
     test: {

diff --git a/tests/integration-tests/config.simple.toml → tests/runner-tests/config.simple.toml b/tests/integration-tests/config.simple.toml → tests/runner-tests/config.simple.toml
diff --git a/...ests/data-source-revert/abis/Contract.abi → ...ests/data-source-revert/abis/Contract.abi b/...ests/data-source-revert/abis/Contract.abi → ...ests/data-source-revert/abis/Contract.abi
diff --git a/...ion-tests/data-source-revert/grafted.yaml → ...ner-tests/data-source-revert/grafted.yaml b/...ion-tests/data-source-revert/grafted.yaml → ...ner-tests/data-source-revert/grafted.yaml
diff --git a/...ion-tests/data-source-revert/package.json → ...ner-tests/data-source-revert/package.json b/...ion-tests/data-source-revert/package.json → ...ner-tests/data-source-revert/package.json
diff --git a/...n-tests/data-source-revert/schema.graphql → ...r-tests/data-source-revert/schema.graphql b/...n-tests/data-source-revert/schema.graphql → ...r-tests/data-source-revert/schema.graphql
diff --git a/...n-tests/data-source-revert/src/mapping.ts → ...r-tests/data-source-revert/src/mapping.ts b/...n-tests/data-source-revert/src/mapping.ts → ...r-tests/data-source-revert/src/mapping.ts
diff --git a/...on-tests/data-source-revert/subgraph.yaml → ...er-tests/data-source-revert/subgraph.yaml b/...on-tests/data-source-revert/subgraph.yaml → ...er-tests/data-source-revert/subgraph.yaml
diff --git a/...sts/data-source-revert2/abis/Contract.abi → ...sts/data-source-revert2/abis/Contract.abi b/...sts/data-source-revert2/abis/Contract.abi → ...sts/data-source-revert2/abis/Contract.abi
diff --git a/...on-tests/data-source-revert2/package.json → ...er-tests/data-source-revert2/package.json b/...on-tests/data-source-revert2/package.json → ...er-tests/data-source-revert2/package.json
diff --git a/...-tests/data-source-revert2/schema.graphql → ...-tests/data-source-revert2/schema.graphql b/...-tests/data-source-revert2/schema.graphql → ...-tests/data-source-revert2/schema.graphql
diff --git a/...-tests/data-source-revert2/src/mapping.ts → ...-tests/data-source-revert2/src/mapping.ts b/...-tests/data-source-revert2/src/mapping.ts → ...-tests/data-source-revert2/src/mapping.ts
diff --git a/...n-tests/data-source-revert2/subgraph.yaml → ...r-tests/data-source-revert2/subgraph.yaml b/...n-tests/data-source-revert2/subgraph.yaml → ...r-tests/data-source-revert2/subgraph.yaml
diff --git a/...sts/dynamic-data-source/abis/Contract.abi → ...sts/dynamic-data-source/abis/Contract.abi b/...sts/dynamic-data-source/abis/Contract.abi → ...sts/dynamic-data-source/abis/Contract.abi
diff --git a/...on-tests/dynamic-data-source/package.json → ...er-tests/dynamic-data-source/package.json b/...on-tests/dynamic-data-source/package.json → ...er-tests/dynamic-data-source/package.json
@@ -2,7 +2,7 @@
   "name": "dynamic-data-source",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/dynamic-data-source --node $GRAPH_NODE_ADMIN_URI",

diff --git a/...-tests/dynamic-data-source/schema.graphql → ...-tests/dynamic-data-source/schema.graphql b/...-tests/dynamic-data-source/schema.graphql → ...-tests/dynamic-data-source/schema.graphql
diff --git a/...-tests/dynamic-data-source/src/mapping.ts → ...-tests/dynamic-data-source/src/mapping.ts b/...-tests/dynamic-data-source/src/mapping.ts → ...-tests/dynamic-data-source/src/mapping.ts
diff --git a/...n-tests/dynamic-data-source/subgraph.yaml → ...r-tests/dynamic-data-source/subgraph.yaml b/...n-tests/dynamic-data-source/subgraph.yaml → ...r-tests/dynamic-data-source/subgraph.yaml
diff --git a/...ation-tests/fatal-error/abis/Contract.abi → ...unner-tests/fatal-error/abis/Contract.abi b/...ation-tests/fatal-error/abis/Contract.abi → ...unner-tests/fatal-error/abis/Contract.abi
diff --git a/...ntegration-tests/fatal-error/package.json → tests/runner-tests/fatal-error/package.json b/...ntegration-tests/fatal-error/package.json → tests/runner-tests/fatal-error/package.json
@@ -17,4 +17,4 @@
     "babel-register": "^6.26.0",
     "gluegun": "^4.6.1"
   }
-}
+}
diff --git a/...egration-tests/fatal-error/schema.graphql → ...s/runner-tests/fatal-error/schema.graphql b/...egration-tests/fatal-error/schema.graphql → ...s/runner-tests/fatal-error/schema.graphql
diff --git a/...egration-tests/fatal-error/src/mapping.ts → ...s/runner-tests/fatal-error/src/mapping.ts b/...egration-tests/fatal-error/src/mapping.ts → ...s/runner-tests/fatal-error/src/mapping.ts
diff --git a/...tegration-tests/fatal-error/subgraph.yaml → tests/runner-tests/fatal-error/subgraph.yaml b/...tegration-tests/fatal-error/subgraph.yaml → tests/runner-tests/fatal-error/subgraph.yaml
diff --git a/...tests/file-data-sources/abis/Contract.abi → ...tests/file-data-sources/abis/Contract.abi b/...tests/file-data-sources/abis/Contract.abi → ...tests/file-data-sources/abis/Contract.abi
diff --git a/...tion-tests/file-data-sources/package.json → ...nner-tests/file-data-sources/package.json b/...tion-tests/file-data-sources/package.json → ...nner-tests/file-data-sources/package.json
diff --git a/...on-tests/file-data-sources/schema.graphql → ...er-tests/file-data-sources/schema.graphql b/...on-tests/file-data-sources/schema.graphql → ...er-tests/file-data-sources/schema.graphql
diff --git a/...on-tests/file-data-sources/src/mapping.ts → ...er-tests/file-data-sources/src/mapping.ts b/...on-tests/file-data-sources/src/mapping.ts → ...er-tests/file-data-sources/src/mapping.ts
diff --git a/...ion-tests/file-data-sources/subgraph.yaml → ...ner-tests/file-data-sources/subgraph.yaml b/...ion-tests/file-data-sources/subgraph.yaml → ...ner-tests/file-data-sources/subgraph.yaml
diff --git a/tests/runner-tests/package.json b/tests/runner-tests/package.json
@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "workspaces": [
+    "data-source-revert",
+    "data-source-revert2",
+    "dynamic-data-source",
+    "fatal-error",
+    "file-data-sources",
+    "typename"
+  ]
+}
diff --git a/...egration-tests/typename/abis/Contract.abi → ...s/runner-tests/typename/abis/Contract.abi b/...egration-tests/typename/abis/Contract.abi → ...s/runner-tests/typename/abis/Contract.abi
diff --git a/...s/integration-tests/typename/package.json → tests/runner-tests/typename/package.json b/...s/integration-tests/typename/package.json → tests/runner-tests/typename/package.json
diff --git a/...integration-tests/typename/schema.graphql → tests/runner-tests/typename/schema.graphql b/...integration-tests/typename/schema.graphql → tests/runner-tests/typename/schema.graphql
diff --git a/...integration-tests/typename/src/mapping.ts → tests/runner-tests/typename/src/mapping.ts b/...integration-tests/typename/src/mapping.ts → tests/runner-tests/typename/src/mapping.ts
diff --git a/.../integration-tests/typename/subgraph.yaml → tests/runner-tests/typename/subgraph.yaml b/.../integration-tests/typename/subgraph.yaml → tests/runner-tests/typename/subgraph.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ @@
         "babel-register": "^6.26.0",
         "gluegun": "^4.6.1"
       }
-    }
+    }