From bd3e452a42f5d0a410fb12defb4f37d2f01d9c92 Mon Sep 17 00:00:00 2001 From: Ted Blackman Date: Tue, 20 Jul 2021 21:55:39 +0300 Subject: [PATCH] landscape,interface: use new %kiln base-hash scry --- pkg/interface/src/logic/api/local.ts | 2 +- pkg/landscape/app/file-server.hoon | 9 +-------- pkg/landscape/lib/version.hoon | 18 ------------------ 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 pkg/landscape/lib/version.hoon diff --git a/pkg/interface/src/logic/api/local.ts b/pkg/interface/src/logic/api/local.ts index 240e2abd6..3c118c630 100644 --- a/pkg/interface/src/logic/api/local.ts +++ b/pkg/interface/src/logic/api/local.ts @@ -3,7 +3,7 @@ import BaseApi from './base'; export default class LocalApi extends BaseApi { getBaseHash() { - this.scry('file-server', '/clay/base/hash').then((baseHash) => { + this.scry('hood', '/kiln/base-hash').then((baseHash) => { this.store.handleEvent({ data: { baseHash } }); }); } diff --git a/pkg/landscape/app/file-server.hoon b/pkg/landscape/app/file-server.hoon index f2b910f44..de0822705 100644 --- a/pkg/landscape/app/file-server.hoon +++ b/pkg/landscape/app/file-server.hoon @@ -331,14 +331,7 @@ == :: ++ on-leave on-leave:def -++ on-peek - |= =path - ^- (unit (unit cage)) - ?+ path (on-peek:def path) - [%x %clay %base %hash ~] - =/ versions (base-hash:version [our now]:bowl) - ``hash+!>(?~(versions 0v0 (end [0 25] i.versions))) - == +++ on-peek on-peek:def ++ on-agent on-agent:def ++ on-fail on-fail:def -- diff --git a/pkg/landscape/lib/version.hoon b/pkg/landscape/lib/version.hoon deleted file mode 100644 index edf1872e9..000000000 --- a/pkg/landscape/lib/version.hoon +++ /dev/null @@ -1,18 +0,0 @@ -|% -++ base-hash - |= [our=@p now=@da] - ^- (list @uv) - =+ .^ ota=(unit [=ship =desk =aeon:clay]) - %gx /(scot %p our)/hood/(scot %da now)/kiln/ota/noun - == - ?~ ota - ~ - =/ parent (scot %p ship.u.ota) - =/ takos - .^ (list tako:clay) %cs - /(scot %p our)/home/(scot %da now)/base/[parent]/[desk.u.ota] - == - %+ turn takos - |= =tako:clay - .^(@uv %cs /(scot %p our)/home/(scot %da now)/hash/(scot %uv tako)) ---