From 13d1f5154bf02b74ed1a7cde2ef384be1470e667 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 27 Oct 2018 23:45:46 -0400 Subject: [PATCH 01/13] fix docker for hcshell --- docker/Dockerfile.holochain-cmd | 3 ++- docker/update | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.holochain-cmd b/docker/Dockerfile.holochain-cmd index 7188d63..1814211 100644 --- a/docker/Dockerfile.holochain-cmd +++ b/docker/Dockerfile.holochain-cmd @@ -2,7 +2,8 @@ FROM holochain/holochain-rust:develop RUN apt-get update && apt-get install --yes \ qtdeclarative5-dev \ - libqt5websockets5-dev + libqt5websockets5-dev \ + libreadline6-dev USER root diff --git a/docker/update b/docker/update index 51cd9d8..8b58a82 100755 --- a/docker/update +++ b/docker/update @@ -9,6 +9,7 @@ git submodule init git submodule update cd /holochain/holosqape +git reset --hard git pull git submodule init git submodule update @@ -18,13 +19,14 @@ cd /holochain/holosqape/holochain-rust cargo update cargo +$TOOLS_NIGHTLY build --release - echo "COMPILING HOLOSQAPE BINDINGS" cd /holochain/holosqape/bindings -qmake +make clean +qmake CONFIG+=release make echo "COMPILING hcshell" cd /holochain/holosqape/hcshell +make clean qmake CONFIG+=release make From 79d82cb488949bb08633ddf59042184a0ed55c9b Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Mon, 29 Oct 2018 11:20:25 -0400 Subject: [PATCH 02/13] set docker to develop --- .travis.yml | 2 +- docker/run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97ac755..4b201a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,6 @@ jobs: include: - stage: "All" name: "Tests" - install: docker pull holochain/holochain-cmd:latest + install: docker pull holochain/holochain-cmd:develop script: - . docker/run-ci \ No newline at end of file diff --git a/docker/run b/docker/run index 06fbd6a..2a87e8b 100755 --- a/docker/run +++ b/docker/run @@ -18,4 +18,4 @@ docker run -h holochain \ -v `pwd`:/holochain/holochain-cmd \ -u root:root \ -v $HOME/.cargo/registry:/home/holochain/.cargo/registry \ - --rm -it holochain/holochain-cmd:latest ./holochain-cmd/docker/entry "$@" + --rm -it holochain/holochain-cmd:develop ./holochain-cmd/docker/entry "$@" From fe7b2acd60686d52dcc3c14aac1028a4dd5ffa90 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 2 Nov 2018 20:21:44 -0400 Subject: [PATCH 03/13] link to develop preview release as primary installation pathway --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9cbee43..5d5a9e5 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,10 @@ This repo provides a set of tools for building and running Holochain DNA from th ## Install +Our recommended pattern for the installation of `hc` command line tools is to use the Developer Preview release that you can find here, along with its instructions: https://github.com/holochain/app-spec-rust/releases/tag/v0.0.1-dev-preview. Otherwise, you can proceed with the more complex instructions for building from source, below. + +### Building From Source + These dependencies need to be installed in order to compile, and use `holochain-cmd`: - [Rust](https://www.rust-lang.org/en-US/install.html) From 89f614f7d39b2b5b9a91673412dd0f396761fcc8 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 2 Nov 2018 20:24:55 -0400 Subject: [PATCH 04/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5d5a9e5..f3467f1 100644 --- a/README.md +++ b/README.md @@ -63,10 +63,10 @@ $ cd your_app_name We now have the empty shell of a Holochain app. From here, we will want to generate at least one Zome. To do this, run the following, replacing `your_zome_name` with a name related to the functionality you wish to develop. For example: `users`. ```shell -$ hc generate zomes/your_zome_name rust +$ hc generate zomes/your_zome_name ``` -Currently, Zomes can be generated as `rust`. In the future, you may be able to generate zomes in another language. `hc generate` scaffolds the files and config you need to get started. +Currently, only Zomes written in Rust can be generated. In the future, you may be able to generate Zomes in another language. `hc generate` scaffolds the files and config you need to get started. What this did is generate a new folder under `zomes` called `users`. Here is the folder structure of it. - users From 6c6daeb55f11429a8ae2c1d84499c6e47e858ad6 Mon Sep 17 00:00:00 2001 From: Julian Laubstein Date: Mon, 5 Nov 2018 18:26:57 +0100 Subject: [PATCH 05/13] Fixed tests --- src/cli/package.rs | 39 ++++--- src/cli/scaffold/rust/Cargo.template.toml | 24 ++-- src/cli/scaffold/rust/lib.rs | 9 ++ src/cli/test.rs | 136 ++++++++++++++-------- 4 files changed, 129 insertions(+), 79 deletions(-) diff --git a/src/cli/package.rs b/src/cli/package.rs index 6412a84..e8d2aa5 100644 --- a/src/cli/package.rs +++ b/src/cli/package.rs @@ -1,14 +1,10 @@ use base64; +use cli::test_context::test_context; use colored::*; use config_files::Build; use error::DefaultResult; +use holochain_core::nucleus::{ribosome, ZomeFnCall}; use ignore::WalkBuilder; -use holochain_core::{ - nucleus::{ - ribosome, ZomeFnCall, - }, -}; -use cli::test_context::test_context; use serde_json::{self, Map, Value}; use std::{ fs::{self, File}, @@ -147,23 +143,24 @@ impl Packager { // We need to setup a shallow test context which actually is not needed // here so it doesn't matter what is in there. // TODO: extract core of run_dna() into a function that does not need a context - let context= test_context("HC"); + let context = test_context("HC"); // We just call into __hdk_get_json_definition() without any arguments. // What we get back is a JSON string with all the entry types and zome functions // defined in that WASM code, constructed through our Rust macros define_zome! // and entry!. let call_result = ribosome::run_dna( - &"HC", + "HC", context, wasm_binary, - &ZomeFnCall::new(&"", &"", &"__hdk_get_json_definition", &""), - Some("{}".as_bytes().to_vec()) + &ZomeFnCall::new("", "", "__hdk_get_json_definition", ""), + Some("{}".as_bytes().to_vec()), )?; let json_from_wasm: Map = serde_json::from_str(&call_result)?; let mut sub_tree_content = self.bundle_recurse(&node)?; for key in json_from_wasm.keys() { - sub_tree_content.insert(key.clone(), json_from_wasm.get(key).unwrap().clone()); + sub_tree_content + .insert(key.clone(), json_from_wasm.get(key).unwrap().clone()); } // here insert json generated by the wasm, alongside the rest of the sub-tree @@ -340,7 +337,8 @@ mod tests { "unpack", DEFAULT_BUNDLE_FILE_NAME, temp_dir_path.to_str().unwrap(), - ]).assert() + ]) + .assert() .success(); } @@ -394,7 +392,8 @@ mod tests { "unpack", bundle_file_path.to_str().unwrap(), dest_path.to_str().unwrap(), - ]).assert() + ]) + .assert() .success(); // Assert for equality @@ -421,12 +420,14 @@ mod tests { .assert() .success(); - Command::main_binary() - .unwrap() - .current_dir(&tmp.path()) - .args(&["g", "zomes/zubblebat", "assemblyscript"]) - .assert() - .success(); + // TODO: We cannot test this since there is no complete implementation of hdk-assemblyscript + // + // Command::main_binary() + // .unwrap() + // .current_dir(&tmp.path()) + // .args(&["g", "zomes/zubblebat", "assemblyscript"]) + // .assert() + // .success(); Command::main_binary() .unwrap() diff --git a/src/cli/scaffold/rust/Cargo.template.toml b/src/cli/scaffold/rust/Cargo.template.toml index b00666b..d44860b 100644 --- a/src/cli/scaffold/rust/Cargo.template.toml +++ b/src/cli/scaffold/rust/Cargo.template.toml @@ -1,14 +1,16 @@ [package] - name = <> - version = "0.1.0" - authors = <> - edition = <> +name = <> +version = "0.1.0" +authors = <> +edition = <> + [dependencies] - serde = "1.0" - serde_json = "1.0" - serde_derive = "1.0" - hdk = { git = "https://github.com/holochain/holochain-rust" , branch = "master" } - holochain_wasm_utils = { git = "https://github.com/holochain/holochain-rust" , branch = "master" } +serde = "1.0" +serde_json = "1.0" +serde_derive = "1.0" +hdk = { git = "https://github.com/holochain/holochain-rust" , branch = "develop" } +holochain_wasm_utils = { git = "https://github.com/holochain/holochain-rust" , branch = "develop" } + [lib] - path = "src/lib.rs" - crate-type = ["cdylib"] +path = "src/lib.rs" +crate-type = ["cdylib"] diff --git a/src/cli/scaffold/rust/lib.rs b/src/cli/scaffold/rust/lib.rs index 4b3f058..1657fd2 100644 --- a/src/cli/scaffold/rust/lib.rs +++ b/src/cli/scaffold/rust/lib.rs @@ -1,5 +1,6 @@ #[macro_use] extern crate hdk; +#[macro_use] extern crate serde; #[macro_use] extern crate serde_derive; @@ -7,3 +8,11 @@ extern crate serde_derive; extern crate serde_json; // see https://holochain.github.io/rust-api/0.0.1/hdk/ for info on using the hdk library + +define_zome! { + entries: [] + + genesis: || { Ok(()) } + + functions: {} +} diff --git a/src/cli/test.rs b/src/cli/test.rs index a705ac5..17545d0 100644 --- a/src/cli/test.rs +++ b/src/cli/test.rs @@ -1,17 +1,19 @@ +use cli::package; use colored::*; use error::DefaultResult; +use std::{fs, path::PathBuf}; use util; -use cli::package; -use std::{ - fs, - path::{PathBuf} -}; pub const TEST_DIR_NAME: &str = "test"; pub const DIST_DIR_NAME: &str = "dist"; -pub fn test(path: &PathBuf, tests_folder: &str, testfile: &str, skip_npm: bool, skip_build: bool) -> DefaultResult<()> { - +pub fn test( + path: &PathBuf, + tests_folder: &str, + testfile: &str, + skip_npm: bool, + skip_build: bool, +) -> DefaultResult<()> { // create dist folder let dist_path = path.join(&DIST_DIR_NAME); @@ -43,10 +45,11 @@ pub fn test(path: &PathBuf, tests_folder: &str, testfile: &str, skip_npm: bool, let node_modules_path = tests_path.join("node_modules"); if !node_modules_path.exists() { println!("{}", "Installing node_modules".green().bold()); - util::run_cmd(tests_path.clone(), "npm".to_string(), vec![ - "install".to_string(), - "--silent".to_string(), - ])?; + util::run_cmd( + tests_path.clone(), + "npm".to_string(), + vec!["install".to_string(), "--silent".to_string()], + )?; } // npm run build @@ -55,21 +58,20 @@ pub fn test(path: &PathBuf, tests_folder: &str, testfile: &str, skip_npm: bool, "Building".green().bold(), testfile, ); - util::run_cmd(tests_path.clone(), "npm".to_string(), vec![ - "run".to_string(), - "build".to_string(), - ])?; + util::run_cmd( + tests_path.clone(), + "npm".to_string(), + vec!["run".to_string(), "build".to_string()], + )?; } // execute the built test file using hcshell - println!( - "{} tests in {}", - "Running".green().bold(), - testfile, - ); - util::run_cmd(path.to_path_buf(), "hcshell".to_string(), vec![ - testfile.to_string(), - ])?; + println!("{} tests in {}", "Running".green().bold(), testfile,); + util::run_cmd( + path.to_path_buf(), + "hcshell".to_string(), + vec![testfile.to_string()], + )?; Ok(()) } @@ -77,9 +79,9 @@ pub fn test(path: &PathBuf, tests_folder: &str, testfile: &str, skip_npm: bool, #[cfg(test)] pub mod tests { use super::*; + use assert_cmd::prelude::*; use cli::package; use std::process::Command; - use assert_cmd::prelude::*; use tempfile::{Builder, TempDir}; const HOLOCHAIN_TEST_PREFIX: &str = "org.holochain.test"; @@ -99,20 +101,35 @@ pub mod tests { // do init first, so theres a project Command::main_binary() - .unwrap() - .args(&["init", temp_dir_path.to_str().unwrap()]) - .assert() - .success(); - - let result = test(&temp_dir_path_buf, &TEST_DIR_NAME, "test/dist/bundle.js", false, false); + .unwrap() + .args(&["init", temp_dir_path.to_str().unwrap()]) + .assert() + .success(); + + test( + &temp_dir_path_buf, + &TEST_DIR_NAME, + "test/dist/bundle.js", + false, + false, + ) + .unwrap_or_else(|e| panic!("test call failed: {}", e)); - assert!(result.is_ok()); // check success of packaging step - assert!(temp_dir_path_buf.join(&DIST_DIR_NAME).join(package::DEFAULT_BUNDLE_FILE_NAME).exists()); + assert!(temp_dir_path_buf + .join(&DIST_DIR_NAME) + .join(package::DEFAULT_BUNDLE_FILE_NAME) + .exists()); // check success of npm install step - assert!(temp_dir_path_buf.join(&TEST_DIR_NAME).join("node_modules").exists()); + assert!(temp_dir_path_buf + .join(&TEST_DIR_NAME) + .join("node_modules") + .exists()); // check success of js webpack build step - assert!(temp_dir_path_buf.join(&TEST_DIR_NAME).join("dist/bundle.js").exists()); + assert!(temp_dir_path_buf + .join(&TEST_DIR_NAME) + .join("dist/bundle.js") + .exists()); } #[test] @@ -123,22 +140,37 @@ pub mod tests { // do init first, so theres a project Command::main_binary() - .unwrap() - .args(&["init", temp_dir_path.to_str().unwrap()]) - .assert() - .success(); - - let result = test(&temp_dir_path_buf, &TEST_DIR_NAME, "test/dist/index.js", true, false); + .unwrap() + .args(&["init", temp_dir_path.to_str().unwrap()]) + .assert() + .success(); + + let result = test( + &temp_dir_path_buf, + &TEST_DIR_NAME, + "test/dist/index.js", + true, + false, + ); // is err because "hcshell test/dist/index.js" will have failed // but the important thing is that the npm calls weren't made assert!(result.is_err()); // check success of packaging step - assert!(temp_dir_path_buf.join(&DIST_DIR_NAME).join(package::DEFAULT_BUNDLE_FILE_NAME).exists()); + assert!(temp_dir_path_buf + .join(&DIST_DIR_NAME) + .join(package::DEFAULT_BUNDLE_FILE_NAME) + .exists()); // npm shouldn't have installed - assert!(!temp_dir_path_buf.join(&TEST_DIR_NAME).join("node_modules").exists()); + assert!(!temp_dir_path_buf + .join(&TEST_DIR_NAME) + .join("node_modules") + .exists()); // built file shouldn't exist - assert!(!temp_dir_path_buf.join(&TEST_DIR_NAME).join("dist/bundle.js").exists()); + assert!(!temp_dir_path_buf + .join(&TEST_DIR_NAME) + .join("dist/bundle.js") + .exists()); } #[test] @@ -149,12 +181,18 @@ pub mod tests { // do init first, so theres a project Command::main_binary() - .unwrap() - .args(&["init", temp_dir_path.to_str().unwrap()]) - .assert() - .success(); - - let result = test(&temp_dir_path_buf, "west", "test/dist/bundle.js", false, false); + .unwrap() + .args(&["init", temp_dir_path.to_str().unwrap()]) + .assert() + .success(); + + let result = test( + &temp_dir_path_buf, + "west", + "test/dist/bundle.js", + false, + false, + ); // should err because "west" directory doesn't exist assert!(result.is_err()); From f91a8689448d02c4be95bf19f4f3b872d75ca75c Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Tue, 6 Nov 2018 14:47:40 -0500 Subject: [PATCH 06/13] fix for updates to holochain-rust:develop --- src/cli/package.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/package.rs b/src/cli/package.rs index e8d2aa5..e7fa9fb 100644 --- a/src/cli/package.rs +++ b/src/cli/package.rs @@ -155,7 +155,7 @@ impl Packager { &ZomeFnCall::new("", "", "__hdk_get_json_definition", ""), Some("{}".as_bytes().to_vec()), )?; - let json_from_wasm: Map = serde_json::from_str(&call_result)?; + let json_from_wasm: Map = serde_json::from_str(&call_result.to_string())?; let mut sub_tree_content = self.bundle_recurse(&node)?; for key in json_from_wasm.keys() { From b771044cbdcbd09a6f2a6dc0cae28a4c2879877a Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Tue, 6 Nov 2018 18:10:58 -0500 Subject: [PATCH 07/13] dont gen assemblyscript zome for now --- src/cli/generate.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cli/generate.rs b/src/cli/generate.rs index 7a009a8..21ff28f 100644 --- a/src/cli/generate.rs +++ b/src/cli/generate.rs @@ -89,12 +89,13 @@ mod tests { .assert() .success(); - Command::main_binary() - .unwrap() - .current_dir(&tmp.path()) - .args(&["g", "zomes/zubblebat", "assemblyscript"]) - .assert() - .success(); + // TODO: We cannot test this since there is no complete implementation of hdk-assemblyscript + // Command::main_binary() + // .unwrap() + // .current_dir(&tmp.path()) + // .args(&["g", "zomes/zubblebat", "assemblyscript"]) + // .assert() + // .success(); } } From acfafdfd5e525a09bcb5e709a6e04b75cbe887e2 Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Thu, 8 Nov 2018 17:54:44 -0500 Subject: [PATCH 08/13] updates to work against holochain-rust:c90f19aa816 which moved agent crate into core_types. --- Cargo.toml | 2 +- src/cli/test_context.rs | 2 +- src/main.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4b7d26d..e50c81c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Holochain Core Dev Team "] [dependencies] holochain_core = { git = "https://github.com/holochain/holochain-rust", branch = "develop" } +holochain_core_types = { git = "https://github.com/holochain/holochain-rust", branch = "develop" } holochain_dna = { git = "https://github.com/holochain/holochain-rust", branch = "develop" } -holochain_agent = { git = "https://github.com/holochain/holochain-rust", branch = "develop" } holochain_cas_implementations = { git = "https://github.com/holochain/holochain-rust", branch = "develop" } structopt = "0.2" failure = "^0.1" diff --git a/src/cli/test_context.rs b/src/cli/test_context.rs index e3ceff4..de52b0e 100644 --- a/src/cli/test_context.rs +++ b/src/cli/test_context.rs @@ -5,7 +5,7 @@ use holochain_core::{ logger::Logger, persister::SimplePersister, }; -use holochain_agent::Agent; +use holochain_core_types::entry::agent::Agent; use holochain_cas_implementations::{cas::file::FilesystemStorage, eav::file::EavFileStorage}; use std::sync::{Arc, Mutex}; diff --git a/src/main.rs b/src/main.rs index a80880b..bbf05d4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -extern crate holochain_agent; +extern crate holochain_core_types; extern crate holochain_cas_implementations; extern crate holochain_core; extern crate holochain_dna; From 86cf2a60a30b8a8ced770633460a66cbf2c684fa Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Thu, 8 Nov 2018 21:09:08 -0500 Subject: [PATCH 09/13] added docker fix for correct Qt version --- .travis.yml | 4 ++-- docker/Dockerfile.holochain-cmd | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b201a4..2d2099c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ services: - docker -dist: trusty +dist: xenial jobs: include: @@ -9,4 +9,4 @@ jobs: name: "Tests" install: docker pull holochain/holochain-cmd:develop script: - - . docker/run-ci \ No newline at end of file + - . docker/run-ci diff --git a/docker/Dockerfile.holochain-cmd b/docker/Dockerfile.holochain-cmd index 1814211..039c021 100644 --- a/docker/Dockerfile.holochain-cmd +++ b/docker/Dockerfile.holochain-cmd @@ -1,11 +1,18 @@ FROM holochain/holochain-rust:develop +USER root + RUN apt-get update && apt-get install --yes \ qtdeclarative5-dev \ libqt5websockets5-dev \ - libreadline6-dev + libreadline6-dev \ + software-properties-common -USER root +# Install latest version of QT needed for hcshell +RUN add-apt-repository ppa:beineri/opt-qt-5.11.1-xenial +RUN apt-get update +RUN apt-get --yes install qt511-meta-full +RUN printf "/opt/qt511/bin\n/opt/qt511/lib" > /etc/xdg/qtchooser/default.conf RUN rustup toolchain install nightly-x86_64-unknown-linux-gnu RUN rustup toolchain install nightly-2018-07-17-x86_64-unknown-linux-gnu From e11eead1595998fe4a989271c9681913ce92b42e Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Fri, 9 Nov 2018 16:55:04 -0500 Subject: [PATCH 10/13] docker fix --- docker/Dockerfile.holochain-cmd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Dockerfile.holochain-cmd b/docker/Dockerfile.holochain-cmd index 039c021..e06e108 100644 --- a/docker/Dockerfile.holochain-cmd +++ b/docker/Dockerfile.holochain-cmd @@ -3,8 +3,7 @@ FROM holochain/holochain-rust:develop USER root RUN apt-get update && apt-get install --yes \ - qtdeclarative5-dev \ - libqt5websockets5-dev \ + nodejs-legacy \ libreadline6-dev \ software-properties-common From aa4d3e4da14f416050155a4e9ae5f77c14d80e16 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Sat, 10 Nov 2018 00:27:03 +0100 Subject: [PATCH 11/13] Fix context after EAV/CAS refactor --- src/cli/test_context.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cli/test_context.rs b/src/cli/test_context.rs index de52b0e..d254476 100644 --- a/src/cli/test_context.rs +++ b/src/cli/test_context.rs @@ -6,8 +6,8 @@ use holochain_core::{ persister::SimplePersister, }; use holochain_core_types::entry::agent::Agent; -use holochain_cas_implementations::{cas::file::FilesystemStorage, eav::file::EavFileStorage}; -use std::sync::{Arc, Mutex}; +use holochain_cas_implementations::{cas::memory::MemoryStorage, eav::memory::EavMemoryStorage}; +use std::sync::{Arc, Mutex, RwLock}; #[derive(Clone, Debug)] pub struct TestLogger { @@ -37,9 +37,8 @@ pub fn test_context(agent_name: &str) -> Arc { agent, logger.clone(), Arc::new(Mutex::new(SimplePersister::new(agent_name.to_string()))), - FilesystemStorage::new(tempdir().unwrap().path().to_str().unwrap()).unwrap(), - EavFileStorage::new(tempdir().unwrap().path().to_str().unwrap().to_string()) - .unwrap(), + Arc::new(RwLock::new(MemoryStorage::new().unwrap())), + Arc::new(RwLock::new(EavMemoryStorage::new().unwrap())), ).unwrap(), ) } From 33fb00eeb9c1960d82c45df5e27f94048fc47cc3 Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Sat, 10 Nov 2018 19:47:17 -0500 Subject: [PATCH 12/13] fixes to docker and scripts for correct node version from modified upstream image --- docker/Dockerfile.holochain-cmd | 3 --- docker/build | 2 +- docker/entry | 2 +- docker/update | 3 +++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile.holochain-cmd b/docker/Dockerfile.holochain-cmd index e06e108..309490d 100644 --- a/docker/Dockerfile.holochain-cmd +++ b/docker/Dockerfile.holochain-cmd @@ -1,9 +1,6 @@ FROM holochain/holochain-rust:develop -USER root - RUN apt-get update && apt-get install --yes \ - nodejs-legacy \ libreadline6-dev \ software-properties-common diff --git a/docker/build b/docker/build index 2cc2ef3..263586f 100755 --- a/docker/build +++ b/docker/build @@ -1,2 +1,2 @@ #!/bin/bash -docker build -f docker/Dockerfile.holochain-cmd -t holochain/holochain-cmd:latest "$@" . +docker build -f docker/Dockerfile.holochain-cmd -t holochain/holochain-cmd:develop "$@" . diff --git a/docker/entry b/docker/entry index 1d37909..adf3820 100755 --- a/docker/entry +++ b/docker/entry @@ -7,7 +7,7 @@ if [ -n "$HOST_UID" ]; then groupmod -g "$HOST_UID" holochain usermod -g "$HOST_UID" holochain chown -R -h "$HOST_UID":"$HOST_UID" /home/holochain - chown -R -h "$HOST_UID":"$HOST_UID" /home/holochain/* + chown -R -h "$HOST_UID":"$HOST_UID" /home/holochain/* fi fi diff --git a/docker/update b/docker/update index 8b58a82..af8be60 100755 --- a/docker/update +++ b/docker/update @@ -5,8 +5,11 @@ #rustup default nightly cd /holochain/holochain-cmd +git reset --hard +git pull git submodule init git submodule update +cargo update cd /holochain/holosqape git reset --hard From 604ef5f2ed51a092ce2bfafc4299529fcdfa1079 Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Wed, 21 Nov 2018 08:46:31 -0500 Subject: [PATCH 13/13] updated readme re move into holochain-rust --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f3467f1..39d3173 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # Holochain Command Line Tools +## Repo Contents Moved! + +NOTE: This repo has now been merged into [holochain-rust](https://github.com/holochain/holochain-rust/tree/develop/cmd) + [![Project](https://img.shields.io/badge/project-holochain-blue.svg?style=flat-square)](http://holochain.org/) [![PM](https://img.shields.io/badge/pm-waffle-blue.svg?style=flat-square)](https://waffle.io/holochain/org) [![Chat](https://img.shields.io/badge/chat-chat%2eholochain%2enet-blue.svg?style=flat-square)](https://chat.holochain.net)