Upgrade async-graphql deps (#4128)

* refactor: Update to async-graphql = "=7.0.11" * refactor: Update schema_sdl_export.snap test snapshot
iotaledger · Jan 29, 2025 · fca46b1 · fca46b1
1 parent bfca1eb
commit fca46b1
Show file tree

Hide file tree

Showing 15 changed files with 139 additions and 148 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -212,7 +212,7 @@ anemo-build = { git = "https://github.com/mystenlabs/anemo.git", rev = "e609f769
 anemo-tower = { git = "https://github.com/mystenlabs/anemo.git", rev = "e609f7697ed6169bf0760882a0b6c032a57e4f3b" }
 anyhow = "1.0.71"
 arc-swap = { version = "1.5.1", features = ["serde"] }
-async-graphql = "=7.0.1"
+async-graphql = "=7.0.11"
 async-recursion = "1.0.4"
 async-trait = "0.1.61"
 aws-config = "0.56"

diff --git a/crates/iota-graphql-rpc/Cargo.toml b/crates/iota-graphql-rpc/Cargo.toml
@@ -10,8 +10,8 @@ publish = false
 # external dependencies
 anyhow.workspace = true
 async-graphql = { workspace = true, features = ["dataloader", "apollo_tracing", "tracing", "opentelemetry"] }
-async-graphql-axum = "=7.0.1"
-async-graphql-value = "=7.0.1"
+async-graphql-axum = "=7.0.11"
+async-graphql-value = "=7.0.11"
 async-trait.workspace = true
 axum.workspace = true
 axum-extra.workspace = true

diff --git a/crates/iota-graphql-rpc/schema.graphql b/crates/iota-graphql-rpc/schema.graphql
@@ -4591,6 +4591,7 @@ type ZkLoginVerifyResult {
 	errors: [String!]!
 }
 
+directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE
 directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 schema {

diff --git a/crates/iota-graphql-rpc/src/data/package_resolver.rs b/crates/iota-graphql-rpc/src/data/package_resolver.rs
@@ -50,7 +50,6 @@ impl PackageStore for DbPackageStore {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<PackageKey> for Db {
     type Value = Arc<Package>;
     type Error = PackageResolverError;

diff --git a/crates/iota-graphql-rpc/src/types/checkpoint.rs b/crates/iota-graphql-rpc/src/types/checkpoint.rs
@@ -387,7 +387,6 @@ impl Checkpointed for Cursor {
 
 impl ScanLimited for Cursor {}
 
-#[async_trait::async_trait]
 impl Loader<SeqNumKey> for Db {
     type Value = Checkpoint;
     type Error = Error;
@@ -439,7 +438,6 @@ impl Loader<SeqNumKey> for Db {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<DigestKey> for Db {
     type Value = Checkpoint;
     type Error = Error;

diff --git a/crates/iota-graphql-rpc/src/types/epoch.rs b/crates/iota-graphql-rpc/src/types/epoch.rs
@@ -343,7 +343,6 @@ impl Epoch {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<EpochKey> for Db {
     type Value = Epoch;
     type Error = Error;

diff --git a/crates/iota-graphql-rpc/src/types/move_package.rs b/crates/iota-graphql-rpc/src/types/move_package.rs
@@ -891,7 +891,6 @@ impl Target<Cursor> for StoredHistoryPackage {
 
 impl ScanLimited for BcsCursor<PackageCursor> {}
 
-#[async_trait::async_trait]
 impl Loader<PackageVersionKey> for Db {
     type Value = IotaAddress;
     type Error = Error;
@@ -949,7 +948,6 @@ impl Loader<PackageVersionKey> for Db {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<LatestKey> for Db {
     type Value = IotaAddress;
     type Error = Error;

diff --git a/crates/iota-graphql-rpc/src/types/move_value.rs b/crates/iota-graphql-rpc/src/types/move_value.rs
@@ -942,7 +942,7 @@ mod tests {
         .unwrap();
 
         let expect = expect![[
-            r#"{baz: null,qux: [{quy: 44,quz: "Hello, world!",frob: "0x0000000000000000000000000000000000000000000000000000000000000045"},{quy: 46,quz: null,frob: "0x0000000000000000000000000000000000000000000000000000000000000047"}]}"#
+            r#"{baz: null, qux: [{quy: 44, quz: "Hello, world!", frob: "0x0000000000000000000000000000000000000000000000000000000000000045"}, {quy: 46, quz: null, frob: "0x0000000000000000000000000000000000000000000000000000000000000047"}]}"#
         ]];
         expect.assert_eq(&format!("{v}"));
     }

diff --git a/crates/iota-graphql-rpc/src/types/object.rs b/crates/iota-graphql-rpc/src/types/object.rs
@@ -1245,7 +1245,6 @@ impl Target<Cursor> for StoredHistoryObject {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<HistoricalKey> for Db {
     type Value = Object;
     type Error = Error;
@@ -1315,7 +1314,6 @@ impl Loader<HistoricalKey> for Db {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<ParentVersionKey> for Db {
     type Value = Object;
     type Error = Error;
@@ -1415,7 +1413,6 @@ impl Loader<ParentVersionKey> for Db {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<LatestAtKey> for Db {
     type Value = Object;
     type Error = Error;

diff --git a/crates/iota-graphql-rpc/src/types/transaction_block/mod.rs b/crates/iota-graphql-rpc/src/types/transaction_block/mod.rs
@@ -437,7 +437,6 @@ impl TransactionBlock {
     }
 }
 
-#[async_trait::async_trait]
 impl Loader<DigestKey> for Db {
     type Value = TransactionBlock;
     type Error = Error;

diff --git a/crates/iota-graphql-rpc/src/types/validator.rs b/crates/iota-graphql-rpc/src/types/validator.rs
@@ -57,7 +57,6 @@ pub(crate) struct Validator {
 ///
 /// It automatically filters the exchange rate table to only include data for
 /// the epochs that are less than or equal to the requested epoch.
-#[async_trait::async_trait]
 impl Loader<u64> for Db {
     type Value = BTreeMap<NativeIotaAddress, Vec<(EpochId, PoolTokenExchangeRate)>>;
 

diff --git a/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap b/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap
@@ -4595,6 +4595,7 @@ type ZkLoginVerifyResult {
 	errors: [String!]!
 }
 
+directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE
 directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 schema {

diff --git a/crates/iota-transactional-test-runner/Cargo.toml b/crates/iota-transactional-test-runner/Cargo.toml
@@ -14,6 +14,7 @@ workspace = true
 # external dependencies
 anyhow.workspace = true
 async-trait.workspace = true
+base64.workspace = true
 bcs.workspace = true
 bimap = "0.6"
 clap.workspace = true

diff --git a/crates/iota-transactional-test-runner/src/test_adapter.rs b/crates/iota-transactional-test-runner/src/test_adapter.rs
@@ -1237,7 +1237,16 @@ impl IotaTestAdapter {
 
                 variables.insert(format!("cursor_{idx}"), base64d);
             } else {
-                variables.insert(format!("cursor_{idx}"), Base64::encode(s));
+                use base64::Engine;
+
+                // To comply with how `iota-graphql-rpc` decodes the json cursor
+                // (see `iota_graphql_rpc::types::cursor::JsonCursor`).
+                //
+                // This traces back to `async_graphql = 7.0.7` that uses no padding for
+                // encoding/decoding.
+                let base64d = base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(s);
+
+                variables.insert(format!("cursor_{idx}"), base64d);
             }
         }