fix(scripts): example scripts recovered

bucket/ddc_bucket/cluster/messages.rs

@@ -13,7 +13,7 @@ use crate::ddc_bucket::ClusterNodeReplaced;
 use crate::ddc_bucket::{
     BASIS_POINTS,
     AccountId, Balance, ClusterCreated, ClusterNodeAdded, ClusterNodeRemoved,
-    ClusterCdnNodeAdded, ClusterCdnNodeRemoved, ClusterDistributeRevenues, CdnClusterDistributeRevenues, ClusterReserveResource,
+    ClusterCdnNodeAdded, ClusterCdnNodeRemoved, ClusterDistributeRevenues, ClusterReserveResource, ClusterDistributeCdnRevenues,
     ClusterRemoved, ClusterParamsSet, ClusterNodeStatusSet, ClusterCdnNodeStatusSet, PermissionGranted, PermissionRevoked, 
     DdcBucket, NodeStatusInCluster, Result, Error::*
 };
@@ -39,7 +39,7 @@ impl DdcBucket {
 
         Self::env().emit_event(ClusterCreated {
             cluster_id,
-            manager: caller,
+            manager_id: caller,
             cluster_params,
         });
 
@@ -297,14 +297,14 @@ impl DdcBucket {
 
     pub fn message_grant_trusted_manager_permission(
         &mut self,
-        manager: AccountId
+        manager_id: AccountId
     ) -> Result<()> {
         let grantor = Self::env().caller();
         let permission = Permission::ClusterManagerTrustedBy(grantor);
-        self.grant_permission(manager, permission)?;
+        self.grant_permission(manager_id, permission)?;
 
         Self::env().emit_event(PermissionGranted { 
-            account_id: manager,
+            account_id: manager_id,
             permission
         });
 
@@ -314,14 +314,14 @@ impl DdcBucket {
 
     pub fn message_revoke_trusted_manager_permission(
         &mut self,
-        manager: AccountId
+        manager_id: AccountId
     ) -> Result<()> {
         let grantor = Self::env().caller();
         let permission = Permission::ClusterManagerTrustedBy(grantor);
-        self.revoke_permission(manager, permission)?;
+        self.revoke_permission(manager_id, permission)?;
 
         Self::env().emit_event(PermissionRevoked { 
-            account_id: manager,
+            account_id: manager_id,
             permission
         });
 
@@ -592,7 +592,7 @@ impl DdcBucket {
             cdn_node.take_payment(cdn_node.undistributed_payment)?;
             self.cdn_nodes.update(*cdn_node_key, &cdn_node)?;
 
-            Self::env().emit_event(CdnClusterDistributeRevenues {
+            Self::env().emit_event(ClusterDistributeCdnRevenues {
                 cluster_id, 
                 provider_id: cdn_node.provider_id 
             });

bucket/ddc_bucket/tests/env_utils.rs

@@ -69,8 +69,7 @@ pub fn print_events(events: &[Event]) {
             Event::Deposit(ev) => println!("EVENT {:?}", ev),
             Event::PermissionGranted(ev) => println!("EVENT {:?}", ev),
             Event::PermissionRevoked(ev) => println!("EVENT {:?}", ev),
-            Event::CdnClusterCreated(ev) => println!("EVENT {:?}", ev),
-            Event::CdnClusterDistributeRevenues(ev) => println!("EVENT {:?}", ev),
+            Event::ClusterDistributeCdnRevenues(ev) => println!("EVENT {:?}", ev),
             Event::CdnNodeCreated(ev) => println!("EVENT {:?}", ev),
             Event::ClusterNodeAdded(ev) => println!("EVENT {:?}", ev),
             Event::ClusterCdnNodeAdded(ev) => println!("{:?}", ev),

bucket/ddc_bucket/tests/test_cluster.rs

@@ -188,7 +188,7 @@ fn cluster_create_ok() {
         matches!(events.pop().unwrap(), Event::ClusterCreated(ev) if ev ==
         ClusterCreated { 
             cluster_id: ctx.cluster_id, 
-            manager: ctx.manager_id, 
+            manager_id: ctx.manager_id, 
             cluster_params: ctx.cluster_params.clone()
         })
     );

bucket/lib.rs

@@ -272,7 +272,7 @@ pub mod ddc_bucket {
         #[ink(topic)]
         cluster_id: ClusterId,
         #[ink(topic)]
-        manager: AccountId,
+        manager_id: AccountId,
         cluster_params: ClusterParams,
     }
 
@@ -377,6 +377,15 @@ pub mod ddc_bucket {
         provider_id: AccountId,
     }
 
+    #[ink(event)]
+    #[cfg_attr(feature = "std", derive(PartialEq, Debug, scale_info::TypeInfo))]
+    pub struct ClusterDistributeCdnRevenues {
+        #[ink(topic)]
+        cluster_id: ClusterId,
+        #[ink(topic)]
+        provider_id: AccountId,
+    }
+
     impl DdcBucket {
 
         /// Creates a cluster of Storage nodes and CDN nodes.
@@ -832,30 +841,6 @@ pub mod ddc_bucket {
     }
     // ---- End Cluster ----
 
-    // ---- CDN Cluster ----
-
-    /// A new cluster was created.
-    #[ink(event)]
-    #[cfg_attr(feature = "std", derive(PartialEq, Debug, scale_info::TypeInfo))]
-    pub struct CdnClusterCreated {
-        #[ink(topic)]
-        cluster_id: ClusterId,
-        #[ink(topic)]
-        manager: AccountId,
-    }
-
-    /// The respective share of revenues of a CDN cluster for a provider was distributed.
-    #[ink(event)]
-    #[cfg_attr(feature = "std", derive(PartialEq, Debug, scale_info::TypeInfo))]
-    pub struct CdnClusterDistributeRevenues {
-        #[ink(topic)]
-        cluster_id: ClusterId,
-        #[ink(topic)]
-        provider_id: AccountId,
-    }
-
-    // ---- End CDN Cluster ----
-
     // ---- Committer ----
 
     impl DdcBucket {
@@ -1386,7 +1371,7 @@ pub mod ddc_bucket {
         ///
         /// # Parameters
         ///
-        /// * `manager` - cluster manager account.
+        /// * `manager_id` - cluster manager account.
         ///
         /// # Output
         ///
@@ -1402,9 +1387,9 @@ pub mod ddc_bucket {
         #[ink(message, payable)]
         pub fn grant_trusted_manager_permission(
             &mut self, 
-            manager: AccountId
+            manager_id: AccountId
         ) -> Result<()> {
-            self.message_grant_trusted_manager_permission(manager)
+            self.message_grant_trusted_manager_permission(manager_id)
         }
 
         /// Revokes permissions from cluster manager.
@@ -1415,7 +1400,7 @@ pub mod ddc_bucket {
         ///
         /// # Parameters
         ///
-        /// * `manager` - cluster manager account.
+        /// * `manager_id` - cluster manager account.
         ///
         /// # Output
         ///
@@ -1431,9 +1416,9 @@ pub mod ddc_bucket {
         #[ink(message)]
         pub fn revoke_trusted_manager_permission(
             &mut self, 
-            manager: AccountId
+            manager_id: AccountId
         ) -> Result<()> {
-            self.message_revoke_trusted_manager_permission(manager)
+            self.message_revoke_trusted_manager_permission(manager_id)
         }
 
     }