fix: Fix resim compilation, run format

radixdlt · Jul 26, 2024 · 94f3c23 · 94f3c23
1 parent d72b76a
commit 94f3c23
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 32 deletions.
diff --git a/radix-clis/src/resim/cmd_publish.rs b/radix-clis/src/resim/cmd_publish.rs
@@ -160,21 +160,24 @@ impl Publish {
             let original_code = PackageCodeOriginalCode { code };
             let instrumented_code = PackageCodeInstrumentedCode { instrumented_code };
             {
-                let key =
-                    SpreadPrefixKeyMapper::map_to_db_sort_key(&scrypto_encode(&code_hash).unwrap());
+                let key = SpreadPrefixKeyMapper::map_to_db_sort_key(
+                    &scrypto_encode_to_payload(&code_hash).unwrap(),
+                );
                 let update =
                     DatabaseUpdate::Set(scrypto_encode(&vm_type.into_locked_substate()).unwrap());
                 vm_type_updates.insert(key, update);
 
-                let key =
-                    SpreadPrefixKeyMapper::map_to_db_sort_key(&scrypto_encode(&code_hash).unwrap());
+                let key = SpreadPrefixKeyMapper::map_to_db_sort_key(
+                    &scrypto_encode_to_payload(&code_hash).unwrap(),
+                );
                 let update = DatabaseUpdate::Set(
                     scrypto_encode(&original_code.into_locked_substate()).unwrap(),
                 );
                 original_code_updates.insert(key, update);
 
-                let key =
-                    SpreadPrefixKeyMapper::map_to_db_sort_key(&scrypto_encode(&code_hash).unwrap());
+                let key = SpreadPrefixKeyMapper::map_to_db_sort_key(
+                    &scrypto_encode_to_payload(&code_hash).unwrap(),
+                );
                 let update = DatabaseUpdate::Set(
                     scrypto_encode(&instrumented_code.into_locked_substate()).unwrap(),
                 );
@@ -190,7 +193,7 @@ impl Publish {
                 let schema_hash = blueprint_schema.schema.generate_schema_hash();
                 schema_updates.insert(
                     SpreadPrefixKeyMapper::map_to_db_sort_key(
-                        &scrypto_encode(&schema_hash).unwrap(),
+                        &scrypto_encode_to_payload(&schema_hash).unwrap(),
                     ),
                     DatabaseUpdate::Set(
                         scrypto_encode(&blueprint_schema.schema.into_locked_substate()).unwrap(),
@@ -264,13 +267,13 @@ impl Publish {
                 };
                 blueprint_updates.insert(
                     SpreadPrefixKeyMapper::map_to_db_sort_key(
-                        &scrypto_encode(&blueprint_version_key.clone()).unwrap(),
+                        &scrypto_encode_to_payload(&blueprint_version_key.clone()).unwrap(),
                     ),
                     DatabaseUpdate::Set(scrypto_encode(&def.into_locked_substate()).unwrap()),
                 );
                 dependency_updates.insert(
                     SpreadPrefixKeyMapper::map_to_db_sort_key(
-                        &scrypto_encode(&blueprint_version_key.clone()).unwrap(),
+                        &scrypto_encode_to_payload(&blueprint_version_key.clone()).unwrap(),
                     ),
                     DatabaseUpdate::Set(
                         scrypto_encode(
@@ -284,7 +287,7 @@ impl Publish {
                 );
                 auth_config_updates.insert(
                     SpreadPrefixKeyMapper::map_to_db_sort_key(
-                        &scrypto_encode(&blueprint_version_key.clone()).unwrap(),
+                        &scrypto_encode_to_payload(&blueprint_version_key.clone()).unwrap(),
                     ),
                     DatabaseUpdate::Set(
                         scrypto_encode(&blueprint_definition.auth_config.into_locked_substate())
@@ -293,7 +296,7 @@ impl Publish {
                 );
                 royalty_config_updates.insert(
                     SpreadPrefixKeyMapper::map_to_db_sort_key(
-                        &scrypto_encode(&blueprint_version_key.clone()).unwrap(),
+                        &scrypto_encode_to_payload(&blueprint_version_key.clone()).unwrap(),
                     ),
                     DatabaseUpdate::Set(
                         scrypto_encode(&blueprint_definition.royalty_config.into_locked_substate())

diff --git a/radix-clis/src/resim/dumper.rs b/radix-clis/src/resim/dumper.rs
@@ -308,9 +308,8 @@ fn get_entity_metadata<T: SubstateDatabase>(
         )
         .unwrap()
         .map(|(key, value)| {
-            let map_key = key.into_map();
-            let key = scrypto_decode::<String>(&map_key).unwrap();
-            let value = scrypto_decode::<MetadataEntryEntryPayload>(&value).unwrap();
+            let key: String = key.into_map().decode_as().unwrap();
+            let value: MetadataEntryEntryPayload = value.decode_as().unwrap();
             (key, value.fully_update_and_into_latest_version())
         })
         .collect()

diff --git a/radix-engine/src/system/system_db_reader.rs b/radix-engine/src/system/system_db_reader.rs
@@ -373,10 +373,8 @@ impl<'a, S: SubstateDatabase + ?Sized> SystemDatabaseReader<'a, S> {
         node_id: &NodeId,
         module_id: ModuleId,
         collection_index: CollectionIndex,
-    ) -> Result<
-        Box<dyn Iterator<Item = (SubstateKey, Option<ScryptoOwnedRawValue>)> + '_>,
-        SystemReaderError,
-    > {
+    ) -> Result<Box<dyn Iterator<Item = (SubstateKey, ScryptoOwnedRawValue)> + '_>, SystemReaderError>
+    {
         self.collection_iter_advanced(node_id, module_id, collection_index, None)
             .map(|x| x.0)
     }
@@ -389,7 +387,7 @@ impl<'a, S: SubstateDatabase + ?Sized> SystemDatabaseReader<'a, S> {
         from_substate_key: Option<&SubstateKey>,
     ) -> Result<
         (
-            Box<dyn Iterator<Item = (SubstateKey, Option<ScryptoOwnedRawValue>)> + '_>,
+            Box<dyn Iterator<Item = (SubstateKey, ScryptoOwnedRawValue)> + '_>,
             PartitionNumber,
         ),
         SystemReaderError,
@@ -447,7 +445,8 @@ impl<'a, S: SubstateDatabase + ?Sized> SystemDatabaseReader<'a, S> {
                     ),
                 };
 
-                Some((key, value_option))
+                // Filter out values that don't exist
+                value_option.map(|value| (key, value))
             });
 
         Ok((Box::new(iter), partition_number))

diff --git a/radix-substate-store-queries/src/query/traverse.rs b/radix-substate-store-queries/src/query/traverse.rs
@@ -169,9 +169,8 @@ impl<'s, 'v, S: SubstateDatabase, V: StateTreeVisitor + 'v> StateTreeTraverser<'
                         )
                         .unwrap()
                     {
-                        let map_key = key.into_map();
                         let non_fungible_local_id: NonFungibleLocalId =
-                            map_key.decode_as().unwrap();
+                            key.into_map().decode_as().unwrap();
                         visitor.visit_non_fungible(
                             node_id,
                             &ResourceAddress::new_or_panic(info.get_outer_object().into()),

diff --git a/sbor/src/encoded_wrappers.rs b/sbor/src/encoded_wrappers.rs
@@ -1,6 +1,6 @@
 use crate::rust::hash::Hash;
-use crate::rust::prelude::*;
 use crate::rust::ops::Deref;
+use crate::rust::prelude::*;
 use crate::traversal::*;
 use crate::*;
 

diff --git a/scrypto-test/src/ledger_simulator/ledger_simulator.rs b/scrypto-test/src/ledger_simulator/ledger_simulator.rs
@@ -646,9 +646,8 @@ impl<E: NativeVmExtension, D: TestDatabase> LedgerSimulator<E, D> {
             )
             .unwrap()
             .map(|(key, value)| {
-                let key = key.into_map();
-                let hash: SchemaHash = key.decode_as().unwrap();
-                let schema: PackageSchemaEntryPayload = value.unwrap().decode_as().unwrap();
+                let hash: SchemaHash = key.into_map().decode_as().unwrap();
+                let schema: PackageSchemaEntryPayload = value.decode_as().unwrap();
                 (hash, schema.into_content())
             })
             .collect()
@@ -670,7 +669,7 @@ impl<E: NativeVmExtension, D: TestDatabase> LedgerSimulator<E, D> {
                 let map_key = key.into_map();
                 let key: BlueprintVersionKey = map_key.decode_as().unwrap();
                 let definition: PackageBlueprintVersionDefinitionEntryPayload =
-                    value.unwrap().decode_as().unwrap();
+                    value.decode_as().unwrap();
                 (key, definition.fully_update_and_into_latest_version())
             })
             .collect()
@@ -755,11 +754,7 @@ impl<E: NativeVmExtension, D: TestDatabase> LedgerSimulator<E, D> {
                 NonFungibleVaultCollection::NonFungibleIndex.collection_index(),
             )
             .unwrap()
-            .map(|(key, _)| {
-                let map_key = key.into_map();
-                let id: NonFungibleLocalId = map_key.decode_as().unwrap();
-                id
-            })
+            .map(|(key, _)| key.into_map().decode_as().unwrap())
             .collect();
 
         Some((amount, Box::new(iter.into_iter())))