Skip to content

Commit

Permalink
chore(release): merge v0.6.2 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jost-s committed Jul 8, 2022
2 parents 516d66e + a3436cd commit 4d4f2c3
Show file tree
Hide file tree
Showing 88 changed files with 1,606 additions and 861 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,22 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Changed
### Fixed

## [0.6.2]

### Added
- feat(common): add app and role id options to hApp installation
- feat(common): add mem-proofs to installAgentsHapps (#139)
- feat(trycp): add multiple clients by array of URLs
- feat(trycp): add multiple clients/players

### Fixed
- fix(trycp): allow for multiple hosts in scenario (#136)

## [0.6.1]

### Changed
- Fixture: split zome into integrity and coordinator zomes [PR \#143](https://github.com/holochain/tryorama/pull/143)

## [0.6.0]

### Changed
Expand Down
25 changes: 17 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[workspace]
members = [
"crates/trycp_server",
"ts/test/fixture/zomes/entry"
"ts/test/fixture/zomes/coordinator",
"ts/test/fixture/zomes/integrity"
]

[profile.dev]
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test("Create 2 players and create and read an entry", async (t) => {
// The cells of the installed hApp are returned in the same order as the DNAs
// that were passed into the player creation.
const createEntryHash: ActionHash = await alice.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "create",
payload: content,
});
Expand All @@ -66,7 +66,7 @@ test("Create 2 players and create and read an entry", async (t) => {
// Using the same cell and zome as before, the second player reads the
// created entry.
const readContent: typeof content = await bob.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "read",
payload: createEntryHash,
});
Expand Down Expand Up @@ -100,15 +100,15 @@ test("Create 2 players and create and read an entry", async (t) => {

const content = "Hello Tryorama";
const createEntryHash: EntryHash = await alice.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "create",
payload: content,
});

await pause(100);

const readContent: typeof content = await bob.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "read",
payload: createEntryHash,
});
Expand Down Expand Up @@ -184,7 +184,7 @@ Here is the above example that just uses a `Conductor` without a `Scenario`:

const entryContent = "test-content";
const createEntryHash: EntryHash = await aliceHapps.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "create",
payload: entryContent,
});
Expand All @@ -193,7 +193,7 @@ Here is the above example that just uses a `Conductor` without a `Scenario`:

const readEntryResponse: typeof entryContent =
await bobHapps.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "read",
payload: createEntryHash,
});
Expand Down Expand Up @@ -226,7 +226,7 @@ const [aliceHapps] = await conductor.installAgentsHapps({

const entryContent = "test-content";
const createEntryHash: EntryHash = await aliceHapps.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "create",
payload: entryContent,
});
Expand All @@ -248,12 +248,12 @@ const [aliceHapps] = await conductor.installAgentsHapps({
agentsDnas: [dnas],
});
const createEntryHash: EntryHash = await aliceHapps.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "create",
payload: entryContent,
});
const readEntryHash: string = await aliceHapps.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "read",
payload: createEntryHash,
});
Expand All @@ -265,12 +265,12 @@ the shorthand access to the Zome can be called
const [aliceHapps] = await conductor.installAgentsHapps({
agentsDnas: [dnas],
});
const aliceCrudZomeCall = getZomeCaller(aliceHapps.cells[0], "crud");
const entryHeaderHash: ActionHash = await crudZomeCall(
const aliceCallCoordinatorZome = getZomeCaller(aliceHapps.cells[0], "coordinator");
const entryHeaderHash: ActionHash = await aliceCallCoordinatorZome(
"create",
"test-entry"
);
const readEntryHash: string = await crudZomeCall(
const readEntryHash: string = await aliceCallCoordinatorZome(
"read",
entryHeaderHash
);
Expand Down Expand Up @@ -298,7 +298,7 @@ const alice = await scenario.addPlayerWithHapp(dna, signalHandler);

const signal = { value: "hello alice" };
alice.cells[0].callZome({
zome_name: "crud",
zome_name: "coordinator",
fn_name: "signal_loopback",
payload: signal,
});
Expand Down
11 changes: 11 additions & 0 deletions docs/tryorama.agentdnas.agentpubkey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [AgentDnas](./tryorama.agentdnas.md) &gt; [agentPubKey](./tryorama.agentdnas.agentpubkey.md)

## AgentDnas.agentPubKey property

<b>Signature:</b>

```typescript
agentPubKey?: AgentPubKey;
```
11 changes: 11 additions & 0 deletions docs/tryorama.agentdnas.dnas.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [AgentDnas](./tryorama.agentdnas.md) &gt; [dnas](./tryorama.agentdnas.dnas.md)

## AgentDnas.dnas property

<b>Signature:</b>

```typescript
dnas: Dna[];
```
21 changes: 21 additions & 0 deletions docs/tryorama.agentdnas.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [AgentDnas](./tryorama.agentdnas.md)

## AgentDnas interface

DNAs per agent. Optionally an agent pub key.

<b>Signature:</b>

```typescript
export interface AgentDnas
```

## Properties

| Property | Type | Description |
| --- | --- | --- |
| [agentPubKey?](./tryorama.agentdnas.agentpubkey.md) | AgentPubKey | <i>(Optional)</i> |
| [dnas](./tryorama.agentdnas.dnas.md) | [Dna](./tryorama.dna.md)<!-- -->\[\] | |

17 changes: 0 additions & 17 deletions docs/tryorama.agenthappoptions.md

This file was deleted.

19 changes: 19 additions & 0 deletions docs/tryorama.agentshappsoptions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [AgentsHappsOptions](./tryorama.agentshappsoptions.md)

## AgentsHappsOptions type

An array of DNA sources for each agent (2-dimensional array) or an array of DNAs and an optional agent pub key. Optionally a UID to be used for DNA installation.

<b>Signature:</b>

```typescript
export declare type AgentsHappsOptions = DnaSource[][] | {
agentsDnas: AgentDnas[];
uid?: string;
installedAppId?: InstalledAppId;
};
```
<b>References:</b> [AgentDnas](./tryorama.agentdnas.md)

13 changes: 0 additions & 13 deletions docs/tryorama.cleanalltrycpconductors.md

This file was deleted.

13 changes: 13 additions & 0 deletions docs/tryorama.clientsplayersoptions.agentpubkeys.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [ClientsPlayersOptions](./tryorama.clientsplayersoptions.md) &gt; [agentPubKeys](./tryorama.clientsplayersoptions.agentpubkeys.md)

## ClientsPlayersOptions.agentPubKeys property

A list of previously generated agent pub keys (optional).

<b>Signature:</b>

```typescript
agentPubKeys?: AgentPubKey[];
```
13 changes: 13 additions & 0 deletions docs/tryorama.clientsplayersoptions.clienttimeout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [ClientsPlayersOptions](./tryorama.clientsplayersoptions.md) &gt; [clientTimeout](./tryorama.clientsplayersoptions.clienttimeout.md)

## ClientsPlayersOptions.clientTimeout property

A timeout for the web socket connection (optional).

<b>Signature:</b>

```typescript
clientTimeout?: number;
```
13 changes: 13 additions & 0 deletions docs/tryorama.clientsplayersoptions.dnas.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [ClientsPlayersOptions](./tryorama.clientsplayersoptions.md) &gt; [dnas](./tryorama.clientsplayersoptions.dnas.md)

## ClientsPlayersOptions.dnas property

An array of DNAs that will be installed for each agent (optional).

<b>Signature:</b>

```typescript
dnas?: Dna[];
```
24 changes: 24 additions & 0 deletions docs/tryorama.clientsplayersoptions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [ClientsPlayersOptions](./tryorama.clientsplayersoptions.md)

## ClientsPlayersOptions interface


<b>Signature:</b>

```typescript
export interface ClientsPlayersOptions
```

## Properties

| Property | Type | Description |
| --- | --- | --- |
| [agentPubKeys?](./tryorama.clientsplayersoptions.agentpubkeys.md) | AgentPubKey\[\] | <i>(Optional)</i> A list of previously generated agent pub keys (optional). |
| [clientTimeout?](./tryorama.clientsplayersoptions.clienttimeout.md) | number | <i>(Optional)</i> A timeout for the web socket connection (optional). |
| [dnas?](./tryorama.clientsplayersoptions.dnas.md) | [Dna](./tryorama.dna.md)<!-- -->\[\] | <i>(Optional)</i> An array of DNAs that will be installed for each agent (optional). |
| [numberOfAgentsPerConductor?](./tryorama.clientsplayersoptions.numberofagentsperconductor.md) | number | <i>(Optional)</i> Number of agents per conductor. Defaults to 1. Requires <code>dnas</code> to be specified. |
| [numberOfConductorsPerClient?](./tryorama.clientsplayersoptions.numberofconductorsperclient.md) | number | <i>(Optional)</i> Number of conductors per client. Default to 1. |
| [signalHandler?](./tryorama.clientsplayersoptions.signalhandler.md) | AppSignalCb | <i>(Optional)</i> A signal handler to be registered in conductors. |

13 changes: 13 additions & 0 deletions docs/tryorama.clientsplayersoptions.numberofagentsperconductor.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [ClientsPlayersOptions](./tryorama.clientsplayersoptions.md) &gt; [numberOfAgentsPerConductor](./tryorama.clientsplayersoptions.numberofagentsperconductor.md)

## ClientsPlayersOptions.numberOfAgentsPerConductor property

Number of agents per conductor. Defaults to 1. Requires `dnas` to be specified.

<b>Signature:</b>

```typescript
numberOfAgentsPerConductor?: number;
```
13 changes: 13 additions & 0 deletions docs/tryorama.clientsplayersoptions.numberofconductorsperclient.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [ClientsPlayersOptions](./tryorama.clientsplayersoptions.md) &gt; [numberOfConductorsPerClient](./tryorama.clientsplayersoptions.numberofconductorsperclient.md)

## ClientsPlayersOptions.numberOfConductorsPerClient property

Number of conductors per client. Default to 1.

<b>Signature:</b>

```typescript
numberOfConductorsPerClient?: number;
```
13 changes: 13 additions & 0 deletions docs/tryorama.clientsplayersoptions.signalhandler.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [ClientsPlayersOptions](./tryorama.clientsplayersoptions.md) &gt; [signalHandler](./tryorama.clientsplayersoptions.signalhandler.md)

## ClientsPlayersOptions.signalHandler property

A signal handler to be registered in conductors.

<b>Signature:</b>

```typescript
signalHandler?: AppSignalCb;
```
Loading

0 comments on commit 4d4f2c3

Please sign in to comment.