ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 03:00:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next/kelvin/411' into next/hoon/138

Browse Source
This commit is contained in:
Pyry Kovanen 2023-10-06 21:16:38 +03:00 committed by GitHub
commit e09788f2b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/arvo/lib/hood/kiln.hoon
View File

@ -838,7 +838,7 @@
=. hop (~(del by hop) old) =. hop (~(del by hop) old)
abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old u.had])) abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old u.had]))
?~ (skim ~(tap by sources) |=(sync-record =(old [her sud]))) ?~ (skim ~(tap by sources) |=(sync-record =(old [her sud])))
~> %slog.(fmt "no syncs from {<p.old>}/{(trip q.old)}") ~> %slog.(fmt "no syncs from {(scow %p p.old)}/{(trip q.old)}")
abet abet
=. hop (~(put by hop) old new) =. hop (~(put by hop) old new)
abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%add old new])) abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%add old new]))
@ -846,16 +846,16 @@
++ poke-jump-opt ++ poke-jump-opt
|= [old=dock new=dock yea=?] |= [old=dock new=dock yea=?]
?~ got=(~(get by hop) old) ?~ got=(~(get by hop) old)
~> %slog.(fmt "no jump request for {<p.old>}/{(trip q.old)}") ~> %slog.(fmt "no jump request for {(scow %p p.old)}/{(trip q.old)}")
abet abet
?. =(new u.got) ?. =(new u.got)
=/ txt-old "{<p.old>}/{(trip q.old)}" =/ txt-old "{(scow %p p.old)}/{(trip q.old)}"
=/ txt-new "{<p.new>}/{(trip q.new)}" =/ txt-new "{(scow %p p.new)}/{(trip q.new)}"
~> %slog.(fmt "no jump request from {txt-old} to {txt-new}") ~> %slog.(fmt "no jump request from {txt-old} to {txt-new}")
abet abet
?. yea ?. yea
=/ txt-old "{<p.old>}/{(trip q.old)}" =/ txt-old "{(scow %p p.old)}/{(trip q.old)}"
=/ txt-new "{<p.new>}/{(trip q.new)}" =/ txt-new "{(scow %p p.new)}/{(trip q.new)}"
~> %slog.(fmt "denied jump from {txt-old} to {txt-new}") ~> %slog.(fmt "denied jump from {txt-old} to {txt-new}")
=. hop (~(del by hop) old) =. hop (~(del by hop) old)
abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old new])) abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old new]))

6
pkg/arvo/sys/hoon.hoon
View File

@ -9253,21 +9253,21 @@
:: ::
++ mint ++ mint
|= gol=type |= gol=type
=- ?>(?|(!vet (nest(sut gol) & p.-)) -)
^- (pair type nock) ^- (pair type nock)
=+ lug=(find %read hyp) =+ lug=(find %read hyp)
?: ?=(%| -.lug) ~>(%mean.'hoon' ?>(?=(~ rig) p.lug)) ?: ?=(%| -.lug) ~>(%mean.'hoon' ?>(?=(~ rig) p.lug))
=- ?>(?|(!vet (nest(sut gol) & p.-)) -)
(ergo p.lug rig) (ergo p.lug rig)
:: ::
++ mull ++ mull
|= [gol=type dox=type] |= [gol=type dox=type]
^- [type type] =- ?>(?|(!vet (nest(sut gol) & p.-)) -)
^- (pair type type)
=+ lug=[p=(find %read hyp) q=(find(sut dox) %read hyp)] =+ lug=[p=(find %read hyp) q=(find(sut dox) %read hyp)]
?: ?=(%| -.p.lug) ?: ?=(%| -.p.lug)
?> &(?=(%| -.q.lug) ?=(~ rig)) ?> &(?=(%| -.q.lug) ?=(~ rig))
[p.p.p.lug p.p.q.lug] [p.p.p.lug p.p.q.lug]
?> ?=(%& -.q.lug) ?> ?=(%& -.q.lug)
=- ?>(?|(!vet (nest(sut gol) & p.-)) -)
(endo [p.p.lug p.q.lug] dox rig) (endo [p.p.lug p.q.lug] dox rig)
-- --
:: ::