clippy + rebase origin/develop + it builds

Cargo.toml

@@ -12,8 +12,8 @@ members = [
    "packages/fuel-indexer-database",
    "packages/fuel-indexer-database/database-types",
    "packages/fuel-indexer-database/postgres",
-   "packages/fuel-indexer-graphql",
    "packages/fuel-indexer-graphql-dyn",
+   "packages/fuel-indexer-graphql",
    "packages/fuel-indexer-lib",
    "packages/fuel-indexer-macros",
    "packages/fuel-indexer-macros/macro-utils",
@@ -33,20 +33,20 @@ members = [
 ]
 
 default-members = [
-   "packages/fuel-indexer",
    "packages/fuel-indexer-api-server",
    "packages/fuel-indexer-database",
    "packages/fuel-indexer-database/database-types",
    "packages/fuel-indexer-database/postgres",
-   "packages/fuel-indexer-graphql",
    "packages/fuel-indexer-graphql-dyn",
+   "packages/fuel-indexer-graphql",
    "packages/fuel-indexer-lib",
    "packages/fuel-indexer-macros",
    "packages/fuel-indexer-metrics",
    "packages/fuel-indexer-plugin",
    "packages/fuel-indexer-schema",
    "packages/fuel-indexer-types",
    "packages/fuel-indexer-utils",
+   "packages/fuel-indexer",
    "plugins/forc-index",
    "plugins/forc-postgres",
 ]
@@ -67,9 +67,9 @@ version = "0.20.8"
 
 [workspace.dependencies]
 async-graphql = "6.0"
+async-graphql-axum = "6.0"
 async-graphql-parser = "6.0"
 async-graphql-value = "6.0"
-async-graphql-axum = "6.0"
 bincode = "1.3"
 clap = "3.1"
 forc-index = { version = "0.20.8", path = "./plugins/forc-index" }
@@ -79,6 +79,7 @@ fuel-indexer-api-server = { version = "0.20.8", path = "./packages/fuel-indexer-
 fuel-indexer-database = { version = "0.20.8", path = "./packages/fuel-indexer-database" }
 fuel-indexer-database-types = { version = "0.20.8", path = "./packages/fuel-indexer-database/database-types" }
 fuel-indexer-graphql = { version = "0.20.8", path = "./packages/fuel-indexer-graphql" }
+fuel-indexer-graphql-dyn = { version = "0.20.8", path = "./packages/fuel-indexer-graphql-dyn" }
 fuel-indexer-lib = { version = "0.20.8", path = "./packages/fuel-indexer-lib" }
 fuel-indexer-macro-utils = { version = "0.20.8", path = "./packages/fuel-indexer-macros/macro-utils" }
 fuel-indexer-macros = { version = "0.20.8", path = "./packages/fuel-indexer-macros", default-features = false }

packages/fuel-indexer-graphql-dyn/Cargo.toml

@@ -9,32 +9,31 @@ repository = { workspace = true }
 rust-version = { workspace = true }
 description = "Library for building executable dynamic GraphQL schemas"
 
-[features]
-default = ["json", "testing"]
-json = ["dep:serde_json"]
-testing = ["dep:graphql-parser"]
-
 [dependencies]
+anyhow = { version = "1.0", default-features = false }
 async-graphql = { workspace = true, features = ["dynamic-schema", "dataloader"] }
+async-graphql-parser = { workspace = true }
 async-graphql-value = { workspace = true }
-async-trait = "0.1.73"
+async-trait = "0.1"
+convert_case = "0.6.0"
 extension-trait = "1.0.2"
 graphql-parser = { version = "0.4.0", optional = true }
 indexmap = "2.0.0"
+lazy_static = "1.4"
+serde = { workspace = true }
 serde_json = { workspace = true, optional = true }
-tokio = { workspace = true, features = ["sync"] }
 thiserror = { workspace = true }
-anyhow = "1.0"
-lazy_static = "1.4.0"
-convert_case = "0.6.0"
-async-graphql-parser = "6.0.4"
-serde.workspace = true
+tokio = { workspace = true, features = ["sync"] }
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-async-graphql-parser = { workspace = true }
 graphql-parser = "0.4.0"
 insta = { version = "1.31.0", features = ["json", "ron"] }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["sync", "rt", "macros"] }
 velcro = "0.5.4"
+
+[features]
+default = ["json", "testing"]
+json = ["dep:serde_json"]
+testing = ["dep:graphql-parser"]

packages/fuel-indexer-graphql-dyn/src/lib.rs

@@ -5,7 +5,7 @@ pub mod spec;
 pub mod store;
 pub mod testing;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use anyhow::anyhow;
     pub use async_trait::async_trait;
     pub use extension_trait::extension_trait;

packages/fuel-indexer-graphql-dyn/src/schema/mod.rs

@@ -10,7 +10,7 @@ pub mod schema_builder;
 pub mod schema_type;
 pub mod schema_type_builder;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use crate::spec::*;
     pub use crate::store;

packages/fuel-indexer-graphql-dyn/src/schema/schema_builder.rs

@@ -25,7 +25,7 @@ impl Default for DynSchemaBuilder {
 impl DynSchemaBuilder {
     pub fn new(schema_type: &DynSchemaType, store: Arc<Mutex<dyn store::Store>>) -> Self {
         let loader = DynLoader::new(store);
-        let resolver = DynResolver::new(&schema_type, Arc::new(Mutex::new(loader)));
+        let resolver = DynResolver::new(schema_type, Arc::new(Mutex::new(loader)));
         let DynSchemaBuilder {
             mut schema,
             mut query,

packages/fuel-indexer-graphql-dyn/src/spec/mod.rs

@@ -14,7 +14,7 @@ pub mod node;
 pub mod paging;
 pub mod query;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use async_graphql::dynamic::*;
     pub use std::{hash::Hash, str::FromStr};

packages/fuel-indexer-graphql-dyn/src/store/mod.rs

@@ -10,7 +10,7 @@ pub mod store;
 pub mod store_type;
 pub mod store_type_builder;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use indexmap::IndexMap;
     pub use serde::{Deserialize, Serialize};

packages/fuel-indexer-graphql-dyn/src/testing/mod.rs

@@ -3,7 +3,7 @@ pub mod schema_type;
 pub mod store;
 pub mod store_type;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use indexmap::IndexMap;
     pub use lazy_static::lazy_static;