Remove duplicating defaults

.circleci/config.yml

@@ -0,0 +1,11 @@
+version: 2
+
+jobs:
+  build:
+    docker:
+    - image: holochain/holonix:latest
+    steps:
+    - checkout
+    - run:
+        name: Starting test...
+        command: nix-shell --run 'make test'

.gitignore

@@ -14,10 +14,6 @@ target
 dist
 release
 
-# ui builds
-hylo-ui
-graphiql-ui/build
-
 # misc
 .DS_Store
 npm-debug.log
@@ -28,9 +24,8 @@ npm-debug.log
 
 yarn-error.log
 .idea
-Cargo.lock
-package-lock.json
 dmg-mount
 conductor-config.toml
 keystores/myagent.keystore
 .cargo
+holochain-rust

.hcignore

@@ -0,0 +1,6 @@
+test
+dist
+config.nix
+default.nix
+Makefile
+README.md

Makefile

@@ -0,0 +1,77 @@
+#
+# Test and build hApp-store Project
+#
+SHELL		= bash
+DNANAME		= .
+DNA		= dist/hylo-holo-dnas.dna.json
+
+# External targets; Uses a nix-shell environment to obtain Holochain runtimes, run tests, etc.
+.PHONY: all
+all: nix-test
+
+# nix-test, nix-install, ...
+nix-%:
+	nix-shell --pure --run "make $*"
+
+# Internal targets; require a Nix environment in order to be deterministic.
+# - Uses the version of `hc`, `holochain` on the system PATH.
+# - Normally called from within a Nix environment, eg. run `nix-shell` from within holofuel
+.PHONY:		rebuild install build test test-unit test-e2e
+rebuild:	clean build
+
+install:	build
+
+build:		$(DNANAME)/$(DNA)
+
+# Build the DNA; Specifying a custom --output requires the path to exist
+# However, if the name of the directory within which `hc` is run matches the
+# DNA's name, then this name is used by default, and the output directory is
+# created automatically.
+$(DNANAME)/$(DNA):
+	cd $(DNANAME) \
+	  && hc package --strip-meta
+
+test:		test-unit test-e2e
+
+# test-unit -- Run Rust unit tests via Cargo
+test-unit:
+	cd $(DNANAME) \
+	  && RUST_BACKTRACE=1 cargo test \
+	    --manifest-path zomes/comments/code/Cargo.toml \
+	    -- --nocapture \
+		&& RUST_BACKTRACE=1 cargo test \
+	    --manifest-path zomes/messages/code/Cargo.toml \
+	    -- --nocapture \
+		&& RUST_BACKTRACE=1 cargo test \
+	    --manifest-path zomes/people/code/Cargo.toml \
+	    -- --nocapture \
+		&& RUST_BACKTRACE=1 cargo test \
+	    --manifest-path zomes/posts/code/Cargo.toml \
+	    -- --nocapture \
+		&& RUST_BACKTRACE=1 cargo test \
+	    --manifest-path zomes/communities/code/Cargo.toml \
+	    -- --nocapture
+
+
+test-e2e:	$(DNANAME)/$(DNA)
+	@echo "Setting up Scenario test Javascript..."; \
+	    ( cd test && npm install );
+	@echo "Starting sim2h server..."; \
+	    sim2h_server &
+	@echo "Starting Communities Scenario tests..."; \
+	    RUST_BACKTRACE=1 NETWORK_TYPE=sim2h hc test \
+
+
+# Generic targets; does not require a Nix environment
+.PHONY: clean
+clean:
+	rm -rf \
+	    dist \
+	    test/node_modules \
+	    .cargo \
+	    target \
+	    zomes/comments/code/target \
+		zomes/messages/code/target \
+		zomes/people/code/target \
+		zomes/posts/code/target \
+	    zomes/communities/code/target

README.md

@@ -9,133 +9,9 @@ DNAs required for running Hylo on Holochain.
 Instructions for installing Rust and building the holochain container can be found at [developer.holochain](https://developer.holochain.org/start.html).
 
 After this is installed the DNA can be build using
-`npm run build`
+`hc package`
 and started using
-`npm run start`
+`holochain -c ./conductor-configs/conductor-config.toml`
 
 If you plan to develop the DNA code further the automated tests can be run using
-`npm run test`
-
-At the current time the container config does not include configuration of the network. This is because at the time of writing you must hard code the IPs in the local network. Defauls about this can be found at [developer.holochain](https://developer.holochain.org/start.html) and will likely be updated soon.
-
-## Making changes to the schema
-
-The `schema.graphql` documents the specification of the schema that this DNA must implement. This is enforced via the automated tests.
-
-Any changes to the `schema.graphql` file must be approved by the frond-end dev team to ensure no unplanned breaking changes.
-
-## Example queries
-Handy to have these here for reference. These are the 4 queries that are redirected to holochain.
-
-Test the holochain container calls with
-`curl -X POST -H "Content-Type: application/json" -d @create-thread-query.json http://localhost:3400`
-
-Retrieving all threads
-```javascript
-graphql: {
-      query: `query ($first: Int, $offset: Int) {
-        me {
-          id
-          messageThreads(sortBy: "updatedAt", order: "desc", first: $first, offset: $offset) {
-            total
-            hasMore
-            items {
-              id
-              unreadCount
-              lastReadAt
-              createdAt
-              updatedAt
-              participants {
-                id
-                name
-                avatarUrl
-              }
-              messages(first: 1, order: "desc") {
-                items {
-                  id
-                  createdAt
-                  text
-                  creator {
-                    id
-                    name
-                  }
-                }
-              }
-            }
-          }
-        }
-      }`,
-      variables: {
-        first,
-        offset
-      }
-    }
-```
-
-Fetching all the messages from a thread
-```javascript
-graphql: {
-      query: `
-        query ($id: ID, $cursor: ID) {
-          messageThread (id: $id) {
-            id
-            messages(first: 80, cursor: $cursor, order: "desc") {
-              items {
-                id
-                createdAt
-                text
-                creator {
-                  id
-                  name
-                  avatarUrl
-                }
-              }
-              total
-              hasMore
-            }
-          }
-        }
-      `,
-      variables: opts.cursor ? {id, cursor: opts.cursor} : {id}
-    }
-```
-
-Creating a message in a thread
-```javascript
-graphql: {
-      query: `mutation ($messageThreadId: String, $text: String) {
-        createMessage(data: {messageThreadId: $messageThreadId, text: $text}) {
-          id
-          text
-          createdAt
-          creator {
-            id
-          }
-          messageThread {
-            id
-          }
-        }
-      }`,
-      variables: {
-        messageThreadId,
-        text
-      }
-    }
-```
-
-Find or create a thread
-```javascript
-const findOrCreateThreadQuery =
-`mutation ($participantIds: [String]) {
-  findOrCreateThread(data: {participantIds: $participantIds}) {
-    id
-    createdAt
-    updatedAt
-    participants {
-      id
-      name
-      avatarUrl
-    }
-  }
-}`
-```
+`nix-shell --run 'npm run test'`