diff --git a/package.json b/package.json index 9b4bef7..c622a86 100644 --- a/package.json +++ b/package.json @@ -7,18 +7,20 @@ "we-applet" ], "scripts": { - "start": "npm run network 2", - "network": "hc s clean && npm run build:test-happ && concurrently-repeat \"npm run start:agent\"", + "start": "AGENTS=1 npm run network", + "network": "hc s clean && npm run build:test-happ && concurrently \"npm run build:watch -w ui\" \"npm run launch:happ\"", "start:agent": "cross-env HC_PORT=$(port) HC_ADMIN_PORT=$(port) concurrently -k \"npm run start:happ\" \"sleep 5 && npm run start -w ui\"", + "launch:happ": "RUST_LOG=warn echo \"pass\" | hc launch --piped -n $AGENTS ./workdir/sensemaker-enabled/provider-sensemaker.happ -w --ui-path ui/dist network mdns", "test": "npm run build:happ && npm t -w tests", "start:happ": "concurrently \"RUST_LOG=warn echo \"pass\" | hc s --piped -f=$HC_ADMIN_PORT generate ./workdir/sensemaker-enabled/provider-sensemaker.happ --run=$HC_PORT -a provider network mdns\" \"npm run playground\"", - "package": "npm run build:happ && npm run package:ui -w we-applet && hc web-app pack workdir", + "package": "npm run build:happ && npm run build:ui && npm run package:ui -w we-applet && hc web-app pack workdir", "build:happ": "npm run build:dnas && hc app pack ./workdir", "build:test-happ": "npm run build:dnas && hc app pack ./workdir/sensemaker-enabled", "build:dnas": "npm run build:zomes && hc dna pack ./dna/workdir", "build:zomes": "CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown", + "build:ui": "npm run ts-build -w ui", "playground": "run-singleton \"holochain-playground\"", - "download-sensemaker": "rimraf workdir/sensemaker.dna && curl -L --output workdir/sensemaker.dna https://github.com/neighbour-hoods/sensemaker-lite/releases/download/v0.0.2-alpha/sensemaker.dna", + "download-sensemaker": "rimraf workdir/sensemaker.dna && curl -L --output workdir/sensemaker.dna https://github.com/neighbour-hoods/sensemaker-lite/releases/download/v0.0.3-alpha/sensemaker.dna", "start:ui": "npm run start -w ui" }, "devDependencies": { diff --git a/tests/package.json b/tests/package.json index 58a31e7..77a146a 100644 --- a/tests/package.json +++ b/tests/package.json @@ -20,12 +20,11 @@ "uuidv4": "^6.2.11" }, "devDependencies": { - "@holochain/client": "0.8.0", - "@holochain/tryorama": "0.7.0", + "@holochain/client": "0.11.9", + "@holochain/tryorama": "^0.10.4", "@types/lodash": "^4.14.158", "@types/node": "^14.0.14", - "tape-promise": "^4.0.0", - "@holochain-open-dev/utils": "^0.4.3" + "tape-promise": "^4.0.0" }, "type": "module" } diff --git a/tests/src/provider.ts b/tests/src/provider.ts index b20c600..d0112e8 100644 --- a/tests/src/provider.ts +++ b/tests/src/provider.ts @@ -1,19 +1,18 @@ -import { DnaSource, Record, ActionHash, EntryHash } from "@holochain/client"; +import { AppBundleSource } from "@holochain/client"; import { pause, runScenario } from "@holochain/tryorama"; import { decode } from '@msgpack/msgpack'; import pkg from 'tape-promise/tape'; const { test } = pkg; -import { providerDna } from "./utils"; -import { serializeHash } from "@holochain-open-dev/utils"; +import { providerHapp } from "./utils"; export default () => test("provider CRUD tests", async (t) => { await runScenario(async scenario => { - const dnas: DnaSource[] = [{ path: providerDna }]; + const appBundleSource: AppBundleSource = { path: providerHapp }; - const [alice, bob] = await scenario.addPlayersWithHapps([dnas, dnas]); + const [alice, bob] = await scenario.addPlayersWithApps([{ appBundleSource }, { appBundleSource }]); await scenario.shareAllAgents(); }); diff --git a/tests/src/utils.ts b/tests/src/utils.ts index 2c9e584..d4bcfc3 100644 --- a/tests/src/utils.ts +++ b/tests/src/utils.ts @@ -3,7 +3,7 @@ import { fileURLToPath } from "url"; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); -export const providerDna = path.join(__dirname, "../../dna/workdir/provider.dna"); +export const providerHapp = path.join(__dirname, "../../dna/workdir/provider.happ"); diff --git a/ui/index.html b/ui/index.html index 1999c08..4c05fec 100644 --- a/ui/index.html +++ b/ui/index.html @@ -23,10 +23,6 @@