holochain · thedavidmeister · Jul 15, 2019 · Jun 27, 2019 · Jun 27, 2019 · Jun 27, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ jobs:
    - image: holochain/holochain-rust:latest
   steps:
    - checkout
-   - run: nix-shell --run hc-rust-fmt-check
+   - run: nix-shell --run hc-test-fmt
    # don't allow unpinned deps
    - run:
       name: no unpinnned deps
@@ -173,7 +173,9 @@ workflows:
    - build
    - fmt
    - app-spec-tests
-   - app-spec-proc-tests
+   # @todo reimplement proc tests properly
+   # i.e. don't copy and paste app spec and expec it to work with stale state
+   # - app-spec-proc-tests
    - cluster-tests
    - cli-tests
    - wasm-conductor-tests
@@ -214,4 +216,4 @@ workflows:
       filters:
        branches:
         only:
-         - develop
+         - develop
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,10 +9,10 @@ members = [
   "core_api_c_binding",
   "core",
   "dna_c_binding",
-  "hdk-rust",
+  "dpki",
   "hdk-proc-macros",
+  "hdk-rust",
   "net",
-  "dpki",
   "test_bin",
   "benchmarks"
 ]

diff --git a/app_spec/build_and_test.sh b/app_spec/build_and_test.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 mkdir -p dist
+
 echo "===================================================================================="
 echo "RUNNING cargo test for zomes"
 echo "Using conductor binary: `which holochain`"
@@ -9,16 +10,20 @@ echo "--------------------------------------------------------------------------
 
 cargo test --manifest-path zomes/blog/code/Cargo.toml
 cargo test --manifest-path zomes/summer/code/Cargo.toml
+
 echo "===================================================================================="
 echo "BUILDING genome with 'hc package --output dist/app_spec.dna.json --strip-meta':"
 echo "------------------------------------------------------------------------------------"
+
 rm -rf dist
 mkdir dist
 hc package --output dist/app_spec.dna.json --strip-meta
+
 echo "DONE."
 echo "===================================================================================="
 echo "Running test.js in node"
 echo "------------------------------------------------------------------------------------"
+
 cd test
 # --no-bin-links is required for windows vagrant support
 # more precisely symlinks are not supported without additional work on the host

diff --git a/app_spec/default.nix b/app_spec/default.nix
@@ -0,0 +1,6 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./test { }).buildInputs
+ ;
+}
diff --git a/app_spec/test/default.nix b/app_spec/test/default.nix
@@ -0,0 +1,14 @@
+{ pkgs }:
+let
+  name = "hc-app-spec-test";
+
+  script = pkgs.writeShellScriptBin name ''
+  set -euo pipefail
+  hc-cli-install
+  hc-conductor-rust-install
+  (cd app_spec && ./build_and_test.sh);
+  '';
+in
+{
+ buildInputs = [ script ];
+}
diff --git a/app_spec/zomes/blog/code/Cargo.toml b/app_spec/zomes/blog/code/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
 serde = "=1.0.89"
 serde_json = { version = "=1.0.39", features = ["preserve_order"] }
 hdk = { path = "../../../../hdk-rust" }
-holochain_json_derive = "=0.0.1-alpha2"
+holochain_json_derive = "=0.0.14"
 serde_derive = "=1.0.89"
 boolinator = "=2.4.0"
 [lib]

diff --git a/app_spec/zomes/blog/code/src/lib.rs b/app_spec/zomes/blog/code/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #![warn(unused_extern_crates)]
 #[macro_use]
 extern crate hdk;

diff --git a/app_spec/zomes/converse/code/src/lib.rs b/app_spec/zomes/converse/code/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 #[macro_use]
 extern crate hdk;
 #[macro_use]

diff --git a/app_spec/zomes/simple/code/Cargo.toml b/app_spec/zomes/simple/code/Cargo.toml
@@ -9,7 +9,7 @@ serde = "=1.0.89"
 serde_json = { version = "=1.0.39", features = ["preserve_order"] }
 serde_derive = "=1.0.89"
 hdk = { path = "../../../../hdk-rust" }
-holochain_json_derive = "=0.0.1-alpha2"
+holochain_json_derive = "=0.0.14"
 
 [lib]
 path = "src/lib.rs"

diff --git a/app_spec/zomes/simple/code/src/lib.rs b/app_spec/zomes/simple/code/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #![warn(unused_extern_crates)]
 #[macro_use]
 extern crate hdk;
@@ -171,4 +170,3 @@ define_zome! {
         hc_public [create_link, delete_link, get_my_links, test_emit_signal, encrypt, decrypt]
     }
 }
-
diff --git a/app_spec/zomes/summer/code/src/lib.rs b/app_spec/zomes/summer/code/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #[macro_use]
 extern crate hdk;
 extern crate serde;

diff --git a/app_spec_proc_macro/build_and_test.sh b/app_spec_proc_macro/build_and_test.sh
@@ -1,20 +1,29 @@
-#! /bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 mkdir -p dist
+
 echo "===================================================================================="
 echo "RUNNING cargo test for zomes"
+echo "Using conductor binary: `which holochain`"
+echo "Using cli binary:       `which hc`"
 echo "------------------------------------------------------------------------------------"
+
 cargo test --manifest-path zomes/blog/code/Cargo.toml
 cargo test --manifest-path zomes/summer/code/Cargo.toml
+
 echo "===================================================================================="
 echo "BUILDING genome with 'hc package --output dist/app_spec.dna.json --strip-meta':"
 echo "------------------------------------------------------------------------------------"
-rm -f dist/app_spec.dna.json
+
+rm -rf dist
+mkdir dist
 hc package --output dist/app_spec.dna.json --strip-meta
+
 echo "DONE."
 echo "===================================================================================="
-echo "Copying test from app_spec and running test.js in node"
+echo "Running test.js in node"
 echo "------------------------------------------------------------------------------------"
+
 rm -rf ./test
 cp -rf ../app_spec/test ./test
 cd test

diff --git a/app_spec_proc_macro/default.nix b/app_spec_proc_macro/default.nix
@@ -0,0 +1,15 @@
+{ pkgs }:
+let
+  name = "hc-app-spec-test-proc";
+
+  # the test subdirectory gets blown away every run
+  # thats why this is here
+  script = pkgs.writeShellScriptBin name ''
+  hc-cli-install \
+  && hc-conductor-rust-install \
+  && (cd app_spec_proc_macro && ./build_and_test.sh);
+  '';
+in
+{
+ buildInputs = [ script ];
+}
diff --git a/app_spec_proc_macro/zomes/blog/code/Cargo.toml b/app_spec_proc_macro/zomes/blog/code/Cargo.toml
@@ -9,7 +9,7 @@ serde_json = { version = "=1.0.39", features = ["preserve_order"] }
 hdk = { path = "../../../../hdk-rust" }
 hdk-proc-macros = { path = "../../../../hdk-proc-macros" }
 
-holochain_json_derive = "=0.0.1-alpha2"
+holochain_json_derive = "=0.0.14"
 serde_derive = "=1.0.89"
 boolinator = "=2.4.0"
 

diff --git a/app_spec_proc_macro/zomes/blog/code/src/lib.rs b/app_spec_proc_macro/zomes/blog/code/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #![warn(unused_extern_crates)]
 #![feature(proc_macro_hygiene)]
 

diff --git a/app_spec_proc_macro/zomes/converse/code/src/lib.rs b/app_spec_proc_macro/zomes/converse/code/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #![feature(proc_macro_hygiene)]
 
 extern crate hdk_proc_macros;

diff --git a/app_spec_proc_macro/zomes/simple/code/Cargo.toml b/app_spec_proc_macro/zomes/simple/code/Cargo.toml
@@ -10,7 +10,7 @@ serde_json = { version = "=1.0.39", features = ["preserve_order"] }
 serde_derive = "=1.0.89"
 hdk = { path = "../../../../hdk-rust" }
 hdk-proc-macros = { path = "../../../../hdk-proc-macros" }
-holochain_json_derive = "=0.0.1-alpha2"
+holochain_json_derive = "=0.0.14"
 
 [lib]
 path = "src/lib.rs"

diff --git a/app_spec_proc_macro/zomes/simple/code/src/lib.rs b/app_spec_proc_macro/zomes/simple/code/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #![warn(unused_extern_crates)]
 #![feature(proc_macro_hygiene)]
 
@@ -147,4 +146,3 @@ pub mod simple {
     }
 
 }
-
diff --git a/app_spec_proc_macro/zomes/summer/code/src/lib.rs b/app_spec_proc_macro/zomes/summer/code/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #![feature(proc_macro_hygiene)]
 
 extern crate serde;

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -9,10 +9,10 @@ holochain_core = { path = "../core" }
 holochain_common = { path = "../common" }
 holochain_conductor_api = { path = "../conductor_api" }
 holochain_dpki = { path = "../dpki" }
-holochain_json_api = "=0.0.1-alpha2"
-holochain_persistence_api = "=0.0.1-alpha4"
-holochain_persistence_file = "=0.0.1-alpha4"
-lib3h_sodium = "=0.0.3-alpha1"
+holochain_json_api = "=0.0.14"
+holochain_persistence_api = "=0.0.5"
+holochain_persistence_file = "=0.0.5"
+lib3h_sodium = "=0.0.5"
 holochain_wasm_utils = { path = "../wasm_utils" }
 structopt = "=0.2.15"
 failure = "=0.1.5"
@@ -25,7 +25,7 @@ base64 = "=0.10.1"
 colored = "=1.7.0"
 ignore = "=0.4.6"
 rpassword = "=2.1.0"
-rustyline = "=3.0.0"
+rustyline = "=5.0.0"
 
 [dev-dependencies]
 tempfile = "=3.0.7"

diff --git a/cli/default.nix b/cli/default.nix
@@ -0,0 +1,8 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./install { }).buildInputs
+ ++ (pkgs.callPackage ./test { }).buildInputs
+ ++ (pkgs.callPackage ./uninstall { }).buildInputs
+ ;
+}
diff --git a/cli/install/default.nix b/cli/install/default.nix
@@ -0,0 +1,12 @@
+{ pkgs }:
+let
+  name = "hc-cli-install";
+
+  script = pkgs.writeShellScriptBin name
+  ''
+  cargo build -p hc --release && cargo install -f --path cli
+  '';
+in
+{
+ buildInputs = [ script ];
+}
diff --git a/cli/src/cli/package.rs b/cli/src/cli/package.rs
@@ -268,16 +268,15 @@ fn unpack_recurse(mut obj: Object, to: &PathBuf) -> DefaultResult<()> {
                             let base64_content = entry.as_str().unwrap().to_string();
                             let content = base64::decode(&base64_content)?;
 
-                            let mut file_path = to.join(meta_entry);
+                            let file_path = to.join(meta_entry);
 
                             File::create(file_path)?.write_all(&content[..])?;
                         }
                         META_BIN_ID if entry.is_object() => {
                             let base64_content = entry[&meta_entry].to_string();
                             let content = base64::decode(&base64_content)?;
 
-                            let mut file_path =
-                                to.join(meta_entry).with_extension(WASM_FILE_EXTENSION);
+                            let file_path = to.join(meta_entry).with_extension(WASM_FILE_EXTENSION);
 
                             File::create(file_path)?.write_all(&content[..])?;
                         }

diff --git a/cli/src/cli/scaffold/rust-proc-macro/lib.rs b/cli/src/cli/scaffold/rust-proc-macro/lib.rs
@@ -1,4 +1,4 @@
-#![feature(try_from, proc_macro_hygiene)]
+#![feature(proc_macro_hygiene)]
 #[macro_use]
 extern crate hdk;
 extern crate hdk_proc_macros;

diff --git a/cli/src/cli/scaffold/rust/Cargo.template.toml b/cli/src/cli/scaffold/rust/Cargo.template.toml
@@ -10,7 +10,7 @@ serde_json = { version = "=1.0.39", features = ["preserve_order"] }
 serde_derive = "=1.0.89"
 hdk = { git = "https://github.com/holochain/holochain-rust", <<VERSION>> }
 holochain_wasm_utils = { git = "https://github.com/holochain/holochain-rust", <<VERSION>> }
-holochain_json_derive = "=0.0.1-alpha2"
+holochain_json_derive = "=0.0.14"
 
 [lib]
 path = "src/lib.rs"

diff --git a/cli/src/cli/scaffold/rust/lib.rs b/cli/src/cli/scaffold/rust/lib.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #[macro_use]
 extern crate hdk;
 extern crate serde;

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -1,5 +1,4 @@
 #![warn(unused_extern_crates)]
-#![feature(try_from)]
 extern crate holochain_common;
 extern crate holochain_conductor_api;
 extern crate holochain_core;

diff --git a/cli/test/default.nix b/cli/test/default.nix
@@ -0,0 +1,13 @@
+{ pkgs }:
+let
+
+  name = "hc-cli-test";
+
+  script = pkgs.writeShellScriptBin name
+  ''
+  (cd cli && cargo test);
+  '';
+in
+{
+ buildInputs = [ script ];
+}
diff --git a/cli/uninstall/default.nix b/cli/uninstall/default.nix
@@ -0,0 +1,13 @@
+{ pkgs }:
+let
+  name = "hc-cli-uninstall";
+
+  script = pkgs.writeShellScriptBin name
+  ''
+   echo "dropping hc binary from cargo home directory"
+   rm -f $CARGO_HOME/bin/hc
+  '';
+in
+{
+ buildInputs = [ script ];
+}
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 = "=0.0.3-alpha1"
+lib3h_sodium = "=0.0.5"
 holochain_common = { path = "../common" }
 structopt = "=0.2.15"
 tiny_http = "=0.6.2"

diff --git a/conductor/src/main.rs b/conductor/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 #![warn(unused_extern_crates)]
 /// Holochain Conductor executable
 ///
@@ -49,7 +48,7 @@ fn main() {
         Ok(()) => {
             {
                 let mut conductor_guard = CONDUCTOR.lock().unwrap();
-                let mut conductor = conductor_guard.as_mut().expect("Conductor must be mounted");
+                let conductor = conductor_guard.as_mut().expect("Conductor must be mounted");
                 println!(
                     "Successfully loaded {} instance configurations",
                     conductor.instances().len()

diff --git a/conductor_api/Cargo.toml b/conductor_api/Cargo.toml
@@ -6,16 +6,16 @@ authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
 [dependencies]
 holochain_core = { path = "../core" }
 holochain_core_types = { path = "../core_types" }
-holochain_json_derive = "=0.0.1-alpha2"
-holochain_json_api = "=0.0.1-alpha2"
-holochain_persistence_api = "=0.0.1-alpha4"
-holochain_persistence_mem = "=0.0.1-alpha4"
-holochain_persistence_file = "=0.0.1-alpha4"
-holochain_persistence_pickle = "=0.0.1-alpha6"
+holochain_json_derive = "=0.0.14"
+holochain_json_api = "=0.0.14"
+holochain_persistence_api = "=0.0.5"
+holochain_persistence_mem = "=0.0.5"
+holochain_persistence_file = "=0.0.5"
+holochain_persistence_pickle = "=0.0.5"
 holochain_dpki = { path = "../dpki" }
 holochain_net = { path = "../net" }
-lib3h ="=0.0.3-alpha1"
-lib3h_sodium = "=0.0.3-alpha1"
+lib3h ="=0.0.5"
+lib3h_sodium = "=0.0.5"
 holochain_common = { path = "../common" }
 chrono = "=0.4.6"
 serde = "=1.0.89"