refactor for HolonWritable and HolonReadable traits

crates/type_system/base_types/src/lib.rs

@@ -0,0 +1 @@
+

zomes/coordinator/core_schema/src/loader.rs

@@ -66,9 +66,8 @@ pub fn load_core_schema(context: &HolonsContext) -> Result<CommitResponse, Holon
     )?;
 
     info!("Staging Schema...");
-    let staged_schema_ref = HolonReference::Staged(
-        context.space_manager.borrow().stage_new_holon(schema.0.clone())?,
-    );
+    let staged_schema_ref =
+        HolonReference::Staged(context.space_manager.borrow().stage_new_holon(schema.0.clone())?);
 
     context.add_reference_to_dance_state(staged_schema_ref.clone())?;
 

zomes/coordinator/dances/src/dance_request.rs

@@ -103,20 +103,18 @@ impl DanceRequest {
     }
 
     // Method to initialize the HolonsContext + HolonSpaceManger from the session state
-    // This method creates a nursery and a local space holon from the session state if available
-    // If the session is available it will creata a space manager from session otherwise a new one
-    //lastly, it will initialize the HolonsContext with the space manager and return it
     pub fn init_context_from_state(&self) -> HolonsContext {
-        let staged_holons = self.get_state().get_staging_area().get_staged_rc_holons();//from_stage_to_nursery();
-        let stage_index =self.get_state().get_staging_area().get_staged_index();
+        let staged_holons = self.get_state().get_staging_area().get_staged_rc_holons(); //from_stage_to_nursery();
+        let stage_index = self.get_state().get_staging_area().get_staged_index();
         let local_space_holon = self.get_state().get_local_holon_space();
-        let space_manager = HolonSpaceManager::new_from_session(staged_holons, stage_index, local_space_holon);
+        let space_manager =
+            HolonSpaceManager::new_from_session(staged_holons, stage_index, local_space_holon);
         //let space_manager = match local_space_holon {
-         //   None  => HolonSpaceManager::new(),
-         //   Some(local_space_holon) => {
-         //       debug!("Space manager created from session state in dance request");
-          //      HolonSpaceManager::new_from_session(nursery, local_space_holon)
-          //  }
+        //   None  => HolonSpaceManager::new(),
+        //   Some(local_space_holon) => {
+        //       debug!("Space manager created from session state in dance request");
+        //      HolonSpaceManager::new_from_session(nursery, local_space_holon)
+        //  }
         //};
         HolonsContext::init_context(space_manager)
     }

zomes/coordinator/dances/src/descriptors_dance_adapter.rs

@@ -46,7 +46,9 @@ pub fn load_core_schema_dance(
             match result {
                 Ok(commit_response) => match commit_response.status {
                     CommitRequestStatus::Complete => Ok(ResponseBody::None),
-                    CommitRequestStatus::Incomplete => Err(HolonError::CommitFailure("Incomplete commit".to_string())),
+                    CommitRequestStatus::Incomplete => {
+                        Err(HolonError::CommitFailure("Incomplete commit".to_string()))
+                    }
                 },
                 Err(e) => Err(e),
             }

zomes/coordinator/dances/src/holon_dance_adapter.rs

@@ -20,6 +20,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::query::*;
 use holons::relationship::RelationshipName;
 use holons::smart_reference::SmartReference;
@@ -225,7 +226,6 @@ pub fn get_all_holons_dance(
         Ok(holons) => Ok(ResponseBody::Holons(holons)),
         Err(holon_error) => Err(holon_error.into()),
     }
-
 }
 
 /// Builds a DanceRequest for retrieving all holons from the persistent store
@@ -614,8 +614,7 @@ pub fn with_properties_dance(
             };
             //let staged_holon = space_manager.get_mut_holon_by_index(staged_index.clone());
             let holon = space_manager.get_holon_by_index(staged_index.clone())?;
-            let staged_holon = holon.try_borrow_mut()
-            .map_err(|e| {
+            let staged_holon = holon.try_borrow_mut().map_err(|e| {
                 HolonError::FailedToBorrow(format!("Unable to borrow holon immutably: {}", e))
             });
 
@@ -691,12 +690,11 @@ pub fn abandon_staged_changes_dance(
             // Try to get a mutable reference to the staged holon referenced by its index
             let space_manager = context.space_manager.borrow();
             debug!("commit_manager borrowed_mut");
-           // let staged_holon = space_manager_mut.get_mut_holon_by_index(staged_index.clone());
-           let holon = space_manager.get_holon_by_index(staged_index.clone())?;
-           let staged_holon = holon.try_borrow_mut()
-           .map_err(|e| {
-               HolonError::FailedToBorrow(format!("Unable to borrow holon immutably: {}", e))
-           });
+            // let staged_holon = space_manager_mut.get_mut_holon_by_index(staged_index.clone());
+            let holon = space_manager.get_holon_by_index(staged_index.clone())?;
+            let staged_holon = holon.try_borrow_mut().map_err(|e| {
+                HolonError::FailedToBorrow(format!("Unable to borrow holon immutably: {}", e))
+            });
             //debug!("Result of borrow_mut on the staged holon  {:#?}", staged_holon.clone());
 
             match staged_holon {

zomes/coordinator/dances/src/staging_area.rs

@@ -14,15 +14,18 @@ pub struct StagingArea {
     index: BTreeMap<MapString, usize>, // Allows lookup by key to staged holons for which keys are defined
 }
 
-
 impl StagingArea {
     pub fn empty() -> Self {
         StagingArea { staged_holons: Vec::new(), index: BTreeMap::new() }
     }
 
     // Function to create StagingArea from the holon references and index
-    pub fn new_from_references(rc_holons:Vec<Rc<RefCell<Holon>>>, index:BTreeMap<MapString, usize>) -> Self {
-        let staged_holons: Vec<Holon> = rc_holons.iter().map(|holon_rc| holon_rc.borrow().clone()).collect();
+    pub fn new_from_references(
+        rc_holons: Vec<Rc<RefCell<Holon>>>,
+        index: BTreeMap<MapString, usize>,
+    ) -> Self {
+        let staged_holons: Vec<Holon> =
+            rc_holons.iter().map(|holon_rc| holon_rc.borrow().clone()).collect();
         StagingArea { staged_holons, index }
     }
 

zomes/coordinator/dances/tests/shared_test/fixtures/descriptor_dance_fixtures.rs

@@ -15,13 +15,13 @@
 
 use core::panic;
 use dances::dance_response::ResponseStatusCode;
+use holons::context::HolonsContext;
 use holons::helpers::*;
 use holons::holon::Holon;
 use holons::holon_api::*;
 use rstest::*;
 use shared_types_holon::value_types::BaseValue;
 use std::collections::btree_map::BTreeMap;
-use holons::context::HolonsContext;
 
 use crate::shared_test::test_data_types::DancesTestCase;
 

zomes/coordinator/dances/tests/shared_test/mod.rs

@@ -22,7 +22,6 @@ pub mod test_with_properties_command;
 
 use hdk::prelude::*;
 use holochain::sweettest::{SweetAgents, SweetCell, SweetConductor, SweetDnaFile};
-use holons::holon_reference::HolonGettable;
 use holons::{
     context::HolonsContext, holon::Holon, holon_error::HolonError, holon_reference::HolonReference,
     relationship::RelationshipName,

zomes/coordinator/dances/tests/shared_test/test_abandon_staged_changes.rs

@@ -20,7 +20,6 @@ use holons::helpers::*;
 use holons::holon::Holon;
 use holons::holon_api::*;
 use holons::holon_error::HolonError;
-use holons::holon_reference::HolonGettable;
 use shared_types_holon::holon_node::{HolonNode, PropertyMap, PropertyName};
 use shared_types_holon::value_types::BaseValue;
 use shared_types_holon::{HolonId, MapBoolean, MapInteger, MapString};

zomes/coordinator/descriptors/src/boolean_descriptor.rs

@@ -4,6 +4,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
 use shared_types_holon::value_types::{BaseType, ValueType};
@@ -53,8 +54,7 @@ pub fn define_boolean_type(
 
     debug!("Staging... {:#?}", boolean_type.clone());
 
-    let boolean_type_ref =
-        context.space_manager.borrow().stage_new_holon(boolean_type.clone())?;
+    let boolean_type_ref = context.space_manager.borrow().stage_new_holon(boolean_type.clone())?;
 
     // Add its relationships
 

zomes/coordinator/descriptors/src/collection_descriptor.rs

@@ -2,7 +2,9 @@ use hdi::prelude::debug;
 use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
-use holons::holon_reference::{HolonGettable, HolonReference};
+use holons::holon_readable::HolonReadable;
+use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
 use shared_types_holon::value_types::{BaseValue, MapBoolean, MapInteger, MapString};

zomes/coordinator/descriptors/src/descriptor_types.rs

@@ -148,6 +148,7 @@ pub enum SchemaTypeDefinition {
     StringType(StringTypeDefinition),
 }
 
+#[allow(dead_code)]
 trait SchemaNamesTrait {
     /// This method returns unique type_name for this type
     fn derive_type_name(&self) -> MapString;

zomes/coordinator/descriptors/src/enum_descriptor.rs

@@ -3,6 +3,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
 use shared_types_holon::value_types::{BaseType, BaseValue, MapString, ValueType};

zomes/coordinator/descriptors/src/enum_variant_descriptor.rs

@@ -4,6 +4,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
 use shared_types_holon::value_types::{BaseType, BaseValue, MapInteger, MapString, ValueType};

zomes/coordinator/descriptors/src/holon_descriptor.rs

@@ -5,6 +5,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
 use shared_types_holon::value_types::MapString;

zomes/coordinator/descriptors/src/integer_descriptor.rs

@@ -3,6 +3,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
 use shared_types_holon::value_types::{BaseType, BaseValue, MapInteger, MapString, ValueType};
@@ -60,8 +61,7 @@ pub fn define_integer_type(
         )?;
 
     // Stage new holon type
-    let integer_type_ref =
-        context.space_manager.borrow().stage_new_holon(integer_type.clone())?;
+    let integer_type_ref = context.space_manager.borrow().stage_new_holon(integer_type.clone())?;
 
     // Add some relationships
 

zomes/coordinator/descriptors/src/property_descriptor.rs

@@ -1,10 +1,11 @@
 use crate::descriptor_types::{CoreSchemaPropertyTypeName, CoreSchemaRelationshipTypeName};
 use hdi::prelude::debug;
-use holons::{context::HolonsContext, space_manager::HolonStagingBehavior};
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::staged_reference::StagedReference;
+use holons::{context::HolonsContext, space_manager::HolonStagingBehavior};
 use shared_types_holon::{BaseType, BaseValue, MapString, PropertyName};
 
 use crate::type_descriptor::{define_type_descriptor, TypeDescriptorDefinition};

zomes/coordinator/descriptors/src/relationship_descriptor.rs

@@ -3,6 +3,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::relationship::RelationshipName;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;

zomes/coordinator/descriptors/src/string_descriptor.rs

@@ -2,6 +2,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
 use shared_types_holon::value_types::{BaseType, BaseValue, MapInteger, MapString, ValueType};
@@ -67,8 +68,7 @@ pub fn define_string_type(
         )?;
 
     // Stage new string type
-    let string_type_ref =
-        context.space_manager.borrow().stage_new_holon(string_type.clone())?;
+    let string_type_ref = context.space_manager.borrow().stage_new_holon(string_type.clone())?;
 
     // Add some relationships
     string_type_ref.add_related_holons(

zomes/coordinator/descriptors/src/type_descriptor.rs

@@ -7,6 +7,7 @@ use holons::context::HolonsContext;
 use holons::holon::Holon;
 use holons::holon_error::HolonError;
 use holons::holon_reference::HolonReference;
+use holons::holon_writable::HolonWritable;
 use holons::relationship::RelationshipName;
 use holons::space_manager::HolonStagingBehavior;
 use holons::staged_reference::StagedReference;
@@ -96,8 +97,7 @@ pub fn define_type_descriptor(
 
     debug!("{:#?}", descriptor.clone());
 
-    let staged_reference =
-        context.space_manager.borrow().stage_new_holon(descriptor.clone())?;
+    let staged_reference = context.space_manager.borrow().stage_new_holon(descriptor.clone())?;
 
     // Add related holons
 

zomes/coordinator/holons/src/all_holon_nodes.rs

@@ -3,7 +3,6 @@ use holons_integrity::*;
 
 use crate::holon_node::get_latest_holon_node;
 
-
 //TODO: move this function to holon_node.rs and delete the file
 
 /// Get all the HolonNodes from the HolonSpace. In a case where a Holon has more than one version, only return the latest version.

zomes/coordinator/holons/src/context.rs

@@ -10,7 +10,7 @@ use std::rc::Rc;
 pub struct HolonsContext {
     pub dance_state: RefCell<TransientCollection>,
     pub space_manager: Rc<RefCell<HolonSpaceManager>>,
-    pub query_manager: RefCell<QueryManager>
+    pub query_manager: RefCell<QueryManager>,
 }
 
 impl HolonsContext {
@@ -20,19 +20,17 @@ impl HolonsContext {
         HolonsContext {
             dance_state: TransientCollection::new().into(),
             space_manager, //Rc::from(HolonSpaceManager::new().into()),
-            query_manager,// QueryManager::new(Rc.clone(space_manager)).into()
+            query_manager, // QueryManager::new(Rc.clone(space_manager)).into()
         }
     }
-    pub fn init_context(
-        space_manager: HolonSpaceManager,
-    ) -> HolonsContext {
+    pub fn init_context(space_manager: HolonSpaceManager) -> HolonsContext {
         // Return the initialized context
         let space_manager = Rc::from(RefCell::from(space_manager));
         let query_manager = RefCell::from(QueryManager::new(Rc::clone(&space_manager)));
         HolonsContext {
             dance_state: TransientCollection::new().into(),
-            space_manager,//: Rc::from(RefCell::from(space_manager)),
-            query_manager //QueryManager::new(Rc::new(RefCell::new(space_manager))).into()
+            space_manager, //: Rc::from(RefCell::from(space_manager)),
+            query_manager, //QueryManager::new(Rc::new(RefCell::new(space_manager))).into()
         }
     }
 
@@ -41,7 +39,7 @@ impl HolonsContext {
     pub fn get_local_space_holon(&self) -> Option<HolonReference> {
         let space_manager = self.space_manager.borrow();
         space_manager.get_space_holon()
-       // local_space_holon.clone() // If no panic, return cloned value
+        // local_space_holon.clone() // If no panic, return cloned value
     }
 
     pub fn add_references_to_dance_state(

zomes/coordinator/holons/src/holon.rs

@@ -353,8 +353,8 @@ impl Holon {
         }
     }
 
-    //TODO: move this static/stateless function to the Holon_service, the "get()" logic 
-    //including the GetOptions logic should only be in the holon_node module 
+    //TODO: move this static/stateless function to the Holon_service, the "get()" logic
+    //including the GetOptions logic should only be in the holon_node module
     pub fn delete_holon(id: LocalId) -> Result<ActionHash, HolonError> {
         let record = get(id.0.clone(), GetOptions::default())
             .map_err(|e| HolonError::from(e))?
@@ -732,7 +732,7 @@ impl Holon {
             key, local_id, self.state, self.validation_state
         )
     }
-    
+
     /// try_from_node inflates a Holon from a HolonNode.
     /// Since Implemented here to avoid conflicts with hdk::core's implementation of TryFrom Trait
     pub fn try_from_node(holon_node_record: Record) -> Result<Holon, HolonError> {
@@ -793,7 +793,7 @@ impl Holon {
                 property_name.0
             ))),
         }
-    } 
+    }
 
     pub fn get_description(&self) -> Result<MapString, HolonError> {
         let property_name = PropertyName(MapString("description".to_string()));
@@ -826,5 +826,5 @@ impl Holon {
             name.clone().into_base_value(),
         )?;
         Ok(self)
-    } 
+    }
 }

zomes/coordinator/holons/src/holon_collection.rs

@@ -1,7 +1,8 @@
 use crate::context::HolonsContext;
 use crate::holon::AccessType;
 use crate::holon_error::HolonError;
-use crate::holon_reference::{HolonGettable, HolonReference};
+use crate::holon_readable::HolonReadable;
+use crate::holon_reference::HolonReference;
 use crate::relationship::RelationshipName;
 use crate::smartlink::{save_smartlink, SmartLink};
 use core::fmt;