Skip to content

Commit

Permalink
hdk v0.0.126
Browse files Browse the repository at this point in the history
  • Loading branch information
zo-el committed Mar 28, 2022
1 parent 376cace commit 610f81f
Show file tree
Hide file tree
Showing 11 changed files with 224 additions and 207 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ WASM2 = target/wasm32-unknown-unknown/release/profile.wasm
dnas:
mkdir -p ./dnas
dnas/joining-code-factory.dna: dnas
curl 'https://holo-host.github.io/joining-code-happ/releases/downloads/0_2_1/joining-code-factory.0_2_1.dna' -o $@
curl 'https://holo-host.github.io/joining-code-happ/releases/downloads/0_2_2/joining-code-factory.0_2_2.dna' -o $@

DNAs: dnas/joining-code-factory.dna

Expand Down Expand Up @@ -121,4 +121,4 @@ clean:
tests/node_modules \
.cargo \
target \
$(DNA)
dnas
4 changes: 2 additions & 2 deletions config.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
# git ls-remote https://github.com/holochain/holonix staging
holonixRevision = "52158409f9b76b442e592e8f06632b0e57a6c365";
holonixRevision = "44542b5c0cdc984454fad96fbec313b7b1c8ca7c";

holochainVersionId = "v0_0_127";
holochainVersionId = "v0_0_131";
}
4 changes: 3 additions & 1 deletion tests/src/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ export const awaitIntegration = async (cell) => {
const dump = await cell.stateDump()
console.log("integration dump was:", dump)
const idump = dump[0].integration_dump
if (idump.validation_limbo == 0 && idump.integration_limbo == 0) {
if (idump.validation_limbo == 0
// && idump.integration_limbo == 0
) {
break
}
console.log("waiting 5 seconds for integration")
Expand Down
40 changes: 20 additions & 20 deletions tests/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import { Orchestrator } from "@holochain/tryorama";

let orchestrator = new Orchestrator();
// require('./basic-chatting')(orchestrator)
// orchestrator.run()
require('./basic-chatting')(orchestrator)
orchestrator.run()

// orchestrator = new Orchestrator()
// require('./transient-nodes')(orchestrator)
// orchestrator.run()
orchestrator = new Orchestrator()
require('./transient-nodes')(orchestrator)
orchestrator.run()

// orchestrator = new Orchestrator()
// require('./chat-signals')(orchestrator)
// orchestrator.run()
orchestrator = new Orchestrator()
require('./chat-signals')(orchestrator)
orchestrator.run()

// orchestrator = new Orchestrator()
// require('./chat-stats')(orchestrator)
// orchestrator.run()
orchestrator = new Orchestrator()
require('./chat-stats')(orchestrator)
orchestrator.run()

// orchestrator = new Orchestrator()
// require('./profile')(orchestrator)
// orchestrator.run()
orchestrator = new Orchestrator()
require('./profile')(orchestrator)
orchestrator.run()

// orchestrator = new Orchestrator()
// require('./membrane-proof')(orchestrator)
// orchestrator.run()
orchestrator = new Orchestrator()
require('./membrane-proof')(orchestrator)
orchestrator.run()

// orchestrator = new Orchestrator()
// require('./unique-registration-code')(orchestrator)
// orchestrator.run()
orchestrator = new Orchestrator()
require('./unique-registration-code')(orchestrator)
orchestrator.run()

orchestrator = new Orchestrator();
require("./batching")(orchestrator);
Expand Down
12 changes: 6 additions & 6 deletions version-manager.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"hdk": "0.0.123",
"hc_utils": "0.0.123",
"holo_hash": "0.0.20",
"holochain": "0.0.127",
"holochain_rev": "v0_0_127",
"holonix_rev": "52158409f9b76b442e592e8f06632b0e57a6c365"
"hdk": "0.0.126",
"hc_utils": "0.0.126",
"holo_hash": "0.0.21",
"holochain": "0.0.131",
"holochain_rev": "v0_0_131",
"holonix_rev": "44542b5c0cdc984454fad96fbec313b7b1c8ca7c"
}
12 changes: 6 additions & 6 deletions zomes/chat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
chrono = {version = "0.4.19", features = ['alloc', 'std']}
derive_more = "0.99"
hdk = "=0.0.123"
hdk = "=0.0.126"
serde = "1.0"
thiserror = "1.0"
hc_utils = "=0.0.123"
holo_hash = { version = "=0.0.20", features = ["encoding"] }
hc_utils = "=0.0.126"
holo_hash = { version = "=0.0.21", features = ["encoding"] }
uuid = "0.8.2"
hc_joining_code = {git = "https://github.com/holochain/hc-zome-lib", branch = "v0.0.123", package = "hc_joining_code"}
hc_joining_code = {git = "https://github.com/holochain/hc-zome-lib", branch = "v0.0.126", package = "hc_joining_code"}
getrandom = { version = "0.2", features = ["js"] }
is_sorted = "0.1.1"

[dev-dependencies]
holochain = "=0.0.127"
holochain = "=0.0.131"
futures = "0.3.1"
nanoid = "0.4.0"
observability = "0.1.2"
Expand All @@ -33,4 +33,4 @@ matches = {version = "0.1.8", optional = false }
holochain_test_wasm_common = { version = "0.0.26", optional = false }
unwrap_to = { version = "0.1.0", optional = false }
arbitrary = { version = "1.0", features = ["derive"] }
proptest = "1.0.0"
proptest = "1.0.0"
7 changes: 6 additions & 1 deletion zomes/chat/src/entries/channel/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ pub(crate) fn create_channel(channel_input: ChannelInput) -> ChatResult<ChannelD
let info_hash = hash_entry(&info)?;

// link the channel info to the path
create_link(path.path_entry_hash()?, info_hash, ChannelInfoTag::tag())?;
create_link(
path.path_entry_hash()?,
info_hash,
HdkLinkType::Paths,
ChannelInfoTag::tag(),
)?;

// Return the channel and the info for the UI
Ok(ChannelData::new(entry, info))
Expand Down
14 changes: 12 additions & 2 deletions zomes/chat/src/entries/message/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,12 @@ pub(crate) fn create_message(
};
// Turn the reply to and timestamp into a link tag
let tag = LastSeenKey::new(parent_hash_entry, message.created_at);
create_link(path_hash, message.entry_hash.clone(), LinkTag::from(tag))?;
create_link(
path_hash,
message.entry_hash.clone(),
HdkLinkType::Paths,
LinkTag::from(tag),
)?;

// Return the message for the UI
Ok(message)
Expand Down Expand Up @@ -303,7 +308,12 @@ pub(crate) fn refresh_chatter() -> ChatResult<()> {
let agent = agent_info()?.agent_latest_pubkey;
let agent_tag = agent_to_tag(&agent);
if !is_active_chatter(path.clone())? {
create_link(path.path_entry_hash()?, agent.into(), agent_tag.clone())?;
create_link(
path.path_entry_hash()?,
agent.into(),
HdkLinkType::Paths,
agent_tag.clone(),
)?;
}
Ok(())
}
Expand Down
Loading

0 comments on commit 610f81f

Please sign in to comment.