[Caviarnine Adapter v1]: Small rename

radixdlt · Jan 29, 2024 · 174ab4f · 174ab4f
1 parent b569559
commit 174ab4f
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 10 deletions.
diff --git a/packages/bootstrap/src/lib.rs b/packages/bootstrap/src/lib.rs
@@ -140,7 +140,7 @@ mod bootstrap {
             let caviarnine_adapter = scrypto_decode::<ComponentAddress>(
                 &ScryptoVmV1Api::blueprint_call(
                     caviarnine_adapter_v1_package_address,
-                    "CaviarNineAdapter",
+                    "CaviarnineAdapter",
                     "instantiate",
                     scrypto_args!(
                         OwnerRole::None,
@@ -149,7 +149,7 @@ mod bootstrap {
                 ),
             )
             .map(|address| {
-                Global::<CaviarNineAdapter>(CaviarNineAdapterObjectStub {
+                Global::<CaviarnineAdapter>(CaviarnineAdapterObjectStub {
                     handle: ObjectStubHandle::Global(address.into()),
                 })
             })

diff --git a/packages/caviarnine-adapter-v1/src/lib.rs b/packages/caviarnine-adapter-v1/src/lib.rs
@@ -44,13 +44,14 @@ pub const PREFERRED_TOTAL_NUMBER_OF_HIGHER_AND_LOWER_BINS: u32 = 10 * 2;
 
 #[blueprint_with_traits]
 pub mod adapter {
-    struct CaviarNineAdapter;
+    struct CaviarnineAdapter;
 
-    impl CaviarNineAdapter {
+    impl CaviarnineAdapter {
         pub fn instantiate(
+            metadata_init: MetadataInit,
             owner_role: OwnerRole,
             address_reservation: Option<GlobalAddressReservation>,
-        ) -> Global<CaviarNineAdapter> {
+        ) -> Global<CaviarnineAdapter> {
             let address_reservation = address_reservation.unwrap_or(
                 Runtime::allocate_component_address(BlueprintId {
                     package_address: Runtime::package_address(),
@@ -62,6 +63,10 @@ pub mod adapter {
             Self {}
                 .instantiate()
                 .prepare_to_globalize(owner_role)
+                .metadata(ModuleConfig {
+                    init: metadata_init,
+                    roles: Default::default(),
+                })
                 .with_address(address_reservation)
                 .globalize()
         }
@@ -73,7 +78,7 @@ pub mod adapter {
         }
     }
 
-    impl PoolAdapterInterfaceTrait for CaviarNineAdapter {
+    impl PoolAdapterInterfaceTrait for CaviarnineAdapter {
         fn open_liquidity_position(
             &mut self,
             pool_address: ComponentAddress,

diff --git a/packages/ignition/src/blueprint.rs b/packages/ignition/src/blueprint.rs
@@ -241,6 +241,7 @@ mod ignition {
         /// Instantiates a new Ignition protocol component based on the provided
         /// protocol parameters.
         pub fn instantiate(
+            metadata_init: MetadataInit,
             /* Rules */
             owner_role: OwnerRole,
             protocol_owner_role: AccessRule,
@@ -347,11 +348,14 @@ mod ignition {
             ignition
                 .instantiate()
                 .prepare_to_globalize(owner_role)
-                // TODO: update metadata
                 .roles(roles! {
                     protocol_owner => protocol_owner_role;
                     protocol_manager => protocol_manager_role;
                 })
+                .metadata(ModuleConfig {
+                    init: metadata_init,
+                    roles: Default::default(),
+                })
                 .with_address(address_reservation)
                 .globalize()
         }

diff --git a/packages/ociswap-adapter-v1/src/lib.rs b/packages/ociswap-adapter-v1/src/lib.rs
@@ -37,6 +37,7 @@ pub mod adapter {
 
     impl OciswapAdapter {
         pub fn instantiate(
+            metadata_init: MetadataInit,
             owner_role: OwnerRole,
             address_reservation: Option<GlobalAddressReservation>,
         ) -> Global<OciswapAdapter> {
@@ -51,6 +52,10 @@ pub mod adapter {
             Self {}
                 .instantiate()
                 .prepare_to_globalize(owner_role)
+                .metadata(ModuleConfig {
+                    init: metadata_init,
+                    roles: Default::default(),
+                })
                 .with_address(address_reservation)
                 .globalize()
         }

diff --git a/packages/simple-oracle/src/lib.rs b/packages/simple-oracle/src/lib.rs
@@ -26,6 +26,7 @@ mod simple_oracle {
     impl SimpleOracle {
         pub fn instantiate(
             oracle_manager: AccessRule,
+            metadata_init: MetadataInit,
             owner_role: OwnerRole,
             address_reservation: Option<GlobalAddressReservation>,
         ) -> Global<SimpleOracle> {
@@ -45,6 +46,10 @@ mod simple_oracle {
             .roles(roles! {
                 oracle_manager => oracle_manager;
             })
+            .metadata(ModuleConfig {
+                init: metadata_init,
+                roles: Default::default(),
+            })
             .with_address(address_reservation)
             .globalize()
         }

diff --git a/tests/src/environment.rs b/tests/src/environment.rs
@@ -33,7 +33,7 @@ impl EnvironmentSpecifier for ScryptoTestEnvironmentSpecifier {
     type CaviarninePool = CaviarNinePoolInterfaceScryptoTestStub;
 
     type OciswapAdapter = OciswapAdapter;
-    type CaviarnineAdapter = CaviarNineAdapter;
+    type CaviarnineAdapter = CaviarnineAdapter;
 
     // Badges
     type Badge = Bucket;
@@ -268,12 +268,14 @@ impl ScryptoTestEnv {
         // Instantiating the components.
         let mut simple_oracle = SimpleOracle::instantiate(
             protocol_manager_rule.clone(),
+            Default::default(),
             OwnerRole::None,
             None,
             simple_oracle_package,
             &mut env,
         )?;
         let mut ignition = Ignition::instantiate(
+            Default::default(),
             OwnerRole::None,
             protocol_owner_rule,
             protocol_manager_rule,
@@ -287,12 +289,14 @@ impl ScryptoTestEnv {
             &mut env,
         )?;
         let ociswap_adapter_v1 = OciswapAdapter::instantiate(
+            Default::default(),
             OwnerRole::None,
             None,
             ociswap_adapter_v1_package,
             &mut env,
         )?;
-        let caviarnine_adapter_v1 = CaviarNineAdapter::instantiate(
+        let caviarnine_adapter_v1 = CaviarnineAdapter::instantiate(
+            Default::default(),
             OwnerRole::None,
             None,
             caviarnine_adapter_v1_package,
@@ -629,6 +633,7 @@ impl ScryptoUnitEnv {
                         "instantiate",
                         (
                             protocol_manager_rule.clone(),
+                            MetadataInit::default(),
                             OwnerRole::None,
                             None::<ManifestAddressReservation>,
                         ),
@@ -668,6 +673,7 @@ impl ScryptoUnitEnv {
                         "Ignition",
                         "instantiate",
                         (
+                            MetadataInit::default(),
                             OwnerRole::None,
                             protocol_owner_rule,
                             protocol_manager_rule,
@@ -692,7 +698,7 @@ impl ScryptoUnitEnv {
 
         let [ociswap_adapter_v1, caviarnine_adapter_v1] = [
             (ociswap_adapter_v1_package, "OciswapAdapter"),
-            (caviarnine_adapter_v1_package, "CaviarNineAdapter"),
+            (caviarnine_adapter_v1_package, "CaviarnineAdapter"),
         ]
         .map(|(package_address, blueprint_name)| {
             test_runner
@@ -704,6 +710,7 @@ impl ScryptoUnitEnv {
                             blueprint_name,
                             "instantiate",
                             (
+                                MetadataInit::default(),
                                 OwnerRole::None,
                                 None::<ManifestAddressReservation>,
                             ),