Merge pull request #1812 from holochain/hcmutex-gets-own-crate

core_types::sync gets its own crate

Cargo.toml

@@ -11,6 +11,7 @@ members = [
   "crates/dpki",
   "crates/hdk_v2",
   "crates/hdk",
+  "crates/locksmith",
   "crates/net",
   "crates/sim1h",
   "crates/sim2h",

crates/cli/Cargo.toml

@@ -13,6 +13,7 @@ holochain_core = { version = "=0.0.35-alpha7", path = "../core" }
 holochain_common = { version = "=0.0.35-alpha7", path = "../common" }
 holochain_conductor_lib = { version = "=0.0.35-alpha7", path = "../conductor_lib" }
 holochain_dpki = { version = "=0.0.35-alpha7", path = "../dpki" }
+holochain_locksmith = { path = "../locksmith" }
 lib3h_sodium = "=0.0.21"
 holochain_json_api = "=0.0.17"
 holochain_persistence_api = "=0.0.10"

crates/cli/src/cli/chain_log.rs

@@ -4,7 +4,8 @@ use holochain_core::agent::{
     chain_store::ChainStore,
     state::{AgentState, AgentStateSnapshot},
 };
-use holochain_core_types::{chain_header::ChainHeader, entry::Entry, sync::HcRwLock as RwLock};
+use holochain_core_types::{chain_header::ChainHeader, entry::Entry};
+use holochain_locksmith::RwLock;
 use holochain_persistence_api::cas::content::Address;
 use holochain_persistence_file::cas::file::FilesystemStorage;
 use std::{convert::TryFrom, fs, path::PathBuf};

crates/cli/src/main.rs

@@ -4,6 +4,7 @@ extern crate holochain_conductor_lib;
 extern crate holochain_core;
 extern crate holochain_core_types;
 extern crate holochain_json_api;
+extern crate holochain_locksmith;
 extern crate holochain_persistence_api;
 extern crate holochain_persistence_file;
 extern crate lib3h_sodium;

crates/conductor_api/Cargo.toml

@@ -11,6 +11,7 @@ edition = "2018"
 [dependencies]
 holochain_core_types = { version = "=0.0.35-alpha7", path = "../core_types" }
 holochain_wasm_utils = { version = "=0.0.35-alpha7", path = "../wasm_utils" }
+holochain_locksmith = { path = "../locksmith" }
 jsonrpc-core = "=14.0.1"
 jsonrpc-lite = "=0.5.0"
 serde = { version = "=1.0.89", features = ["rc"] }

crates/conductor_api/src/conductor_api.rs

@@ -1,4 +1,5 @@
-use holochain_core_types::{error::HolochainError, sync::HcRwLock as RwLock};
+use holochain_core_types::error::HolochainError;
+use holochain_locksmith::RwLock;
 use holochain_wasm_utils::api_serialization::crypto::CryptoMethod;
 use jsonrpc_core::IoHandler;
 use jsonrpc_lite::JsonRpc;

crates/conductor_lib/Cargo.toml

@@ -10,6 +10,7 @@ authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
 [dependencies]
 holochain_core = { version = "=0.0.35-alpha7", path = "../core" }
 holochain_core_types = { version = "=0.0.35-alpha7", path = "../core_types" }
+holochain_locksmith = { path = "../locksmith" }
 holochain_json_derive = "=0.0.17"
 holochain_json_api = "=0.0.17"
 holochain_persistence_api = "=0.0.10"

crates/conductor_lib/src/conductor/admin.rs

@@ -7,8 +7,8 @@ use crate::{
     dpki_instance::DpkiInstance,
     keystore::{Keystore, PRIMARY_KEYBUNDLE_ID},
 };
-use holochain_core_types::{error::HolochainError, sync::HcRwLock as RwLock};
-
+use holochain_core_types::error::HolochainError;
+use holochain_locksmith::RwLock;
 use holochain_persistence_api::{cas::content::AddressableContent, hash::HashString};
 
 use json_patch;

crates/conductor_lib/src/conductor/base.rs

@@ -17,8 +17,8 @@ use holochain_core_types::{
     agent::AgentId,
     dna::Dna,
     error::{HcResult, HolochainError},
-    sync::{HcMutex as Mutex, HcRwLock as RwLock},
 };
+use holochain_locksmith::{Mutex, RwLock};
 use key_loaders::test_keystore;
 
 use holochain_json_api::json::JsonString;

crates/conductor_lib/src/conductor/passphrase_manager.rs

@@ -1,5 +1,6 @@
 use crossbeam_channel::{unbounded, Sender};
-use holochain_core_types::{error::HolochainError, sync::HcMutex as Mutex};
+use holochain_core_types::error::HolochainError;
+use holochain_locksmith::Mutex;
 use lib3h_sodium::secbuf::SecBuf;
 #[cfg(unix)]
 use log::Level;
@@ -179,28 +180,28 @@ impl PassphraseService for PassphraseServiceUnixSocket {
 
         // Request and read passphrase from socket
         let mut passphrase_string = {
-            let mut stream_option = self.stream.lock().expect(
+            self.stream.lock().expect(
                 "Could not lock mutex holding unix domain socket connection for passphrase service",
-            );
-            let listen_result = stream_option.as_mut()
-                .expect("This option must be some at this point since we would be in above while loop otherwise.");
-            let stream = listen_result
-                .as_mut()
-                .expect("Error accepting unix socket connection for passphrase service");
-
-            log_debug!("Sending passphrase request via unix socket...");
-            stream
-                .get_mut()
-                .write_all(b"request_passphrase")
-                .expect("Could not write to passphrase socket");
-            log_debug!("Passphrase request sent.");
-            let mut passphrase_string = String::new();
-            log_debug!("Reading passphrase from socket...");
-            stream
-                .read_line(&mut passphrase_string)
-                .expect("Could not read from passphrase socket");
-            log_debug!("Got passphrase. All fine.");
-            passphrase_string
+            )
+            .as_mut().as_mut()
+            .ok_or_else(|| HolochainError::ErrorGeneric("This option can't possibly be None".into()))
+            .and_then(|result| result.as_mut().map(|stream| {
+                    log_debug!("Sending passphrase request via unix socket...");
+                    stream
+                        .get_mut()
+                        .write_all(b"request_passphrase")
+                        .expect("Could not write to passphrase socket");
+                    log_debug!("Passphrase request sent.");
+                    let mut passphrase_string = String::new();
+                    log_debug!("Reading passphrase from socket...");
+                    stream
+                        .read_line(&mut passphrase_string)
+                        .expect("Could not read from passphrase socket");
+                    log_debug!("Got passphrase. All fine.");
+                    passphrase_string
+                })
+                .map_err(|_e| HolochainError::ErrorGeneric("Error accepting unix socket connection for passphrase service".into()))
+            )?
         };
 
         // Move passphrase in secure memory

crates/conductor_lib/src/context_builder.rs

@@ -1,7 +1,6 @@
 use holochain_core::{context::Context, persister::SimplePersister, signal::SignalSender};
-use holochain_core_types::{
-    agent::AgentId, eav::Attribute, error::HolochainError, sync::HcRwLock as RwLock,
-};
+use holochain_core_types::{agent::AgentId, eav::Attribute, error::HolochainError};
+use holochain_locksmith::RwLock;
 use holochain_net::p2p_config::P2pConfig;
 use holochain_persistence_api::{
     cas::storage::ContentAddressableStorage, eav::EntityAttributeValueStorage,

crates/conductor_lib/src/holochain.rs

@@ -301,8 +301,9 @@ mod tests {
         nucleus::actions::call_zome_function::make_cap_request_for_call,
         signal::{signal_channel, SignalReceiver},
     };
-    use holochain_core_types::{dna::capabilities::CapabilityRequest, sync::HcMutex as Mutex};
+    use holochain_core_types::dna::capabilities::CapabilityRequest;
     use holochain_json_api::json::RawString;
+    use holochain_locksmith::Mutex;
     use holochain_persistence_api::cas::content::{Address, AddressableContent};
     use holochain_wasm_utils::wasm_target_dir;
     use std::{path::PathBuf, sync::Arc};

crates/conductor_lib/src/interface.rs

@@ -5,13 +5,11 @@ use crossbeam_channel::Receiver;
 use holochain_core::nucleus::actions::call_zome_function::make_cap_request_for_call;
 
 use holochain_core_types::{
-    agent::AgentId,
-    dna::capabilities::CapabilityRequest,
-    signature::Provenance,
-    sync::{HcMutex as Mutex, HcRwLock as RwLock},
+    agent::AgentId, dna::capabilities::CapabilityRequest, signature::Provenance,
 };
 use holochain_dpki::key_bundle::KeyBundle;
 use holochain_json_api::json::JsonString;
+use holochain_locksmith::{Mutex, RwLock};
 use holochain_persistence_api::cas::content::Address;
 use lib3h_sodium::secbuf::SecBuf;
 use Holochain;

crates/conductor_lib/src/key_loaders.rs

@@ -3,8 +3,9 @@ use crate::{
     keystore::{Keystore, Secret, PRIMARY_KEYBUNDLE_ID},
 };
 use conductor::passphrase_manager::{PassphraseManager, PassphraseServiceMock};
-use holochain_core_types::{error::HolochainError, sync::HcMutex as Mutex};
+use holochain_core_types::error::HolochainError;
 use holochain_dpki::{password_encryption::PwHashConfig, SEED_SIZE};
+use holochain_locksmith::Mutex;
 use keystore::test_hash_config;
 use lib3h_sodium::{hash::sha256, secbuf::SecBuf};
 use std::{path::PathBuf, sync::Arc};

crates/conductor_lib/src/keystore.rs

@@ -2,7 +2,6 @@ use holochain_core_types::{
     agent::Base32,
     error::{HcResult, HolochainError},
     signature::Signature,
-    sync::HcMutex as Mutex,
 };
 use holochain_dpki::{
     key_blob::{BlobType, Blobbable, KeyBlob},
@@ -15,6 +14,7 @@ use holochain_dpki::{
     },
     SEED_SIZE,
 };
+use holochain_locksmith::Mutex;
 
 use lib3h_sodium::{
     pwhash::{ALG_ARGON2ID13, MEMLIMIT_INTERACTIVE, OPSLIMIT_INTERACTIVE},

crates/conductor_lib/src/lib.rs

@@ -97,6 +97,7 @@ extern crate holochain_core_types;
 extern crate holochain_json_derive;
 extern crate holochain_dpki;
 extern crate holochain_json_api;
+extern crate holochain_locksmith;
 extern crate holochain_net;
 extern crate holochain_persistence_api;
 extern crate holochain_persistence_file;

crates/core/Cargo.toml

@@ -43,6 +43,7 @@ holochain_persistence_file = "=0.0.10"
 holochain_persistence_mem = "=0.0.10"
 holochain_core_types = { version = "=0.0.35-alpha7", path = "../core_types" }
 holochain_dpki = { version = "=0.0.35-alpha7", path = "../dpki" }
+holochain_locksmith = { path = "../locksmith" }
 log = "=0.4.8"
 holochain_logging = "=0.0.4"
 boolinator = "=2.4.0"

crates/core/src/agent/chain_store.rs

@@ -3,8 +3,8 @@ use holochain_core_types::{
     chain_header::ChainHeader,
     entry::entry_type::EntryType,
     error::RibosomeErrorCode::{self, *},
-    sync::HcRwLock as RwLock,
 };
+use holochain_locksmith::RwLock;
 use holochain_persistence_api::cas::{
     content::{Address, AddressableContent},
     storage::ContentAddressableStorage,
@@ -305,10 +305,10 @@ pub mod tests {
             entry_type::{test_entry_type_b, AppEntryType},
             test_entry, test_entry_b, test_entry_c, Entry,
         },
-        sync::HcRwLock as RwLock,
         time::test_iso_8601,
     };
     use holochain_json_api::json::{JsonString, RawString};
+    use holochain_locksmith::RwLock;
     use holochain_persistence_api::cas::content::AddressableContent;
     use holochain_persistence_file::cas::file::FilesystemStorage;
     use tempfile;

crates/core/src/context.rs

@@ -22,11 +22,8 @@ use holochain_core_types::{
         Entry,
     },
     error::{HcResult, HolochainError},
-    sync::{
-        HcMutex as Mutex, HcMutexGuard as MutexGuard, HcRwLock as RwLock,
-        HcRwLockReadGuard as RwLockReadGuard,
-    },
 };
+use holochain_locksmith::{Mutex, MutexGuard, RwLock, RwLockReadGuard};
 use holochain_net::{p2p_config::P2pConfig, p2p_network::P2pNetwork};
 use holochain_persistence_api::{
     cas::{
@@ -394,7 +391,8 @@ pub mod tests {
     use self::tempfile::tempdir;
     use super::*;
     use crate::persister::SimplePersister;
-    use holochain_core_types::{agent::AgentId, sync::HcRwLock as RwLock};
+    use holochain_core_types::agent::AgentId;
+    use holochain_locksmith::RwLock;
     use holochain_persistence_file::{cas::file::FilesystemStorage, eav::file::EavFileStorage};
     use std::sync::Arc;
     use tempfile;

crates/core/src/dht/dht_store.rs

@@ -5,9 +5,9 @@ use holochain_core_types::{
     eav::{Attribute, EaviQuery, EntityAttributeValueIndex},
     entry::Entry,
     error::HolochainError,
-    sync::HcRwLock as RwLock,
 };
 use holochain_json_api::{error::JsonError, json::JsonString};
+use holochain_locksmith::RwLock;
 use holochain_persistence_api::{
     cas::{
         content::{Address, AddressableContent},

crates/core/src/instance.rs

@@ -19,9 +19,9 @@ use crossbeam_channel::{unbounded, Receiver, Sender};
 use holochain_core_types::{
     dna::Dna,
     error::{HcResult, HolochainError},
-    sync::{HcRwLock as RwLock, HcRwLockReadGuard as RwLockReadGuard},
     ugly::lax_send_sync,
 };
+use holochain_locksmith::{RwLock, RwLockReadGuard};
 #[cfg(test)]
 use holochain_persistence_api::cas::content::Address;
 use snowflake::ProcessUniqueId;
@@ -396,8 +396,8 @@ pub mod tests {
         chain_header::test_chain_header,
         dna::{zome::Zome, Dna},
         entry::{entry_type::EntryType, test_entry},
-        sync::{HcMutex as Mutex, HcRwLock as RwLock},
     };
+    use holochain_locksmith::{Mutex, RwLock};
     use holochain_persistence_api::cas::content::AddressableContent;
     use holochain_persistence_file::{cas::file::FilesystemStorage, eav::file::EavFileStorage};
     use tempfile;

crates/core/src/logger.rs

@@ -3,7 +3,7 @@
 //! gets emitted globaly from the conductor.
 use chrono::Local;
 use crossbeam_channel;
-use holochain_core_types::sync::HcMutex as Mutex;
+use holochain_locksmith::Mutex;
 use std::sync::Arc;
 
 /// trait that defines the logging functionality that holochain_core requires

crates/core/src/macros.rs

@@ -92,7 +92,8 @@ macro_rules! log_error {
 #[test]
 fn context_log_macro_test() {
     use crate::{context::Context, persister::SimplePersister};
-    use holochain_core_types::{agent::AgentId, sync::HcRwLock as RwLock};
+    use holochain_core_types::agent::AgentId;
+    use holochain_locksmith::RwLock;
     use holochain_net::p2p_config::P2pConfig;
     use holochain_persistence_file::{cas::file::FilesystemStorage, eav::file::EavFileStorage};
     use std::sync::Arc;

crates/core/src/network/actions/shutdown.rs

@@ -4,11 +4,8 @@ use crate::{
 };
 use crossbeam_channel::Sender;
 use futures::{future::Future, task::Poll};
-
-use holochain_core_types::{
-    error::{HcResult, HolochainError},
-    sync::HcRwLock as RwLock,
-};
+use holochain_core_types::error::{HcResult, HolochainError};
+use holochain_locksmith::RwLock;
 
 use crate::state::StateWrapper;
 use std::{pin::Pin, sync::Arc};

crates/core/src/network/reducers/init.rs

@@ -58,7 +58,8 @@ pub mod test {
         persister::SimplePersister,
         state::{test_store, StateWrapper},
     };
-    use holochain_core_types::{agent::AgentId, sync::HcRwLock as RwLock};
+    use holochain_core_types::agent::AgentId;
+    use holochain_locksmith::RwLock;
     use holochain_net::{connection::net_connection::NetHandler, p2p_config::P2pConfig};
     use holochain_persistence_api::cas::content::{Address, AddressableContent};
     use holochain_persistence_file::{cas::file::FilesystemStorage, eav::file::EavFileStorage};

crates/core/src/nucleus/actions/get_entry.rs

@@ -4,17 +4,15 @@ use holochain_core_types::{
     eav::{Attribute, EaviQuery, EntityAttributeValueIndex},
     entry::{Entry, EntryWithMeta},
     error::HolochainError,
-    sync::HcRwLock as RwLock,
 };
-
+use holochain_locksmith::RwLock;
 use holochain_persistence_api::{
     cas::{
         content::{Address, AddressableContent},
         storage::ContentAddressableStorage,
     },
     eav::IndexFilter,
 };
-
 use std::{collections::BTreeSet, str::FromStr, sync::Arc};
 
 pub(crate) fn get_entry_from_cas(

crates/core/src/persister.rs

@@ -4,7 +4,8 @@ use crate::{
     nucleus::state::{NucleusStateSnapshot, NUCLEUS_SNAPSHOT_ADDRESS},
     state::State,
 };
-use holochain_core_types::{error::HolochainError, sync::HcRwLock as RwLock};
+use holochain_core_types::error::HolochainError;
+use holochain_locksmith::RwLock;
 
 use holochain_persistence_api::cas::{
     content::{Address, AddressableContent, Content},

crates/core/src/state.rs

@@ -16,8 +16,8 @@ use holochain_core_types::{
     eav::{Attribute, EaviQuery},
     entry::{entry_type::EntryType, Entry},
     error::{HcResult, HolochainError},
-    sync::HcRwLock as RwLock,
 };
+use holochain_locksmith::RwLock;
 use holochain_persistence_api::{
     cas::{
         content::{Address, AddressableContent},

crates/core_types/Cargo.toml

@@ -36,6 +36,7 @@ objekt= "=0.1.2"
 holochain_persistence_api = "=0.0.10"
 holochain_json_derive = "=0.0.17"
 holochain_json_api = "=0.0.17"
+holochain_locksmith = { path = "../locksmith" }
 uuid = { version = "=0.7.1", features = ["v4"] }
 regex = "=1.1.2"
 shrinkwraprs = "=0.2.1"