holochain · lucksus · Oct 11, 2019 · Oct 5, 2019 · Oct 6, 2019 · Oct 6, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -77,6 +77,19 @@ jobs:
        name: app spec tests
        command: nix-shell --run hc-app-spec-test-sim1h
 
+ app-spec-tests-sim2h:
+   docker:
+     - image: holochain/holochain-rust:latest
+   resource_class: xlarge
+   steps:
+     - checkout
+     - run:
+         name: sim2h server
+         command: nix-shell --run hc-sim2h-server
+         background: true
+     - run:
+         name: app spec tests
+         command: nix-shell --run hc-app-spec-test-sim2h
 # app-spec-tests-n3h:
 #  docker:
 #   - image: holochain/holochain-rust:latest
@@ -128,8 +141,8 @@ jobs:
   steps:
    - checkout
    - run:
-       name: DynamoDB
-       command: nix-shell --run "dynamodb-memory -port 8002"
+       name: sim2h server
+       command: nix-shell --run "hc-sim2h-server -p 9001"
        background: true
    - run:
        name: app spec cluster tests
@@ -226,6 +239,7 @@ workflows:
    - build
    - fmt
    - app-spec-tests-sim1h
+   - app-spec-tests-sim2h
    # - app-spec-tests-memory
    # - app-spec-tests-websocket
    # @todo reimplement proc tests properly

diff --git a/CHANGELOG-UNRELEASED.md b/CHANGELOG-UNRELEASED.md
@@ -5,7 +5,30 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 {{ version-heading }}
 
 ### Added
-
+* Adds a network back-end: `sim2h` and all corresponding integration. [#1744](https://github.com/holochain/holochain-rust/pull/1744)
+
+  [Sim2h](https://github.com/holochain/sim2h) is the next iteration of sim1h.
+  In contrast to sim1h, it does not use a centralized database but a
+  centralized in-memory network that connects Holochain instances
+  like a switch-board.
+
+  It is much faster than sim1h and will be able to implement Holochain
+  membranes based on the agent IDs and the `validate_agent` callback.
+
+  It can be used by configuring conductors like so:
+  ```toml
+  [network]
+  type = "sim2h"
+  sim2h_url = "wss://localhost:9000"
+  ```
+  with `sim2h_url` pointing to a running `sim2h_server` instance.
+
+  This also adds nix-shell commands:
+  - `hc-sim2h-server` which starts the server part with debug logs on
+    port 9000 (can be changed with `-p`)
+  - `hc-app-spec-test-sim2h` which runs the integration tests with 
+    networking configured to sim2h (expects to find a running 
+    sim2h_server on localhost:9000)
 ### Changed
 
 ### Deprecated

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,6 +5,7 @@ members = [
   "common",
   "conductor",
   "conductor_api",
+  "conductor_api_api",
   "conductor_wasm",
   "core_api_c_binding",
   "core",

diff --git a/app_spec/test/default.nix b/app_spec/test/default.nix
@@ -26,7 +26,24 @@ let
   hc-conductor-install
   (cd app_spec && APP_SPEC_NETWORK_TYPE="sim1h" ./build_and_test.sh);
   '';
+
+  name-sim2h = "hc-app-spec-test-sim2h";
+
+  script-sim2h = pkgs.writeShellScriptBin name-sim2h ''
+  set -euo pipefail
+  hc-cli-install
+  hc-conductor-install
+  (cd app_spec && APP_SPEC_NETWORK_TYPE="sim2h" ./build_and_test.sh);
+  '';
+
+  name-sim2h-server = "hc-sim2h-server";
+
+  script-sim2h-server = pkgs.writeShellScriptBin name-sim2h-server ''
+  set -euo pipefail
+  cargo install sim2h_server -f --git https://github.com/holochain/sim2h
+  RUST_LOG=debug sim2h_server "$@"
+  '';
 in
 {
- buildInputs = [ script-n3h script-memory script-sim1h ];
+ buildInputs = [ script-n3h script-memory script-sim1h script-sim2h script-sim2h-server ];
 }
diff --git a/app_spec/test/index.js b/app_spec/test/index.js
@@ -57,6 +57,21 @@ if (process.env.APP_SPEC_NETWORK_TYPE === "sim1h")
   );
 }
 
+if (process.env.APP_SPEC_NETWORK_TYPE === "sim2h")
+{
+    transport_config = {
+        type: 'sim2h',
+        sim2h_url: "wss://localhost:9000",
+    }
+
+    // omit singleConductor
+    middleware = combine(
+        // dumbWaiter(1000),
+        callSyncMiddleware,
+        tapeExecutor(require('tape')),
+    );
+}
+
 const orchestrator = new Orchestrator({
   middleware,
   waiter: {

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -9,7 +9,7 @@ holochain_core = { path = "../core" }
 holochain_common = { path = "../common" }
 holochain_conductor_api = { path = "../conductor_api" }
 holochain_dpki = { path = "../dpki" }
-lib3h_sodium = { version = "=0.0.13" }
+lib3h_sodium = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
 holochain_json_api = "=0.0.17"
 holochain_persistence_api = "=0.0.8"
 holochain_persistence_file = "=0.0.8"

diff --git a/conductor/Cargo.toml b/conductor/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
 [dependencies]
 holochain_core_types = { path = "../core_types" }
 holochain_conductor_api = { path = "../conductor_api" }
-lib3h_sodium = { version = "=0.0.13" }
+lib3h_sodium = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
 holochain_common = { path = "../common" }
 structopt = "=0.2.15"
 tiny_http = "=0.6.2"

diff --git a/conductor_api/Cargo.toml b/conductor_api/Cargo.toml
@@ -14,8 +14,8 @@ holochain_persistence_file = "=0.0.8"
 holochain_persistence_pickle = "=0.0.8"
 holochain_dpki = { path = "../dpki" }
 holochain_net = { path = "../net" }
-lib3h = { version = "=0.0.13" }
-lib3h_sodium = { version = "=0.0.13" }
+lib3h = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
+lib3h_sodium = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
 holochain_common = { path = "../common" }
 chrono = "=0.4.6"
 serde = "=1.0.89"

diff --git a/conductor_api/src/conductor/base.rs b/conductor_api/src/conductor/base.rs
@@ -565,6 +565,7 @@ impl Conductor {
             }
             NetworkConfig::Memory(_) => unimplemented!(),
             NetworkConfig::Sim1h(_) => unimplemented!(),
+            NetworkConfig::Sim2h(_) => unimplemented!(),
             NetworkConfig::Lib3h(_) => Err(HolochainError::ErrorGeneric(
                 "Lib3h Network not implemented".to_string(),
             )),
@@ -636,9 +637,13 @@ impl Conductor {
                 );
                 // create an empty network with this config just so the n3h process doesn't
                 // kill itself in the case that all instances are closed down (as happens in app-spec)
-                let network =
-                    P2pNetwork::new(NetHandler::new(Box::new(|_r| Ok(()))), config.clone())
-                        .expect("unable to create conductor keepalive P2pNetwork");
+                let network = P2pNetwork::new(
+                    NetHandler::new(Box::new(|_r| Ok(()))),
+                    config.clone(),
+                    None,
+                    None,
+                )
+                .expect("unable to create conductor keepalive P2pNetwork");
                 self.n3h_keepalive_network = Some(network);
                 config
             }
@@ -657,6 +662,11 @@ impl Conductor {
                 backend_config: BackendConfig::Sim1h(config),
                 maybe_end_user_config: None,
             },
+            NetworkConfig::Sim2h(config) => P2pConfig {
+                backend_kind: P2pBackendKind::SIM2H,
+                backend_config: BackendConfig::Sim2h(config),
+                maybe_end_user_config: None,
+            },
         }
     }
 

diff --git a/conductor_api/src/config.rs b/conductor_api/src/config.rs
@@ -25,7 +25,7 @@ use holochain_json_api::json::JsonString;
 use holochain_persistence_api::cas::content::AddressableContent;
 use lib3h::engine::EngineConfig;
 
-use holochain_net::sim1h_worker::Sim1hConfig;
+use holochain_net::{sim1h_worker::Sim1hConfig, sim2h_worker::Sim2hConfig};
 use petgraph::{algo::toposort, graph::DiGraph, prelude::NodeIndex};
 use serde::Deserialize;
 use std::{
@@ -832,6 +832,7 @@ pub enum NetworkConfig {
     Lib3h(EngineConfig),
     Memory(EngineConfig),
     Sim1h(Sim1hConfig),
+    Sim2h(Sim2hConfig),
 }
 
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone)]

diff --git a/conductor_api_api/Cargo.toml b/conductor_api_api/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "holochain_conductor_api_api"
+version = "0.0.32-alpha2"
+authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
+edition = "2018"
+
+[dependencies]
+holochain_core_types = { path = "../core_types" }
+holochain_wasm_utils = { path = "../wasm_utils" }
+jsonrpc-core = { git = "https://github.com/holochain/jsonrpc", branch = "broadcaster-getter" }
+jsonrpc-lite = "=0.5.0"
+serde = { version = "=1.0.89", features = ["rc"] }
+serde_json = { version = "=1.0.39", features = ["preserve_order"] }
+snowflake = "=1.3.0"
diff --git a/core/src/conductor_api.rs → conductor_api_api/src/conductor_api.rs b/core/src/conductor_api.rs → conductor_api_api/src/conductor_api.rs
@@ -1,11 +1,10 @@
 use holochain_core_types::{error::HolochainError, sync::HcRwLock as RwLock};
+use holochain_wasm_utils::api_serialization::crypto::CryptoMethod;
 use jsonrpc_core::IoHandler;
 use jsonrpc_lite::JsonRpc;
 use snowflake::ProcessUniqueId;
 use std::{fmt, sync::Arc};
 
-use holochain_wasm_utils::api_serialization::crypto::CryptoMethod;
-
 #[derive(Clone)]
 pub struct ConductorApi(Arc<RwLock<IoHandler>>);
 

diff --git a/conductor_api_api/src/lib.rs b/conductor_api_api/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod conductor_api;
+pub use conductor_api::ConductorApi;
+pub use holochain_wasm_utils::api_serialization::crypto::CryptoMethod;
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -29,8 +29,9 @@ toml = "=0.5.0"
 holochain_net = { path = "../net" }
 holochain_wasm_utils = { path = "../wasm_utils"}
 holochain_common = { path = "../common" }
-lib3h_protocol = { version = "=0.0.13" }
-lib3h_sodium = { version = "=0.0.13" }
+holochain_conductor_api_api = { path = "../conductor_api_api" }
+lib3h_protocol = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
+lib3h_sodium = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
 holochain_json_derive = "=0.0.17"
 holochain_json_api = "=0.0.17"
 holochain_persistence_api = "=0.0.8"

diff --git a/core/src/agent/state.rs b/core/src/agent/state.rs
@@ -221,13 +221,8 @@ pub fn create_entry_with_header_for_header(
     chain_header: ChainHeader,
 ) -> Result<EntryWithHeader, HolochainError> {
     let entry = Entry::ChainHeader(chain_header);
-    let header = create_new_chain_header(
-        &entry,
-        &root_state.agent(),
-        &root_state,
-        &None,
-        &Vec::new(),
-    )?;
+    let header =
+        create_new_chain_header(&entry, &root_state.agent(), &root_state, &None, &Vec::new())?;
     Ok(EntryWithHeader { entry, header })
 }
 

diff --git a/core/src/context.rs b/core/src/context.rs
@@ -1,6 +1,5 @@
 use crate::{
     action::{Action, ActionWrapper},
-    conductor_api::ConductorApi,
     instance::Observer,
     network::state::NetworkState,
     nucleus::actions::get_entry::get_entry_from_cas,
@@ -12,6 +11,7 @@ use futures::{task::Poll, Future};
 
 use crate::state::StateWrapper;
 use futures::task::noop_waker_ref;
+use holochain_conductor_api_api::ConductorApi;
 use holochain_core_types::{
     agent::AgentId,
     dna::{wasm::DnaWasm, Dna},
@@ -27,7 +27,6 @@ use holochain_core_types::{
         HcRwLockReadGuard as RwLockReadGuard,
     },
 };
-
 use holochain_net::{p2p_config::P2pConfig, p2p_network::P2pNetwork};
 use holochain_persistence_api::{
     cas::{
@@ -199,10 +198,7 @@ impl Context {
     /// is occupied already.
     /// Also returns None if the context was not initialized with a state.
     pub fn try_state(&self) -> Option<RwLockReadGuard<StateWrapper>> {
-        self.state
-            .as_ref()
-            .map(|s| s.try_read())
-            .unwrap_or(None)
+        self.state.as_ref().map(|s| s.try_read()).unwrap_or(None)
     }
 
     pub fn network(&self) -> P2pNetworkWrapper {

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -44,6 +44,3 @@ pub mod signal;
 pub mod state;
 pub mod state_dump;
 pub mod workflows;
-
-mod conductor_api;
-
diff --git a/core/src/network/reducers/init.rs b/core/src/network/reducers/init.rs
@@ -4,14 +4,16 @@ use crate::{
     state::State,
 };
 use holochain_net::{connection::net_connection::NetSend, p2p_network::P2pNetwork};
-use lib3h_protocol::{data_types::SpaceData, protocol_client::Lib3hClientProtocol};
+use lib3h_protocol::{data_types::SpaceData, protocol_client::Lib3hClientProtocol, Address};
 
-pub fn reduce_init(state: &mut NetworkState, _root_state: &State, action_wrapper: &ActionWrapper) {
+pub fn reduce_init(state: &mut NetworkState, root_state: &State, action_wrapper: &ActionWrapper) {
     let action = action_wrapper.action();
     let network_settings = unwrap_to!(action => Action::InitNetwork);
     let network = P2pNetwork::new(
         network_settings.handler.clone(),
         network_settings.p2p_config.clone(),
+        Some(Address::from(network_settings.agent_id.clone())),
+        Some(root_state.conductor_api.clone()),
     )
     .unwrap();
 

diff --git a/core/src/state.rs b/core/src/state.rs
@@ -4,7 +4,6 @@ use crate::{
         chain_store::ChainStore,
         state::{AgentState, AgentStateSnapshot},
     },
-    conductor_api::ConductorApi,
     context::Context,
     dht::dht_store::DhtStore,
     network::state::NetworkState,
@@ -18,7 +17,7 @@ use holochain_core_types::{
     error::{HcResult, HolochainError},
     sync::{HcRwLock as RwLock},
 };
-
+use holochain_conductor_api_api::ConductorApi;
 use holochain_persistence_api::{
     cas::{
         content::{Address, AddressableContent},

diff --git a/core_types/Cargo.toml b/core_types/Cargo.toml
@@ -27,15 +27,15 @@ hcid = "=0.0.6"
 rust-base58 = "=0.0.4"
 snowflake = "=1.3.0"
 objekt= "=0.1.2"
-lib3h_crypto_api = { version = "=0.0.13" }
 holochain_persistence_api = "=0.0.8"
 holochain_json_derive = "=0.0.17"
 holochain_json_api = "=0.0.17"
 uuid = { version = "=0.7.1", features = ["v4"] }
 regex = "=1.1.2"
 shrinkwraprs = "=0.2.1"
 crossbeam-channel = "=0.3.8"
-lib3h_protocol = { version = "=0.0.13" }
+lib3h_crypto_api = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
+lib3h_protocol = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
 parking_lot ="=0.9.0"
 log = "=0.4.8"
 logging = { path = "../logging" }

diff --git a/dpki/Cargo.toml b/dpki/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 lazy_static = "=1.2.0"
 base64 = "=0.10.1"
 holochain_core_types = { path = "../core_types" }
-lib3h_sodium = { version = "=0.0.13" }
+lib3h_sodium = { git = "https://github.com/holochain/lib3h", branch = "transport-disconnect" }
 holochain_persistence_api = "=0.0.8"
 serde = "=1.0.89"
 serde_derive = "=1.0.89"

diff --git a/hc_cluster_test/spawn_conductors.ts b/hc_cluster_test/spawn_conductors.ts
@@ -57,8 +57,8 @@ ${debugging ? '' : 'exclude = true'}
 ${debugging ? '': 'pattern = "^debug"'}
 
 [network]
-type = "sim1h"
-dynamo_url = "http://localhost:8002"
+type = "sim2h"
+sim2h_url = "wss://localhost:9001"
     `
 
   return { config, adminPort, instancePort }