fix: fix workspace build after the external crates updating

iotaledger · Dec 23, 2024 · a62259b · a62259b
1 parent b5165fc
commit a62259b
Show file tree

Hide file tree

Showing 46 changed files with 293 additions and 282 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/iota-core/src/unit_tests/authority_tests.rs b/crates/iota-core/src/unit_tests/authority_tests.rs
@@ -3,7 +3,7 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use std::{collections::HashSet, convert::TryInto, env, fs};
+use std::{collections::HashSet, convert::TryInto, env, fs, str::FromStr};
 
 use bcs;
 use fastcrypto::traits::KeyPair;
@@ -47,7 +47,6 @@ use move_core_types::{
     ident_str,
     identifier::{IdentStr, Identifier},
     language_storage::{StructTag, TypeTag},
-    parser::parse_type_tag,
 };
 use rand::{
     Rng, SeedableRng,
@@ -3676,7 +3675,7 @@ async fn test_dynamic_field_struct_name_parsing() {
     assert!(matches!(fields[0].type_, DynamicFieldType::DynamicField));
     assert_eq!(json!({"name_str": "Test Name"}), fields[0].name.value);
     assert_eq!(
-        parse_type_tag("0x0::object_basics::Name").unwrap(),
+        TypeTag::from_str("0x0::object_basics::Name").unwrap(),
         fields[0].name.type_
     )
 }
@@ -3688,7 +3687,10 @@ async fn test_dynamic_field_bytearray_name_parsing() {
 
     assert_eq!(fields.len(), 1);
     assert!(matches!(fields[0].type_, DynamicFieldType::DynamicField));
-    assert_eq!(parse_type_tag("vector<u8>").unwrap(), fields[0].name.type_);
+    assert_eq!(
+        TypeTag::from_str("vector<u8>").unwrap(),
+        fields[0].name.type_
+    );
     assert_eq!(json!("Test Name".as_bytes()), fields[0].name.value);
 }
 
@@ -3699,7 +3701,7 @@ async fn test_dynamic_field_address_name_parsing() {
 
     assert_eq!(fields.len(), 1);
     assert!(matches!(fields[0].type_, DynamicFieldType::DynamicField));
-    assert_eq!(parse_type_tag("address").unwrap(), fields[0].name.type_);
+    assert_eq!(TypeTag::from_str("address").unwrap(), fields[0].name.type_);
     assert_eq!(json!(sender), fields[0].name.value);
 }
 
@@ -3711,7 +3713,7 @@ async fn test_dynamic_object_field_struct_name_parsing() {
     assert!(matches!(fields[0].type_, DynamicFieldType::DynamicObject));
     assert_eq!(json!({"name_str": "Test Name"}), fields[0].name.value);
     assert_eq!(
-        parse_type_tag("0x0::object_basics::Name").unwrap(),
+        TypeTag::from_str("0x0::object_basics::Name").unwrap(),
         fields[0].name.type_
     )
 }
@@ -3723,7 +3725,10 @@ async fn test_dynamic_object_field_bytearray_name_parsing() {
 
     assert_eq!(fields.len(), 1);
     assert!(matches!(fields[0].type_, DynamicFieldType::DynamicObject));
-    assert_eq!(parse_type_tag("vector<u8>").unwrap(), fields[0].name.type_);
+    assert_eq!(
+        TypeTag::from_str("vector<u8>").unwrap(),
+        fields[0].name.type_
+    );
     assert_eq!(json!("Test Name".as_bytes()), fields[0].name.value);
 }
 
@@ -3734,7 +3739,7 @@ async fn test_dynamic_object_field_address_name_parsing() {
 
     assert_eq!(fields.len(), 1);
     assert!(matches!(fields[0].type_, DynamicFieldType::DynamicObject));
-    assert_eq!(parse_type_tag("address").unwrap(), fields[0].name.type_);
+    assert_eq!(TypeTag::from_str("address").unwrap(), fields[0].name.type_);
     assert_eq!(json!(sender), fields[0].name.value);
 }
 

diff --git a/crates/iota-core/src/unit_tests/subscription_handler_tests.rs b/crates/iota-core/src/unit_tests/subscription_handler_tests.rs
@@ -82,21 +82,23 @@ impl TestEvent {
     fn layout() -> MoveStructLayout {
         MoveStructLayout {
             type_: Self::type_(),
-            fields: vec![
+            fields: Box::new(vec![
                 MoveFieldLayout::new(ident_str!("creator").to_owned(), MoveTypeLayout::Address),
                 MoveFieldLayout::new(
                     ident_str!("name").to_owned(),
-                    MoveTypeLayout::Struct(UTF8String::layout()),
+                    MoveTypeLayout::Struct(Box::new(UTF8String::layout())),
                 ),
                 MoveFieldLayout::new(
                     ident_str!("data").to_owned(),
                     MoveTypeLayout::Vector(Box::new(MoveTypeLayout::U64)),
                 ),
                 MoveFieldLayout::new(
                     ident_str!("coins").to_owned(),
-                    MoveTypeLayout::Vector(Box::new(MoveTypeLayout::Struct(GasCoin::layout()))),
+                    MoveTypeLayout::Vector(Box::new(MoveTypeLayout::Struct(Box::new(
+                        GasCoin::layout(),
+                    )))),
                 ),
-            ],
+            ]),
         }
     }
 }
@@ -128,10 +130,10 @@ impl UTF8String {
     fn layout() -> MoveStructLayout {
         MoveStructLayout {
             type_: Self::type_(),
-            fields: vec![MoveFieldLayout::new(
+            fields: Box::new(vec![MoveFieldLayout::new(
                 ident_str!("bytes").to_owned(),
                 MoveTypeLayout::Vector(Box::new(MoveTypeLayout::U8)),
-            )],
+            )]),
         }
     }
 }
diff --git a/crates/iota-framework/src/lib.rs b/crates/iota-framework/src/lib.rs
@@ -14,10 +14,7 @@ use iota_types::{
     storage::ObjectStore,
 };
 use move_binary_format::{
-    CompiledModule,
-    binary_config::BinaryConfig,
-    compatibility::Compatibility,
-    file_format::{Ability, AbilitySet},
+    CompiledModule, binary_config::BinaryConfig, compatibility::Compatibility,
 };
 use move_core_types::gas_algebra::InternalGas;
 use once_cell::sync::Lazy;
@@ -222,23 +219,7 @@ pub async fn compare_system_package<S: ObjectStore>(
         return Some(cur_ref);
     }
 
-    let compatibility = Compatibility {
-        check_datatype_and_pub_function_linking: true,
-        check_datatype_layout: true,
-        check_friend_linking: false,
-        // Checking `entry` linkage is required because system packages are updated in-place, and a
-        // transaction that was rolled back to make way for reconfiguration should still be runnable
-        // after a reconfiguration that upgraded the framework.
-        //
-        // A transaction that calls a system function that was previously `entry` and is now private
-        // will fail because its entrypoint became no longer callable. A transaction that calls a
-        // system function that was previously `public entry` and is now just `public` could also
-        // fail if one of its mutable inputs was being used in another private `entry` function.
-        check_private_entry_linking: true,
-        disallowed_new_abilities: AbilitySet::singleton(Ability::Key),
-        disallow_change_datatype_type_params: true,
-        disallow_new_variants: true,
-    };
+    let compatibility = Compatibility::framework_upgrade_check();
 
     let new_pkg = new_object
         .data

diff --git a/crates/iota-graphql-rpc/src/types/move_type.rs b/crates/iota-graphql-rpc/src/types/move_type.rs
@@ -260,8 +260,8 @@ impl TryFrom<A::MoveTypeLayout> for MoveTypeLayout {
             TL::Address => Self::Address,
 
             TL::Vector(v) => Self::Vector(Box::new(Self::try_from(*v)?)),
-            TL::Struct(s) => Self::Struct(s.try_into()?),
-            TL::Enum(e) => Self::Enum(e.try_into()?),
+            TL::Struct(s) => Self::Struct((*s).try_into()?),
+            TL::Enum(e) => Self::Enum((*e).try_into()?),
         })
     }
 }

diff --git a/crates/iota-graphql-rpc/src/types/move_value.rs b/crates/iota-graphql-rpc/src/types/move_value.rs
@@ -487,13 +487,13 @@ mod tests {
 
     macro_rules! struct_layout {
         ($type:literal { $($name:literal : $layout:expr),* $(,)?}) => {
-            A::MoveTypeLayout::Struct(S {
+            A::MoveTypeLayout::Struct(Box::new(S {
                 type_: StructTag::from_str($type).expect("Failed to parse struct"),
-                fields: vec![$(MoveFieldLayout {
+                fields: Box::new(vec![$(MoveFieldLayout {
                     name: ident_str!($name).to_owned(),
                     layout: $layout,
-                }),*]
-            })
+                }),*])
+            }))
         }
     }
 

diff --git a/crates/iota-indexer/src/handlers/checkpoint_handler.rs b/crates/iota-indexer/src/handlers/checkpoint_handler.rs
@@ -746,7 +746,7 @@ async fn get_move_struct_layout_map(
                         move_core_types::annotated_value::MoveStructLayout,
                     ),
                     IndexerError,
-                >((struct_tag, move_struct_layout))
+                >((struct_tag, *move_struct_layout))
             }
         })
         .collect::<Vec<_>>();

diff --git a/crates/iota-indexer/src/models/objects.rs b/crates/iota-indexer/src/models/objects.rs
@@ -316,7 +316,7 @@ impl StoredObject {
             )),
         }?;
 
-        Ok(ObjectRead::Exists(oref, object, Some(move_struct_layout)))
+        Ok(ObjectRead::Exists(oref, object, Some(*move_struct_layout)))
     }
 
     pub async fn try_into_expectant_dynamic_field_info(
-Original file line number
+Diff line change
@@ Expand Up / @@ -316,7 +316,7 @@ impl StoredObject { @@
                 )),
             }?;
-            Ok(ObjectRead::Exists(oref, object, Some(move_struct_layout)))
+            Ok(ObjectRead::Exists(oref, object, Some(*move_struct_layout)))
         }
         pub async fn try_into_expectant_dynamic_field_info(
@@ Expand Down @@