From 7c5fef0f465dca8c7213d038213b49865edd8576 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 5 Apr 2024 20:00:23 +0200 Subject: [PATCH] change EntryTypes to EntryDefinitions --- lib/hdk_records/src/entry_helpers.rs | 6 +- lib/hdk_semantic_indexes/client/src/lib.rs | 22 +-- package.json | 3 + pnpm-lock.yaml | 139 ++---------------- test/init.js | 12 +- test/package.json | 3 +- zomes/rea_agent/integrity_zome/src/lib.rs | 4 +- zomes/rea_agent/lib/src/lib.rs | 2 +- zomes/rea_agent/storage/src/lib.rs | 14 +- zomes/rea_agreement/integrity_zome/src/lib.rs | 4 +- zomes/rea_agreement/lib/src/lib.rs | 2 +- zomes/rea_agreement/storage/src/lib.rs | 14 +- .../rea_commitment/integrity_zome/src/lib.rs | 4 +- zomes/rea_commitment/lib/src/lib.rs | 2 +- zomes/rea_commitment/storage/src/lib.rs | 14 +- .../integrity_zome/src/lib.rs | 4 +- zomes/rea_economic_event/lib/src/lib.rs | 2 +- zomes/rea_economic_event/storage/src/lib.rs | 14 +- .../integrity_zome/src/lib.rs | 4 +- zomes/rea_economic_resource/lib/src/lib.rs | 2 +- .../rea_economic_resource/storage/src/lib.rs | 16 +- .../rea_fulfillment/integrity_zome/src/lib.rs | 4 +- .../lib_destination/src/lib.rs | 2 +- zomes/rea_fulfillment/lib_origin/src/lib.rs | 8 +- zomes/rea_fulfillment/storage/src/lib.rs | 14 +- zomes/rea_intent/integrity_zome/src/lib.rs | 4 +- zomes/rea_intent/lib/src/lib.rs | 2 +- zomes/rea_intent/storage/src/lib.rs | 14 +- zomes/rea_plan/integrity_zome/src/lib.rs | 4 +- zomes/rea_plan/lib/src/lib.rs | 2 +- zomes/rea_plan/storage/src/lib.rs | 14 +- zomes/rea_process/integrity_zome/src/lib.rs | 4 +- zomes/rea_process/lib/src/lib.rs | 2 +- zomes/rea_process/storage/src/lib.rs | 14 +- .../integrity_zome/src/lib.rs | 4 +- .../rea_process_specification/lib/src/lib.rs | 2 +- .../storage/src/lib.rs | 14 +- zomes/rea_proposal/integrity_zome/src/lib.rs | 4 +- zomes/rea_proposal/lib/src/lib.rs | 2 +- zomes/rea_proposal/storage/src/lib.rs | 14 +- .../integrity_zome/src/lib.rs | 4 +- zomes/rea_proposed_intent/lib/src/lib.rs | 2 +- zomes/rea_proposed_intent/storage/src/lib.rs | 14 +- .../rea_proposed_to/integrity_zome/src/lib.rs | 4 +- zomes/rea_proposed_to/lib/src/lib.rs | 2 +- zomes/rea_proposed_to/storage/src/lib.rs | 14 +- .../integrity_zome/src/lib.rs | 4 +- .../rea_resource_specification/lib/src/lib.rs | 2 +- .../storage/src/lib.rs | 14 +- .../integrity_zome/src/lib.rs | 4 +- .../lib_destination/src/lib.rs | 2 +- zomes/rea_satisfaction/lib_origin/src/lib.rs | 12 +- zomes/rea_satisfaction/storage/src/lib.rs | 14 +- zomes/rea_unit/integrity_zome/src/lib.rs | 4 +- zomes/rea_unit/lib/src/lib.rs | 2 +- zomes/rea_unit/storage/src/lib.rs | 14 +- 56 files changed, 212 insertions(+), 315 deletions(-) diff --git a/lib/hdk_records/src/entry_helpers.rs b/lib/hdk_records/src/entry_helpers.rs index 90de10cca..a55642aed 100644 --- a/lib/hdk_records/src/entry_helpers.rs +++ b/lib/hdk_records/src/entry_helpers.rs @@ -110,7 +110,7 @@ pub fn create_entry( ScopedEntryDefIndex: for<'a> TryFrom<&'a T, Error = E>, EntryVisibility: for<'a> From<&'a T>, { - // use conversion traits to load HDK `EntryTypes` def for input entry data + // use conversion traits to load HDK `EntryDefinitions` def for input entry data let wrapped_entry_struct: T = entry_struct.to_owned().into(); let ScopedEntryDefIndex { zome_index, zome_type, @@ -208,7 +208,7 @@ mod tests { #[hdk_entry_types] #[derive(Clone)] #[unit_enum(UnitTypes)] - enum EntryTypes { + enum EntryDefinitions { TestEntry(TestEntry), } #[hdk_entry_helper] @@ -220,7 +220,7 @@ mod tests { #[test] fn test_roundtrip() { let entry = TestEntry { field: None }; - let wrapped_entry = EntryTypes::TestEntry(entry); + let wrapped_entry = EntryDefinitions::TestEntry(entry); // CREATE let (RevisionMeta { id: action_hash, .. }, entry_hash) = create_entry(wrapped_entry).unwrap(); diff --git a/lib/hdk_semantic_indexes/client/src/lib.rs b/lib/hdk_semantic_indexes/client/src/lib.rs index 340bf8d0a..c6ffa7988 100644 --- a/lib/hdk_semantic_indexes/client/src/lib.rs +++ b/lib/hdk_semantic_indexes/client/src/lib.rs @@ -56,7 +56,7 @@ macro_rules! create_index { $dest_record_type:ident.$inv_rel:ident($record_id:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -74,7 +74,7 @@ macro_rules! create_index { $record_type:ident($record_id:expr).$rel:ident($dest_record_id:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -99,7 +99,7 @@ macro_rules! update_string_index { ) => { { let string_hashes: Vec<$addressable_type> = string_index_hashes($dest_string_ids)?; paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -118,7 +118,7 @@ macro_rules! update_string_index { ) => { { let string_hashes: Vec<$addressable_type> = string_index_hashes($dest_string_ids)?; paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -137,7 +137,7 @@ macro_rules! update_string_index { let dest_string_hashes: Vec<$addressable_type> = string_index_hashes($dest_string_ids)?; let remove_string_hashes: Vec<$addressable_type> = string_index_hashes($remove_string_ids)?; paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -180,7 +180,7 @@ macro_rules! update_index { $dest_record_type:ident.$inv_rel:ident($record_id:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -199,7 +199,7 @@ macro_rules! update_index { $dest_record_type:ident.$inv_rel:ident($record_id:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -218,7 +218,7 @@ macro_rules! update_index { $dest_record_type:ident.$inv_rel:ident($record_id:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -237,7 +237,7 @@ macro_rules! update_index { $record_type:ident($record_id:expr).$rel:ident($dest_record_ids:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -255,7 +255,7 @@ macro_rules! update_index { $record_type:ident($record_id:expr).$rel:ident.not($remove_record_ids:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, @@ -273,7 +273,7 @@ macro_rules! update_index { $record_type:ident($record_id:expr).$rel:ident($dest_record_ids:expr).not($remove_record_ids:expr) ) => { paste! { - manage_index::( + manage_index::( [], &stringify!([<_internal_index_ $record_type:lower:snake _ $rel:lower:snake>]), $record_id, diff --git a/package.json b/package.json index 85cc8a1f3..686400d3b 100644 --- a/package.json +++ b/package.json @@ -83,5 +83,8 @@ "hygen": "^5.0.3", "npm-run-all": "^4.1.5", "npm-watch": "^0.6.0" + }, + "dependencies": { + "tape": "^5.5.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d52150940..2d63bcb26 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,10 @@ settings: importers: .: + dependencies: + tape: + specifier: ^5.5.3 + version: 5.7.5 devDependencies: hygen: specifier: ^5.0.3 @@ -169,6 +173,9 @@ importers: test: dependencies: + base64-js: + specifier: 1.5.1 + version: 1.5.1 js-base64: specifier: ^3.6.0 version: 3.7.7 @@ -186,8 +193,8 @@ importers: specifier: 0.0.8 version: 0.0.8 '@holochain/tryorama': - specifier: 0.15.0 - version: 0.15.0 + specifier: 0.16.0-dev.1 + version: 0.16.0-dev.1 '@leosprograms/vf-graphql-holochain': specifier: 0.1.2 version: link:../modules/vf-graphql-holochain/build @@ -2187,25 +2194,6 @@ packages: build: 0.1.4 dev: true - /@holochain/client@0.16.10: - resolution: {integrity: sha512-Urgx6vXNux2XD/4+eOxou2FKwlUBu/g/BxUSZLX6wEaYWH9wDYXR5f3VToUrAhXGF5ssc08jb8jLiQZ23k62EQ==} - engines: {node: '>=18.0.0 || >=20.0.0'} - dependencies: - '@bitgo/blake2b': 3.2.4 - '@holochain/serialization': 0.1.0-beta-rc.3 - '@msgpack/msgpack': 2.8.0 - '@tauri-apps/api': 1.5.3 - emittery: 1.0.3 - isomorphic-ws: 5.0.0(ws@8.16.0) - js-base64: 3.7.7 - libsodium-wrappers: 0.7.13 - lodash-es: 4.17.21 - ws: 8.16.0 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: true - /@holochain/client@0.17.0-dev.7: resolution: {integrity: sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==} engines: {node: '>=18.0.0 || >=20.0.0'} @@ -2223,16 +2211,15 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate - dev: false /@holochain/serialization@0.1.0-beta-rc.3: resolution: {integrity: sha512-DJx4V2KXHVLciyOGjOYKTM/JLBpBEZ3RsPIRCgf7qmwhQdxXvhi2p+oFFRD51yUT5uC1/MzIVeJCl/R60PwFbw==} - /@holochain/tryorama@0.15.0: - resolution: {integrity: sha512-GWsiheb6AFkPkT1ho+dJeFRB2jVboIm/Gp+7v1LshKbDZrgY7oDEopyQPWmy4SkQQYItuscGaIdaOUJIQJuGKQ==} - engines: {node: '>=16.0.0 || >=18.0.0'} + /@holochain/tryorama@0.16.0-dev.1: + resolution: {integrity: sha512-tn2QR+fy6rmgERJbXkqZK0Q5478MDkyv3ZXZqI1WrOA2eBQtpIPWgnhRavKuBpDz2pQ/WCQKqTtmtFz9BNn5Lg==} + engines: {node: '>=18.0.0 || >=20.0.0'} dependencies: - '@holochain/client': 0.16.10 + '@holochain/client': 0.17.0-dev.7 get-port: 6.1.2 lodash: 4.17.21 uuid: 8.3.2 @@ -2759,14 +2746,12 @@ packages: dependencies: '@ljharb/through': 2.3.13 call-bind: 1.0.7 - dev: true /@ljharb/through@2.3.13: resolution: {integrity: sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 - dev: true /@msgpack/msgpack@2.8.0: resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==} @@ -4053,7 +4038,6 @@ packages: dependencies: call-bind: 1.0.7 is-array-buffer: 3.0.4 - dev: true /array-equal@1.0.2: resolution: {integrity: sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==} @@ -4094,7 +4078,6 @@ packages: es-abstract: 1.23.3 es-object-atoms: 1.0.0 is-string: 1.0.7 - dev: true /array.prototype.findlast@1.2.5: resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==} @@ -4184,7 +4167,6 @@ packages: get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 is-shared-array-buffer: 1.0.3 - dev: true /asap@2.0.6: resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==} @@ -4279,7 +4261,6 @@ packages: engines: {node: '>= 0.4'} dependencies: possible-typed-array-names: 1.0.0 - dev: true /aws-sign2@0.7.0: resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==} @@ -4527,7 +4508,6 @@ packages: /balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - dev: true /base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} @@ -4665,7 +4645,6 @@ packages: dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 - dev: true /brace-expansion@2.0.1: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} @@ -4814,7 +4793,6 @@ packages: function-bind: 1.1.2 get-intrinsic: 1.2.4 set-function-length: 1.2.2 - dev: true /callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} @@ -5224,7 +5202,6 @@ packages: /concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - dev: true /configstore@3.1.5: resolution: {integrity: sha512-nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA==} @@ -5680,7 +5657,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 - dev: true /data-view-byte-length@1.0.1: resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} @@ -5689,7 +5665,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 - dev: true /data-view-byte-offset@1.0.0: resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} @@ -5698,7 +5673,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 - dev: true /dataloader@1.4.0: resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==} @@ -5784,7 +5758,6 @@ packages: which-boxed-primitive: 1.0.2 which-collection: 1.0.2 which-typed-array: 1.1.15 - dev: true /deep-extend@0.6.0: resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} @@ -5818,7 +5791,6 @@ packages: es-define-property: 1.0.0 es-errors: 1.3.0 gopd: 1.0.1 - dev: true /define-lazy-prop@2.0.0: resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} @@ -5832,7 +5804,6 @@ packages: define-data-property: 1.1.4 has-property-descriptors: 1.0.2 object-keys: 1.1.1 - dev: true /define-property@0.2.5: resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==} @@ -5862,7 +5833,6 @@ packages: /defined@1.0.1: resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==} - dev: true /delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} @@ -6082,7 +6052,6 @@ packages: hasBin: true dependencies: minimatch: 3.1.2 - dev: true /duplexer3@0.1.5: resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==} @@ -6286,7 +6255,6 @@ packages: typed-array-length: 1.0.6 unbox-primitive: 1.0.2 which-typed-array: 1.1.15 - dev: true /es-array-method-boxes-properly@1.0.0: resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==} @@ -6297,12 +6265,10 @@ packages: engines: {node: '>= 0.4'} dependencies: get-intrinsic: 1.2.4 - dev: true /es-errors@1.3.0: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} - dev: true /es-get-iterator@1.1.3: resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==} @@ -6316,7 +6282,6 @@ packages: is-string: 1.0.7 isarray: 2.0.5 stop-iteration-iterator: 1.0.0 - dev: true /es-iterator-helpers@1.0.18: resolution: {integrity: sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==} @@ -6347,7 +6312,6 @@ packages: engines: {node: '>= 0.4'} dependencies: es-errors: 1.3.0 - dev: true /es-set-tostringtag@2.0.3: resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} @@ -6356,7 +6320,6 @@ packages: get-intrinsic: 1.2.4 has-tostringtag: 1.0.2 hasown: 2.0.2 - dev: true /es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} @@ -6371,7 +6334,6 @@ packages: is-callable: 1.2.7 is-date-object: 1.0.5 is-symbol: 1.0.4 - dev: true /escalade@3.1.2: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} @@ -7226,7 +7188,6 @@ packages: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} dependencies: is-callable: 1.2.7 - dev: true /for-in@1.0.2: resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==} @@ -7360,7 +7321,6 @@ packages: /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - dev: true /fsevents@1.2.13: resolution: {integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==} @@ -7384,7 +7344,6 @@ packages: /function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - dev: true /function.prototype.name@1.1.6: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} @@ -7394,11 +7353,9 @@ packages: define-properties: 1.2.1 es-abstract: 1.23.3 functions-have-names: 1.2.3 - dev: true /functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - dev: true /gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} @@ -7419,7 +7376,6 @@ packages: has-proto: 1.0.3 has-symbols: 1.0.3 hasown: 2.0.2 - dev: true /get-own-enumerable-property-symbols@3.0.2: resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==} @@ -7428,7 +7384,6 @@ packages: /get-package-type@0.1.0: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} engines: {node: '>=8.0.0'} - dev: true /get-port@6.1.2: resolution: {integrity: sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==} @@ -7459,7 +7414,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 get-intrinsic: 1.2.4 - dev: true /get-value@2.0.6: resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==} @@ -7518,7 +7472,6 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 - dev: true /global-dirs@0.1.1: resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==} @@ -7560,7 +7513,6 @@ packages: engines: {node: '>= 0.4'} dependencies: define-properties: 1.2.1 - dev: true /globby@11.1.0: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} @@ -7578,7 +7530,6 @@ packages: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: get-intrinsic: 1.2.4 - dev: true /got@6.7.1: resolution: {integrity: sha512-Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg==} @@ -7747,7 +7698,6 @@ packages: /has-bigints@1.0.2: resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} - dev: true /has-dynamic-import@2.1.0: resolution: {integrity: sha512-su0anMkNEnJKZ/rB99jn3y6lV/J8Ro96hBJ28YAeVzj5rWxH+YL/AdCyiYYA1HDLV9YhmvqpWSJJj2KLo1MX6g==} @@ -7755,7 +7705,6 @@ packages: dependencies: call-bind: 1.0.7 get-intrinsic: 1.2.4 - dev: true /has-flag@3.0.0: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} @@ -7771,24 +7720,20 @@ packages: resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} dependencies: es-define-property: 1.0.0 - dev: true /has-proto@1.0.3: resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} engines: {node: '>= 0.4'} - dev: true /has-symbols@1.0.3: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} - dev: true /has-tostringtag@1.0.2: resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} engines: {node: '>= 0.4'} dependencies: has-symbols: 1.0.3 - dev: true /has-value@0.3.1: resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==} @@ -7826,7 +7771,6 @@ packages: engines: {node: '>= 0.4'} dependencies: function-bind: 1.1.2 - dev: true /he@1.2.0: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} @@ -8142,7 +8086,6 @@ packages: dependencies: once: 1.4.0 wrappy: 1.0.2 - dev: true /inherits@2.0.3: resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} @@ -8150,7 +8093,6 @@ packages: /inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - dev: true /ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} @@ -8163,7 +8105,6 @@ packages: es-errors: 1.3.0 hasown: 2.0.2 side-channel: 1.0.6 - dev: true /invariant@2.2.4: resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==} @@ -8194,7 +8135,6 @@ packages: dependencies: call-bind: 1.0.7 has-tostringtag: 1.0.2 - dev: true /is-array-buffer@3.0.4: resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} @@ -8202,7 +8142,6 @@ packages: dependencies: call-bind: 1.0.7 get-intrinsic: 1.2.4 - dev: true /is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} @@ -8223,7 +8162,6 @@ packages: resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} dependencies: has-bigints: 1.0.2 - dev: true /is-binary-path@1.0.1: resolution: {integrity: sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==} @@ -8245,7 +8183,6 @@ packages: dependencies: call-bind: 1.0.7 has-tostringtag: 1.0.2 - dev: true /is-buffer@1.1.6: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} @@ -8254,7 +8191,6 @@ packages: /is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} - dev: true /is-ci@1.2.1: resolution: {integrity: sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==} @@ -8274,7 +8210,6 @@ packages: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: hasown: 2.0.2 - dev: true /is-data-descriptor@1.0.1: resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==} @@ -8288,14 +8223,12 @@ packages: engines: {node: '>= 0.4'} dependencies: is-typed-array: 1.1.13 - dev: true /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} engines: {node: '>= 0.4'} dependencies: has-tostringtag: 1.0.2 - dev: true /is-descriptor@0.1.7: resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==} @@ -8399,7 +8332,6 @@ packages: /is-map@2.0.3: resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==} engines: {node: '>= 0.4'} - dev: true /is-module@1.0.0: resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} @@ -8416,7 +8348,6 @@ packages: /is-negative-zero@2.0.3: resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} engines: {node: '>= 0.4'} - dev: true /is-npm@1.0.0: resolution: {integrity: sha512-9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg==} @@ -8428,7 +8359,6 @@ packages: engines: {node: '>= 0.4'} dependencies: has-tostringtag: 1.0.2 - dev: true /is-number@3.0.0: resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==} @@ -8494,7 +8424,6 @@ packages: dependencies: call-bind: 1.0.7 has-tostringtag: 1.0.2 - dev: true /is-regexp@1.0.0: resolution: {integrity: sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==} @@ -8514,14 +8443,12 @@ packages: /is-set@2.0.3: resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==} engines: {node: '>= 0.4'} - dev: true /is-shared-array-buffer@1.0.3: resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 - dev: true /is-stream@1.1.0: resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==} @@ -8538,21 +8465,18 @@ packages: engines: {node: '>= 0.4'} dependencies: has-tostringtag: 1.0.2 - dev: true /is-symbol@1.0.4: resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} engines: {node: '>= 0.4'} dependencies: has-symbols: 1.0.3 - dev: true /is-typed-array@1.1.13: resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} dependencies: which-typed-array: 1.1.15 - dev: true /is-typedarray@1.0.0: resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} @@ -8567,13 +8491,11 @@ packages: /is-weakmap@2.0.2: resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==} engines: {node: '>= 0.4'} - dev: true /is-weakref@1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} dependencies: call-bind: 1.0.7 - dev: true /is-weakset@2.0.3: resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==} @@ -8581,7 +8503,6 @@ packages: dependencies: call-bind: 1.0.7 get-intrinsic: 1.2.4 - dev: true /is-windows@1.0.2: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==} @@ -8610,7 +8531,6 @@ packages: /isarray@2.0.5: resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} - dev: true /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} @@ -10475,7 +10395,6 @@ packages: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: brace-expansion: 1.1.11 - dev: true /minimatch@5.1.6: resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} @@ -10497,7 +10416,6 @@ packages: /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - dev: true /minipass@7.0.4: resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} @@ -10529,7 +10447,6 @@ packages: has-property-descriptors: 1.0.2 hasown: 2.0.2 isarray: 2.0.5 - dev: true /moo-server@1.3.0: resolution: {integrity: sha512-9A8/eor2DXwpv1+a4pZAAydqLFVrWoKoO1fzdzqLUhYVXAO1Kgd1FR2gFZi7YdHzF0s4W8cDNwCfKJQrvLqxDw==} @@ -10796,7 +10713,6 @@ packages: /object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - dev: true /object-is@1.1.6: resolution: {integrity: sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==} @@ -10804,7 +10720,6 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - dev: true /object-keys@0.4.0: resolution: {integrity: sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==} @@ -10813,7 +10728,6 @@ packages: /object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} engines: {node: '>= 0.4'} - dev: true /object-visit@1.0.1: resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==} @@ -10830,7 +10744,6 @@ packages: define-properties: 1.2.1 has-symbols: 1.0.3 object-keys: 1.1.1 - dev: true /object.entries@1.1.8: resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==} @@ -10918,7 +10831,6 @@ packages: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} dependencies: wrappy: 1.0.2 - dev: true /one-time@1.0.0: resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==} @@ -11142,7 +11054,6 @@ packages: /path-is-absolute@1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} - dev: true /path-is-inside@1.0.2: resolution: {integrity: sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==} @@ -11160,7 +11071,6 @@ packages: /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - dev: true /path-scurry@1.10.2: resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==} @@ -11262,7 +11172,6 @@ packages: /possible-typed-array-names@1.0.0: resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} engines: {node: '>= 0.4'} - dev: true /postcss-attribute-case-insensitive@5.0.2(postcss@8.4.38): resolution: {integrity: sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==} @@ -12572,7 +12481,6 @@ packages: define-properties: 1.2.1 es-errors: 1.3.0 set-function-name: 2.0.2 - dev: true /regexpp@2.0.1: resolution: {integrity: sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==} @@ -12801,7 +12709,6 @@ packages: is-core-module: 2.13.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - dev: true /response-iterator@0.2.6: resolution: {integrity: sha512-pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw==} @@ -12882,7 +12789,6 @@ packages: get-intrinsic: 1.2.4 has-symbols: 1.0.3 isarray: 2.0.5 - dev: true /safe-buffer@5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -12898,7 +12804,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-regex: 1.1.4 - dev: true /safe-regex@1.1.0: resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==} @@ -13138,7 +13043,6 @@ packages: get-intrinsic: 1.2.4 gopd: 1.0.1 has-property-descriptors: 1.0.2 - dev: true /set-function-name@2.0.2: resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} @@ -13148,7 +13052,6 @@ packages: es-errors: 1.3.0 functions-have-names: 1.2.3 has-property-descriptors: 1.0.2 - dev: true /set-value@2.0.1: resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==} @@ -13216,7 +13119,6 @@ packages: es-errors: 1.3.0 get-intrinsic: 1.2.4 object-inspect: 1.13.1 - dev: true /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -13525,7 +13427,6 @@ packages: engines: {node: '>= 0.4'} dependencies: internal-slot: 1.0.7 - dev: true /string-length@2.0.0: resolution: {integrity: sha512-Qka42GGrS8Mm3SZ+7cH8UXiIWI867/b/Z/feQSpQx/rbfB8UGknGEZVaUQMOUVj+soY6NpWAxily63HI1OckVQ==} @@ -13626,7 +13527,6 @@ packages: define-properties: 1.2.1 es-abstract: 1.23.3 es-object-atoms: 1.0.0 - dev: true /string.prototype.trimend@1.0.8: resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} @@ -13634,7 +13534,6 @@ packages: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 - dev: true /string.prototype.trimstart@1.0.8: resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} @@ -13643,7 +13542,6 @@ packages: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 - dev: true /string_decoder@0.10.31: resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==} @@ -13822,7 +13720,6 @@ packages: /supports-preserve-symlinks-flag@1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - dev: true /svg-parser@2.0.4: resolution: {integrity: sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==} @@ -13983,7 +13880,6 @@ packages: object.assign: 4.1.5 resolve: 2.0.0-next.5 string.prototype.trim: 1.2.9 - dev: true /tar-stream@2.2.0: resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} @@ -14433,7 +14329,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-typed-array: 1.1.13 - dev: true /typed-array-byte-length@1.0.1: resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} @@ -14444,7 +14339,6 @@ packages: gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 - dev: true /typed-array-byte-offset@1.0.2: resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} @@ -14456,7 +14350,6 @@ packages: gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 - dev: true /typed-array-length@1.0.6: resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} @@ -14468,7 +14361,6 @@ packages: has-proto: 1.0.3 is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 - dev: true /typedarray-to-buffer@3.1.5: resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} @@ -14498,7 +14390,6 @@ packages: has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 - dev: true /undefsafe@2.0.5: resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} @@ -15012,7 +14903,6 @@ packages: is-number-object: 1.0.7 is-string: 1.0.7 is-symbol: 1.0.4 - dev: true /which-builtin-type@1.1.3: resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==} @@ -15040,7 +14930,6 @@ packages: is-set: 2.0.3 is-weakmap: 2.0.2 is-weakset: 2.0.3 - dev: true /which-module@2.0.1: resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} @@ -15055,7 +14944,6 @@ packages: for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.2 - dev: true /which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} @@ -15304,7 +15192,6 @@ packages: /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - dev: true /wrench@1.3.9: resolution: {integrity: sha512-srTJQmLTP5YtW+F5zDuqjMEZqLLr/eJOZfDI5ibfPfRMeDh3oBUefAscuH0q5wBKE339ptH/S/0D18ZkfOfmKQ==} diff --git a/test/init.js b/test/init.js index 5e2879989..2aad2f55a 100644 --- a/test/init.js +++ b/test/init.js @@ -24,9 +24,11 @@ import { hreaExtensionSchemas, DEFAULT_VF_MODULES, } from '@leosprograms/vf-graphql-holochain' -import b64 from "js-base64" +// import b64 from "js-base64" +import { fromByteArray, toByteArray } from 'base64-js'; -const { Base64 } = b64 + +// const { Base64 } = b64 sourceMapSupport.install() @@ -120,6 +122,7 @@ const buildPlayer = async (dnasToInstall, graphQLAPIOptions) => { timeout: 60000, }) try { + console.log("-------------------------------------1") const player = await scenario.addPlayerWithApp({ bundle: { manifest: { @@ -144,6 +147,8 @@ const buildPlayer = async (dnasToInstall, graphQLAPIOptions) => { }, }) + console.log("----------------------------------2") + console.info(`Created new player with admin URI ${player.conductor.adminWs().client.socket._url}`) const cellIdsKeyedByRole = {} @@ -199,7 +204,8 @@ const HOLOHASH_PREFIX_ENTRY = Uint8Array.of(0x84, 0x21, 0x24) // uhCEk const HOLOHASH_PREFIX_AGENT = Uint8Array.of(0x84, 0x20, 0x24) // uhCAk function serializeHash (hash) { - return `u${Base64.fromUint8Array(hash, true)}` + // return `u${Base64.fromUint8Array(hash, true)}` + return `u${fromByteArray(hash, true)}` } function serializeId (id) { diff --git a/test/package.json b/test/package.json index 5bff2e294..1457641d5 100644 --- a/test/package.json +++ b/test/package.json @@ -13,7 +13,7 @@ "@babel/core": "^7.18.5", "@babel/eslint-parser": "^7.18.2", "@holochain-playground/cli": "0.0.8", - "@holochain/tryorama": "0.15.0", + "@holochain/tryorama": "0.16.0-dev.1", "@valueflows/vf-graphql": "0.9.0-alpha.9", "@leosprograms/vf-graphql-holochain": "0.1.2", "assert": "^2.0.0", @@ -56,6 +56,7 @@ "homepage": "https://github.com/h-rea/hrea#readme", "dependencies": { "js-base64": "^3.6.0", + "base64-js": "1.5.1", "randombytes": "^2.1.0" } } diff --git a/zomes/rea_agent/integrity_zome/src/lib.rs b/zomes/rea_agent/integrity_zome/src/lib.rs index d1e4eb808..2f7002ed4 100644 --- a/zomes/rea_agent/integrity_zome/src/lib.rs +++ b/zomes/rea_agent/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_agent_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_agent_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_agent/lib/src/lib.rs b/zomes/rea_agent/lib/src/lib.rs index fa1e5e0b1..e5a921c70 100644 --- a/zomes/rea_agent/lib/src/lib.rs +++ b/zomes/rea_agent/lib/src/lib.rs @@ -39,7 +39,7 @@ pub fn handle_create_agent(entry_type_id: S, agent: CreateRequest) -> RecordA where S: AsRef + std::fmt::Display { let agent_type = agent.agent_type.clone(); - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, agent)?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, agent)?; let e = update_string_index!(agent(&base_address).agent_type(vec![agent_type])); hdk::prelude::debug!("handle_create_agent::agent_type index {:?}", e); construct_response(&base_address, &meta, &entry_resp, get_link_fields(&base_address)?) diff --git a/zomes/rea_agent/storage/src/lib.rs b/zomes/rea_agent/storage/src/lib.rs index e409f8fd8..c83c6b1e3 100644 --- a/zomes/rea_agent/storage/src/lib.rs +++ b/zomes/rea_agent/storage/src/lib.rs @@ -58,26 +58,26 @@ generate_record_entry!(EntryData, AgentAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Agent(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Agent(e) + EntryDefinitions::Agent(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_agreement/integrity_zome/src/lib.rs b/zomes/rea_agreement/integrity_zome/src/lib.rs index 359a4d45e..f04e3fb52 100644 --- a/zomes/rea_agreement/integrity_zome/src/lib.rs +++ b/zomes/rea_agreement/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_agreement_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_agreement_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_agreement/lib/src/lib.rs b/zomes/rea_agreement/lib/src/lib.rs index 718e0b27b..0a8ab1d66 100644 --- a/zomes/rea_agreement/lib/src/lib.rs +++ b/zomes/rea_agreement/lib/src/lib.rs @@ -34,7 +34,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_agreement(entry_type_id: S, agreement: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, agreement)?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, agreement)?; construct_response(&base_address, &meta, &entry_resp, get_link_fields(&base_address)?) } diff --git a/zomes/rea_agreement/storage/src/lib.rs b/zomes/rea_agreement/storage/src/lib.rs index 502ded73c..05dbf1399 100644 --- a/zomes/rea_agreement/storage/src/lib.rs +++ b/zomes/rea_agreement/storage/src/lib.rs @@ -57,26 +57,26 @@ generate_record_entry!(EntryData, AgreementAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Agreement(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Agreement(e) + EntryDefinitions::Agreement(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_commitment/integrity_zome/src/lib.rs b/zomes/rea_commitment/integrity_zome/src/lib.rs index 598069c77..3c5cf9f97 100644 --- a/zomes/rea_commitment/integrity_zome/src/lib.rs +++ b/zomes/rea_commitment/integrity_zome/src/lib.rs @@ -9,12 +9,12 @@ */ use hdi::prelude::*; use hc_zome_rea_commitment_storage::{ - EntryStorage, EntryTypes, EntryTypesUnit, Identified, LinkTypes, + EntryStorage, EntryDefinitions, EntryTypesUnit, Identified, LinkTypes, }; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_commitment/lib/src/lib.rs b/zomes/rea_commitment/lib/src/lib.rs index f98a940f9..847a3fd23 100644 --- a/zomes/rea_commitment/lib/src/lib.rs +++ b/zomes/rea_commitment/lib/src/lib.rs @@ -31,7 +31,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_commitment(entry_type_id: S, commitment: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, commitment.to_owned())?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, commitment.to_owned())?; // handle link fields // :TODO: improve error handling diff --git a/zomes/rea_commitment/storage/src/lib.rs b/zomes/rea_commitment/storage/src/lib.rs index 4f63735c0..50775815a 100644 --- a/zomes/rea_commitment/storage/src/lib.rs +++ b/zomes/rea_commitment/storage/src/lib.rs @@ -109,26 +109,26 @@ generate_record_entry!(EntryData, CommitmentAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Commitment(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Commitment(e) + EntryDefinitions::Commitment(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_economic_event/integrity_zome/src/lib.rs b/zomes/rea_economic_event/integrity_zome/src/lib.rs index 4a2020100..a2e2514f1 100644 --- a/zomes/rea_economic_event/integrity_zome/src/lib.rs +++ b/zomes/rea_economic_event/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_economic_event_storage::{Identified, EntryStorage, EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_economic_event_storage::{Identified, EntryStorage, EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_economic_event/lib/src/lib.rs b/zomes/rea_economic_event/lib/src/lib.rs index 140f2882a..64ee60c25 100644 --- a/zomes/rea_economic_event/lib/src/lib.rs +++ b/zomes/rea_economic_event/lib/src/lib.rs @@ -189,7 +189,7 @@ fn handle_create_economic_event_record(entry_type_id: S, event: &EconomicEven ) -> RecordAPIResult<(SignedActionHashed, EconomicEventAddress, EntryData)> where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_, EconomicEventAddress, EntryData) = create_record::( + let (meta, base_address, entry_resp): (_, EconomicEventAddress, EntryData) = create_record::( read_index_zome, &entry_type_id, match resource_address { diff --git a/zomes/rea_economic_event/storage/src/lib.rs b/zomes/rea_economic_event/storage/src/lib.rs index cbdf1e488..d17a36930 100644 --- a/zomes/rea_economic_event/storage/src/lib.rs +++ b/zomes/rea_economic_event/storage/src/lib.rs @@ -110,27 +110,27 @@ generate_record_entry!(EntryData, EconomicEventAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { EconomicEvent(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::EconomicEvent(e) + EntryDefinitions::EconomicEvent(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_economic_resource/integrity_zome/src/lib.rs b/zomes/rea_economic_resource/integrity_zome/src/lib.rs index 4872f20cb..5c9500ce1 100644 --- a/zomes/rea_economic_resource/integrity_zome/src/lib.rs +++ b/zomes/rea_economic_resource/integrity_zome/src/lib.rs @@ -9,11 +9,11 @@ */ use hdi::prelude::*; use hc_zome_rea_economic_resource_storage::Identified; -use hc_zome_rea_economic_resource_storage::{EntryStorage, EntryTypes, EntryTypesUnit, LinkTypes}; +use hc_zome_rea_economic_resource_storage::{EntryStorage, EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_economic_resource/lib/src/lib.rs b/zomes/rea_economic_resource/lib/src/lib.rs index 250fa26aa..179b00950 100644 --- a/zomes/rea_economic_resource/lib/src/lib.rs +++ b/zomes/rea_economic_resource/lib/src/lib.rs @@ -80,7 +80,7 @@ impl API for EconomicResourceZomePermissableDefault { return Err(DataIntegrityError::RemoteRequestError("cannot create a new EconomicResource and specify an inventoried resource ID in the same event".to_string())); } - let (meta, base_address, entry_resp): (_, EconomicResourceAddress, EntryData) = create_record::( + let (meta, base_address, entry_resp): (_, EconomicResourceAddress, EntryData) = create_record::( read_index_zome, &resource_entry_type_id, params.with_inventory_type(ResourceInventoryType::ProvidingInventory), // inventories can only be inited by their owners initially diff --git a/zomes/rea_economic_resource/storage/src/lib.rs b/zomes/rea_economic_resource/storage/src/lib.rs index 2b18e9782..4dc8ad5e3 100644 --- a/zomes/rea_economic_resource/storage/src/lib.rs +++ b/zomes/rea_economic_resource/storage/src/lib.rs @@ -91,25 +91,25 @@ generate_record_entry!(EntryData, EconomicResourceAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { EconomicResource(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::EconomicResource(e) + EntryDefinitions::EconomicResource(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } @@ -243,7 +243,7 @@ fn get_units_for_resource( } fn get_resource_specification(specification_id: ResourceSpecificationAddress) -> RecordAPIResult { - let spec_data: OtherCellResult = call_zome_method::( + let spec_data: OtherCellResult = call_zome_method::( &specification_id, &String::from("read_resource_specification"), GetSpecificationRequest { address: specification_id.to_owned() }, diff --git a/zomes/rea_fulfillment/integrity_zome/src/lib.rs b/zomes/rea_fulfillment/integrity_zome/src/lib.rs index cda2e1a47..a2453e6d3 100644 --- a/zomes/rea_fulfillment/integrity_zome/src/lib.rs +++ b/zomes/rea_fulfillment/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_fulfillment_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_fulfillment_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_fulfillment/lib_destination/src/lib.rs b/zomes/rea_fulfillment/lib_destination/src/lib.rs index 813d67dd8..8d2442aef 100644 --- a/zomes/rea_fulfillment/lib_destination/src/lib.rs +++ b/zomes/rea_fulfillment/lib_destination/src/lib.rs @@ -35,7 +35,7 @@ fn read_index_zome(conf: DnaConfigSliceObservation) -> Option { pub fn handle_create_fulfillment(entry_type_id: S, fulfillment: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, fulfillment_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, fulfillment.to_owned())?; + let (meta, fulfillment_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, fulfillment.to_owned())?; // link entries in the local DNA let e = create_index!(fulfillment.fulfilled_by(fulfillment.get_fulfilled_by()), economic_event.fulfills(&fulfillment_address)); diff --git a/zomes/rea_fulfillment/lib_origin/src/lib.rs b/zomes/rea_fulfillment/lib_origin/src/lib.rs index 27c4621ce..ec212dcee 100644 --- a/zomes/rea_fulfillment/lib_origin/src/lib.rs +++ b/zomes/rea_fulfillment/lib_origin/src/lib.rs @@ -40,7 +40,7 @@ fn read_index_zome(conf: DnaConfigSlicePlanning) -> Option { pub fn handle_create_fulfillment(entry_type_id: S, fulfillment: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, fulfillment_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, fulfillment.to_owned())?; + let (meta, fulfillment_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, fulfillment.to_owned())?; // link entries in the local DNA let e = create_index!(fulfillment.fulfills(fulfillment.get_fulfills()), commitment.fulfilled_by(&fulfillment_address)); @@ -48,7 +48,7 @@ pub fn handle_create_fulfillment(entry_type_id: S, fulfillment: CreateRequest // :TODO: report any error // update in the associated foreign DNA as well - let pingback: OtherCellResult = call_zome_method::( + let pingback: OtherCellResult = call_zome_method::( fulfillment.get_fulfilled_by(), &REPLICATE_CREATE_API_METHOD, CreateParams { fulfillment: CreateRequest { @@ -95,7 +95,7 @@ pub fn handle_update_fulfillment(fulfillment: UpdateRequest) -> RecordAPIResult< // update fulfillment records in remote DNA (and by proxy, event indexes in remote DNA) if new_entry.fulfilled_by != prev_entry.fulfilled_by { - let pingback: OtherCellResult = call_zome_method::( + let pingback: OtherCellResult = call_zome_method::( // :TODO: update to intelligently call remote DNAs if new & old target record are not in same network &prev_entry.fulfilled_by, &REPLICATE_UPDATE_API_METHOD, @@ -118,7 +118,7 @@ pub fn handle_delete_fulfillment(revision_id: ActionHash) -> RecordAPIResult = call_zome_method::( + let pingback: OtherCellResult = call_zome_method::( &entry.fulfilled_by, &REPLICATE_DELETE_API_METHOD, ByAction { address: revision_id.to_owned() }, diff --git a/zomes/rea_fulfillment/storage/src/lib.rs b/zomes/rea_fulfillment/storage/src/lib.rs index 4e1e481e1..cc6d2ab3d 100644 --- a/zomes/rea_fulfillment/storage/src/lib.rs +++ b/zomes/rea_fulfillment/storage/src/lib.rs @@ -70,25 +70,25 @@ generate_record_entry!(EntryData, FulfillmentAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Fulfillment(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Fulfillment(e) + EntryDefinitions::Fulfillment(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_intent/integrity_zome/src/lib.rs b/zomes/rea_intent/integrity_zome/src/lib.rs index 85b3693bc..ec52c395c 100644 --- a/zomes/rea_intent/integrity_zome/src/lib.rs +++ b/zomes/rea_intent/integrity_zome/src/lib.rs @@ -9,12 +9,12 @@ */ use hdi::prelude::*; use hc_zome_rea_intent_storage::{ - EntryStorage, EntryTypes, EntryTypesUnit, Identified, LinkTypes, + EntryStorage, EntryDefinitions, EntryTypesUnit, Identified, LinkTypes, }; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_intent/lib/src/lib.rs b/zomes/rea_intent/lib/src/lib.rs index 76b849f8a..306f78dc6 100644 --- a/zomes/rea_intent/lib/src/lib.rs +++ b/zomes/rea_intent/lib/src/lib.rs @@ -31,7 +31,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_intent(entry_type_id: S, intent: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, intent.to_owned())?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, intent.to_owned())?; // handle link fields // :TODO: improve error handling diff --git a/zomes/rea_intent/storage/src/lib.rs b/zomes/rea_intent/storage/src/lib.rs index 0288cce09..9a8877c9d 100644 --- a/zomes/rea_intent/storage/src/lib.rs +++ b/zomes/rea_intent/storage/src/lib.rs @@ -98,25 +98,25 @@ generate_record_entry!(EntryData, IntentAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Intent(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Intent(e) + EntryDefinitions::Intent(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_plan/integrity_zome/src/lib.rs b/zomes/rea_plan/integrity_zome/src/lib.rs index cf411192a..95643e471 100644 --- a/zomes/rea_plan/integrity_zome/src/lib.rs +++ b/zomes/rea_plan/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_plan_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_plan_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_plan/lib/src/lib.rs b/zomes/rea_plan/lib/src/lib.rs index 86deb58b9..fe15d89f1 100644 --- a/zomes/rea_plan/lib/src/lib.rs +++ b/zomes/rea_plan/lib/src/lib.rs @@ -34,7 +34,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_plan(entry_type_id: S, plan: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, plan)?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, plan)?; construct_response(&base_address, &meta, &entry_resp, get_link_fields(&base_address)?) } diff --git a/zomes/rea_plan/storage/src/lib.rs b/zomes/rea_plan/storage/src/lib.rs index ea46ff4d8..05f9ad7ed 100644 --- a/zomes/rea_plan/storage/src/lib.rs +++ b/zomes/rea_plan/storage/src/lib.rs @@ -59,25 +59,25 @@ generate_record_entry!(EntryData, PlanAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Plan(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Plan(e) + EntryDefinitions::Plan(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_process/integrity_zome/src/lib.rs b/zomes/rea_process/integrity_zome/src/lib.rs index 7083db67c..f2a5d73f6 100644 --- a/zomes/rea_process/integrity_zome/src/lib.rs +++ b/zomes/rea_process/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_process_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_process_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_process/lib/src/lib.rs b/zomes/rea_process/lib/src/lib.rs index dcd8b7841..5e5491b7e 100644 --- a/zomes/rea_process/lib/src/lib.rs +++ b/zomes/rea_process/lib/src/lib.rs @@ -33,7 +33,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_process(entry_type_id: S, process: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, process.to_owned())?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, process.to_owned())?; // handle link fields // :TODO: propogate errors diff --git a/zomes/rea_process/storage/src/lib.rs b/zomes/rea_process/storage/src/lib.rs index 6a0851eae..ffbbb63fd 100644 --- a/zomes/rea_process/storage/src/lib.rs +++ b/zomes/rea_process/storage/src/lib.rs @@ -64,24 +64,24 @@ generate_record_entry!(EntryData, ProcessAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Process(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Process(e) + EntryDefinitions::Process(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + fn try_from(e: AvailableCapability) -> Result { + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_process_specification/integrity_zome/src/lib.rs b/zomes/rea_process_specification/integrity_zome/src/lib.rs index e32db6a76..153e2fa65 100644 --- a/zomes/rea_process_specification/integrity_zome/src/lib.rs +++ b/zomes/rea_process_specification/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_process_specification_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_process_specification_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_process_specification/lib/src/lib.rs b/zomes/rea_process_specification/lib/src/lib.rs index 18bbf7e38..6dc85032f 100644 --- a/zomes/rea_process_specification/lib/src/lib.rs +++ b/zomes/rea_process_specification/lib/src/lib.rs @@ -29,7 +29,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_process_specification(entry_type_id: S, process_specification: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, process_specification)?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, process_specification)?; construct_response(&base_address, &meta, &entry_resp) } diff --git a/zomes/rea_process_specification/storage/src/lib.rs b/zomes/rea_process_specification/storage/src/lib.rs index f53ea851a..cc8bd66d9 100644 --- a/zomes/rea_process_specification/storage/src/lib.rs +++ b/zomes/rea_process_specification/storage/src/lib.rs @@ -45,25 +45,25 @@ generate_record_entry!(EntryData, ProcessSpecificationAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { ProcessSpecification(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::ProcessSpecification(e) + EntryDefinitions::ProcessSpecification(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_proposal/integrity_zome/src/lib.rs b/zomes/rea_proposal/integrity_zome/src/lib.rs index 24f05fc16..46e2b2bca 100644 --- a/zomes/rea_proposal/integrity_zome/src/lib.rs +++ b/zomes/rea_proposal/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_proposal_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_proposal_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_proposal/lib/src/lib.rs b/zomes/rea_proposal/lib/src/lib.rs index 761a5f9c5..4da5e5204 100644 --- a/zomes/rea_proposal/lib/src/lib.rs +++ b/zomes/rea_proposal/lib/src/lib.rs @@ -32,7 +32,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_proposal(entry_type_id: S, proposal: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, proposal)?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, proposal)?; construct_response(&base_address, &meta, &entry_resp, get_link_fields(&base_address)?) } diff --git a/zomes/rea_proposal/storage/src/lib.rs b/zomes/rea_proposal/storage/src/lib.rs index fc71bc946..b8d48adc3 100644 --- a/zomes/rea_proposal/storage/src/lib.rs +++ b/zomes/rea_proposal/storage/src/lib.rs @@ -55,25 +55,25 @@ generate_record_entry!(EntryData, ProposalAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Proposal(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Proposal(e) + EntryDefinitions::Proposal(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_proposed_intent/integrity_zome/src/lib.rs b/zomes/rea_proposed_intent/integrity_zome/src/lib.rs index 472e3d917..2beaf069e 100644 --- a/zomes/rea_proposed_intent/integrity_zome/src/lib.rs +++ b/zomes/rea_proposed_intent/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_proposed_intent_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_proposed_intent_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_proposed_intent/lib/src/lib.rs b/zomes/rea_proposed_intent/lib/src/lib.rs index 73307fd03..62302ff6f 100644 --- a/zomes/rea_proposed_intent/lib/src/lib.rs +++ b/zomes/rea_proposed_intent/lib/src/lib.rs @@ -30,7 +30,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_proposed_intent(entry_type_id: S, proposed_intent: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_, ProposedIntentAddress, EntryData) = create_record::(read_index_zome, &entry_type_id, proposed_intent.to_owned())?; + let (meta, base_address, entry_resp): (_, ProposedIntentAddress, EntryData) = create_record::(read_index_zome, &entry_type_id, proposed_intent.to_owned())?; // handle link fields let r1 = create_index!(proposed_intent.published_in(&proposed_intent.published_in), proposal.publishes(&base_address)); diff --git a/zomes/rea_proposed_intent/storage/src/lib.rs b/zomes/rea_proposed_intent/storage/src/lib.rs index 5104f0770..70cf6398b 100644 --- a/zomes/rea_proposed_intent/storage/src/lib.rs +++ b/zomes/rea_proposed_intent/storage/src/lib.rs @@ -48,26 +48,26 @@ generate_record_entry!(EntryData, ProposedIntentAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { ProposedIntent(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::ProposedIntent(e) + EntryDefinitions::ProposedIntent(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_proposed_to/integrity_zome/src/lib.rs b/zomes/rea_proposed_to/integrity_zome/src/lib.rs index 94551b7cc..b3325de40 100644 --- a/zomes/rea_proposed_to/integrity_zome/src/lib.rs +++ b/zomes/rea_proposed_to/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_proposed_to_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_proposed_to_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_proposed_to/lib/src/lib.rs b/zomes/rea_proposed_to/lib/src/lib.rs index 1f3b4fbd1..04d813e87 100644 --- a/zomes/rea_proposed_to/lib/src/lib.rs +++ b/zomes/rea_proposed_to/lib/src/lib.rs @@ -31,7 +31,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_proposed_to(entry_type_id: S, proposed_to: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_, ProposedToAddress, EntryData) = create_record::(read_index_zome, &entry_type_id, proposed_to.to_owned())?; + let (meta, base_address, entry_resp): (_, ProposedToAddress, EntryData) = create_record::(read_index_zome, &entry_type_id, proposed_to.to_owned())?; // handle link fields let r1 = create_index!(proposed_to.proposed(&proposed_to.proposed), proposal.published_to(&base_address)); diff --git a/zomes/rea_proposed_to/storage/src/lib.rs b/zomes/rea_proposed_to/storage/src/lib.rs index 45acd1ed2..821dbbfc4 100644 --- a/zomes/rea_proposed_to/storage/src/lib.rs +++ b/zomes/rea_proposed_to/storage/src/lib.rs @@ -46,25 +46,25 @@ generate_record_entry!(EntryData, ProposedToAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { ProposedTo(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::ProposedTo(e) + EntryDefinitions::ProposedTo(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_resource_specification/integrity_zome/src/lib.rs b/zomes/rea_resource_specification/integrity_zome/src/lib.rs index 8266e1bf7..14085dc90 100644 --- a/zomes/rea_resource_specification/integrity_zome/src/lib.rs +++ b/zomes/rea_resource_specification/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_resource_specification_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_resource_specification_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_resource_specification/lib/src/lib.rs b/zomes/rea_resource_specification/lib/src/lib.rs index 61b0c7714..a0532b1b4 100644 --- a/zomes/rea_resource_specification/lib/src/lib.rs +++ b/zomes/rea_resource_specification/lib/src/lib.rs @@ -33,7 +33,7 @@ fn read_index_zome(conf: DnaConfigSlice) -> Option { pub fn handle_create_resource_specification(entry_type_id: S, resource_specification: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, resource_specification)?; + let (meta, base_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, resource_specification)?; construct_response(&base_address, &meta, &entry_resp, get_link_fields(&base_address)?) } diff --git a/zomes/rea_resource_specification/storage/src/lib.rs b/zomes/rea_resource_specification/storage/src/lib.rs index 30299ec30..d99cdc5c9 100644 --- a/zomes/rea_resource_specification/storage/src/lib.rs +++ b/zomes/rea_resource_specification/storage/src/lib.rs @@ -53,26 +53,26 @@ generate_record_entry!(EntryData, ResourceSpecificationAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { ResourceSpecification(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::ResourceSpecification(e) + EntryDefinitions::ResourceSpecification(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_satisfaction/integrity_zome/src/lib.rs b/zomes/rea_satisfaction/integrity_zome/src/lib.rs index e63873b8c..072e0a07c 100644 --- a/zomes/rea_satisfaction/integrity_zome/src/lib.rs +++ b/zomes/rea_satisfaction/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_satisfaction_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_satisfaction_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_satisfaction/lib_destination/src/lib.rs b/zomes/rea_satisfaction/lib_destination/src/lib.rs index e13cc98da..8ace8cd81 100644 --- a/zomes/rea_satisfaction/lib_destination/src/lib.rs +++ b/zomes/rea_satisfaction/lib_destination/src/lib.rs @@ -35,7 +35,7 @@ fn read_index_zome(conf: DnaConfigSliceObservation) -> Option { pub fn handle_create_satisfaction(entry_type_id: S, satisfaction: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, satisfaction_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, satisfaction.to_owned())?; + let (meta, satisfaction_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, satisfaction.to_owned())?; // link entries in the local DNA let r1 = create_index!(satisfaction.satisfied_by(satisfaction.get_satisfied_by()), economic_event.satisfies(&satisfaction_address)); diff --git a/zomes/rea_satisfaction/lib_origin/src/lib.rs b/zomes/rea_satisfaction/lib_origin/src/lib.rs index 435953a53..23d83cd0b 100644 --- a/zomes/rea_satisfaction/lib_origin/src/lib.rs +++ b/zomes/rea_satisfaction/lib_origin/src/lib.rs @@ -40,7 +40,7 @@ fn read_index_zome(conf: DnaConfigSlicePlanning) -> Option { pub fn handle_create_satisfaction(entry_type_id: S, satisfaction: CreateRequest) -> RecordAPIResult where S: AsRef + std::fmt::Display, { - let (meta, satisfaction_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, satisfaction.to_owned())?; + let (meta, satisfaction_address, entry_resp): (_,_, EntryData) = create_record::(read_index_zome, &entry_type_id, satisfaction.to_owned())?; // link entries in the local DNA let r1 = create_index!(satisfaction.satisfies(satisfaction.get_satisfies()), intent.satisfied_by(&satisfaction_address)); @@ -57,7 +57,7 @@ pub fn handle_create_satisfaction(entry_type_id: S, satisfaction: CreateReque // :TODO: consider the implications of this in loosely coordinated multi-network spaces // we assign a type to the response so that call_zome_method can // effectively deserialize the response without failing - let result: OtherCellResult = call_zome_method::( + let result: OtherCellResult = call_zome_method::( event_or_commitment, &REPLICATE_CREATE_API_METHOD, CreateParams { satisfaction: CreateRequest { @@ -121,7 +121,7 @@ pub fn handle_update_satisfaction(satisfaction: UpdateRequest) -> RecordAPIResul hdk::prelude::debug!("handle_update_satisfaction::satisfied_by index (origin) {:?}", e); } else { // both values were remote and in the same DNA, forward the update - let result: OtherCellResult = call_zome_method::( + let result: OtherCellResult = call_zome_method::( &prev_entry.satisfied_by, &REPLICATE_UPDATE_API_METHOD, UpdateParams { satisfaction: satisfaction.to_owned() }, @@ -136,7 +136,7 @@ pub fn handle_update_satisfaction(satisfaction: UpdateRequest) -> RecordAPIResul hdk::prelude::debug!("handle_update_satisfaction::satisfied_by index (origin) {:?}", e); } else { // previous value was remote, handle the remote update as a deletion - let result: OtherCellResult = call_zome_method::( + let result: OtherCellResult = call_zome_method::( &prev_entry.satisfied_by, &REPLICATE_DELETE_API_METHOD, ByAction { address: satisfaction.get_revision_id().to_owned() }, @@ -151,7 +151,7 @@ pub fn handle_update_satisfaction(satisfaction: UpdateRequest) -> RecordAPIResul hdk::prelude::debug!("handle_update_satisfaction::satisfied_by index (origin) {:?}", e); } else { // new value was remote, handle the remote update as a creation - let result: OtherCellResult = call_zome_method::( + let result: OtherCellResult = call_zome_method::( &new_entry.satisfied_by, &REPLICATE_CREATE_API_METHOD, CreateParams { satisfaction: CreateRequest { @@ -190,7 +190,7 @@ pub fn handle_delete_satisfaction(revision_id: ActionHash) -> RecordAPIResult = call_zome_method::( + let result: OtherCellResult = call_zome_method::( &event_or_commitment, &REPLICATE_DELETE_API_METHOD, ByAction { address: revision_id.to_owned() }, diff --git a/zomes/rea_satisfaction/storage/src/lib.rs b/zomes/rea_satisfaction/storage/src/lib.rs index 17ac7ec1c..48aabb1a2 100644 --- a/zomes/rea_satisfaction/storage/src/lib.rs +++ b/zomes/rea_satisfaction/storage/src/lib.rs @@ -71,25 +71,25 @@ generate_record_entry!(EntryData, SatisfactionAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { Satisfaction(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::Satisfaction(e) + EntryDefinitions::Satisfaction(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } } diff --git a/zomes/rea_unit/integrity_zome/src/lib.rs b/zomes/rea_unit/integrity_zome/src/lib.rs index 94a2193cd..d9a6fbe77 100644 --- a/zomes/rea_unit/integrity_zome/src/lib.rs +++ b/zomes/rea_unit/integrity_zome/src/lib.rs @@ -8,11 +8,11 @@ * @package hREA */ use hdi::prelude::*; -pub use hc_zome_rea_unit_storage::{EntryTypes, EntryTypesUnit, LinkTypes}; +pub use hc_zome_rea_unit_storage::{EntryDefinitions, EntryTypesUnit, LinkTypes}; #[hdk_extern] pub fn entry_types(_: ()) -> ExternResult { - let defs: Vec = EntryTypes::ENTRY_DEFS + let defs: Vec = EntryDefinitions::ENTRY_DEFS .iter() .map(|a| EntryDef::from(a.clone())) .collect(); diff --git a/zomes/rea_unit/lib/src/lib.rs b/zomes/rea_unit/lib/src/lib.rs index 30925025a..ad180384b 100644 --- a/zomes/rea_unit/lib/src/lib.rs +++ b/zomes/rea_unit/lib/src/lib.rs @@ -41,7 +41,7 @@ pub fn handle_create_unit(entry_type_id: S, unit: CreateRequest) -> RecordAPI where S: AsRef + std::fmt::Display, { let (meta, entry_id, entry_resp): (_,UnitId,_) = - create_anchored_record::<_, _, _, _, _, _, EntryTypes, _, _, _, _>( + create_anchored_record::<_, _, _, _, _, _, EntryDefinitions, _, _, _, _>( LinkTypes::UnitIdentifier, read_index_zome, &entry_type_id, diff --git a/zomes/rea_unit/storage/src/lib.rs b/zomes/rea_unit/storage/src/lib.rs index 5ac20509c..fc696c68a 100644 --- a/zomes/rea_unit/storage/src/lib.rs +++ b/zomes/rea_unit/storage/src/lib.rs @@ -55,26 +55,26 @@ generate_record_entry!(EntryData, UnitInternalAddress, EntryStorage); #[hdk_entry_types(skip_hdk_extern = true)] #[unit_enum(EntryTypesUnit)] -pub enum EntryTypes { +pub enum EntryDefinitions { UnitEntry(EntryStorage), #[entry_type(visibility = "private")] AvailableCapability(AvailableCapability) } -impl From for EntryTypes +impl From for EntryDefinitions { - fn from(e: EntryStorage) -> EntryTypes + fn from(e: EntryStorage) -> EntryDefinitions { - EntryTypes::UnitEntry(e) + EntryDefinitions::UnitEntry(e) } } -impl TryFrom for EntryTypes { +impl TryFrom for EntryDefinitions { type Error = WasmError; - fn try_from(e: AvailableCapability) -> Result + fn try_from(e: AvailableCapability) -> Result { - Ok(EntryTypes::AvailableCapability(e)) + Ok(EntryDefinitions::AvailableCapability(e)) } }