Merge pull request #1725 from holochain/sim1h-integration

Sim1h + deadlocks fixed + app-spec update + ...

.aws/config

@@ -0,0 +1,5 @@
+[default]
+region=localhost
+output=json
+aws_access_key_id=AKIAIOSFODNN7EXAMPLE
+aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY

.aws/default.nix

@@ -0,0 +1,4 @@
+{ pkgs }:
+{
+ buildInputs = [ pkgs.awscli ];
+}

.circleci/config.yml

@@ -63,16 +63,52 @@ jobs:
           exit 1
         fi
 
- app-spec-tests:
+ app-spec-tests-sim1h:
   docker:
    - image: holochain/holochain-rust:latest
   resource_class: xlarge
   steps:
    - checkout
-
+   - run:
+       name: DynamoDB
+       command: nix-shell --run dynamodb-memory
+       background: true
    - run:
        name: app spec tests
-       command: nix-shell --run hc-app-spec-test
+       command: nix-shell --run hc-app-spec-test-sim1h
+
+# app-spec-tests-n3h:
+#  docker:
+#   - image: holochain/holochain-rust:latest
+#  resource_class: xlarge
+#  steps:
+#   - checkout
+#
+#   - run:
+#       name: app spec tests
+#       command: nix-shell --run "hc-app-spec-test n3h"
+#
+# app-spec-tests-memory:
+#  docker:
+#   - image: holochain/holochain-rust:latest
+#  resource_class: xlarge
+#  steps:
+#   - checkout
+#
+#   - run:
+#       name: app spec tests
+#       command: nix-shell --run "hc-app-spec-test memory"
+#
+# app-spec-tests-websocket:
+#  docker:
+#   - image: holochain/holochain-rust:latest
+#  resource_class: xlarge
+#  steps:
+#   - checkout
+#
+#   - run:
+#       name: app spec tests
+#       command: nix-shell --run "hc-app-spec-test websocket"
 
  app-spec-proc-tests:
   docker:
@@ -91,7 +127,10 @@ jobs:
   resource_class: xlarge
   steps:
    - checkout
-
+   - run:
+       name: DynamoDB
+       command: nix-shell --run "dynamodb-memory -port 8002"
+       background: true
    - run:
        name: app spec cluster tests
        command: nix-shell --run hc-app-spec-cluster-test
@@ -186,7 +225,9 @@ workflows:
   jobs:
    - build
    - fmt
-   - app-spec-tests
+   - app-spec-tests-sim1h
+   # - app-spec-tests-memory
+   # - app-spec-tests-websocket
    # @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

CHANGELOG-UNRELEASED.md

@@ -8,13 +8,40 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 * Adds publishing of headers again after rollback. Header publishing is now its own action rather than part of the `Publish` action that plays nicely with the testing framework. It also adds header entries to the author list so they are gossiped properly. [#1640](https://github.com/holochain/holochain-rust/pull/1640).
 
+* Adds new networking back-end `sim1h` which can be configured in conductor config with:
+    ```toml
+    [network]
+    type = "sim1h"
+    dynamo_url = "http://localhost:8000"
+    ```
+    [#1725](https://github.com/holochain/holochain-rust/pull/1725)
+* Adds nix-shell commands for running app-spec tests with different network implementations
+  - `hc-app-spec-test-sim1h`
+  - `hc-app-spec-test-n3h`
+  - `hc-app-spec-test-memory`
+
+  [#1725](https://github.com/holochain/holochain-rust/pull/1725)
+
+* Adds nix-shell commands for running a local DynamoDB instance:
+  - `dynamodb` and
+  - `dynamodb-memory`
+
+  [#1725](https://github.com/holochain/holochain-rust/pull/1725)
+
+* Adds zome+function name to ConsistencyEvent::Hold representation for pending zome function call returns for better hachiko timeouts. [#1725](https://github.com/holochain/holochain-rust/pull/1725)
+
+* Adds `UUID` to DNA configs which will change the DNA when initializing an instance with it and sets the given UUID. This disables the hash check of the DNA if set. [#1724](https://github.com/holochain/holochain-rust/pull/1724) [#1725](https://github.com/holochain/holochain-rust/pull/1725) 
+
 ### Changed
+* Converts app-spec tests to the new multi-conductor [try-o-rama](https://github.com/holochain/try-o-rama) [#1725](https://github.com/holochain/holochain-rust/pull/1725)
 
 ### Deprecated
 
 ### Removed
 
 ### Fixed
+* Fixes several conditions that lead to occasional deadlocks [#1725](https://github.com/holochain/holochain-rust/pull/1725)
+
 
 ### Security