[Ignition]: Use unwrap_or_else for address reservations.

radixdlt · Feb 20, 2024 · b1aa045 · b1aa045
1 parent 2e2f167
commit b1aa045
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 29 deletions.
diff --git a/packages/caviarnine-v1-adapter-v1/src/lib.rs b/packages/caviarnine-v1-adapter-v1/src/lib.rs
@@ -83,13 +83,14 @@ pub mod adapter {
             owner_role: OwnerRole,
             address_reservation: Option<GlobalAddressReservation>,
         ) -> Global<CaviarnineV1Adapter> {
-            let address_reservation = address_reservation.unwrap_or(
-                Runtime::allocate_component_address(BlueprintId {
-                    package_address: Runtime::package_address(),
-                    blueprint_name: Runtime::blueprint_name(),
-                })
-                .0,
-            );
+            let address_reservation =
+                address_reservation.unwrap_or_else(|| {
+                    Runtime::allocate_component_address(BlueprintId {
+                        package_address: Runtime::package_address(),
+                        blueprint_name: Runtime::blueprint_name(),
+                    })
+                    .0
+                });
 
             Self {
                 pool_information_cache: KeyValueStore::new_with_registered_type(

diff --git a/packages/ignition/src/blueprint.rs b/packages/ignition/src/blueprint.rs
@@ -304,7 +304,7 @@ mod ignition {
             // If no address reservation is provided then reserve an address to
             // globalize the component to - this is to provide us with a non
             // branching way of globalizing the component.
-            let address_reservation = address_reservation.unwrap_or(
+            let address_reservation = address_reservation.unwrap_or_else(||
                 Runtime::allocate_component_address(Ignition::blueprint_id()).0,
             );
 

diff --git a/packages/ociswap-v1-adapter-v1/src/lib.rs b/packages/ociswap-v1-adapter-v1/src/lib.rs
@@ -50,13 +50,14 @@ pub mod adapter {
             owner_role: OwnerRole,
             address_reservation: Option<GlobalAddressReservation>,
         ) -> Global<OciswapV1Adapter> {
-            let address_reservation = address_reservation.unwrap_or(
-                Runtime::allocate_component_address(BlueprintId {
-                    package_address: Runtime::package_address(),
-                    blueprint_name: Runtime::blueprint_name(),
-                })
-                .0,
-            );
+            let address_reservation =
+                address_reservation.unwrap_or_else(|| {
+                    Runtime::allocate_component_address(BlueprintId {
+                        package_address: Runtime::package_address(),
+                        blueprint_name: Runtime::blueprint_name(),
+                    })
+                    .0
+                });
 
             Self {}
                 .instantiate()

diff --git a/packages/ociswap-v2-adapter-v1/src/lib.rs b/packages/ociswap-v2-adapter-v1/src/lib.rs
@@ -44,13 +44,14 @@ pub mod adapter {
             owner_role: OwnerRole,
             address_reservation: Option<GlobalAddressReservation>,
         ) -> Global<OciswapV2Adapter> {
-            let address_reservation = address_reservation.unwrap_or(
-                Runtime::allocate_component_address(BlueprintId {
-                    package_address: Runtime::package_address(),
-                    blueprint_name: Runtime::blueprint_name(),
-                })
-                .0,
-            );
+            let address_reservation =
+                address_reservation.unwrap_or_else(|| {
+                    Runtime::allocate_component_address(BlueprintId {
+                        package_address: Runtime::package_address(),
+                        blueprint_name: Runtime::blueprint_name(),
+                    })
+                    .0
+                });
 
             Self {}
                 .instantiate()

diff --git a/packages/simple-oracle/src/lib.rs b/packages/simple-oracle/src/lib.rs
@@ -45,13 +45,14 @@ mod simple_oracle {
             owner_role: OwnerRole,
             address_reservation: Option<GlobalAddressReservation>,
         ) -> Global<SimpleOracle> {
-            let address_reservation = address_reservation.unwrap_or(
-                Runtime::allocate_component_address(BlueprintId {
-                    package_address: Runtime::package_address(),
-                    blueprint_name: Runtime::blueprint_name(),
-                })
-                .0,
-            );
+            let address_reservation =
+                address_reservation.unwrap_or_else(|| {
+                    Runtime::allocate_component_address(BlueprintId {
+                        package_address: Runtime::package_address(),
+                        blueprint_name: Runtime::blueprint_name(),
+                    })
+                    .0
+                });
 
             Self {
                 prices: KeyValueStore::new_with_registered_type(),