From 0e59788dff4fcb309b812179b47ff93a7be85b9d Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Thu, 25 Oct 2018 17:41:05 -0400 Subject: [PATCH] fixes bugs in individual continuity breaches --- sys/vane/ames.hoon | 19 ++++++++++++++++--- sys/vane/jael.hoon | 21 +++++++++++++-------- sys/zuse.hoon | 16 ++++++++-------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index 7db290cb4..388c9120e 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -1477,15 +1477,28 @@ =/ key ~(key by urb.ton.fox) ?>(?=([@ ~ ~] key) n.key) =* who p.kyz + =* lyf q.kyz + =/ saf=sufi (~(got by urb.ton.fox) our) =/ con=corn (~(got by zac.fox) our) + :: + ?: =(our who) + ?: (lth lyf p:(head val.saf)) + :: replaying our old sinkage, ignore + :: XX review + :: + [~ fox] + :: XX include some helpful instructions here + :: + :_ fox + [%wine [our who] ", you have sunk"]~ + :: + =. saf saf(hoc (~(del by hoc.saf) who)) =. con con(wab (~(del by wab.con) who)) - =/ suf=sufi (~(got by urb.ton.fox) our) - =. suf suf(hoc (~(del by hoc.suf) who)) :: :- [%wine [our who] " has sunk"]~ %= fox + urb.ton (~(put by urb.ton.fox) our saf) zac (~(put by zac.fox) our con) - urb.ton (~(put by urb.ton.fox) our suf) == :: %wake diff --git a/sys/vane/jael.hoon b/sys/vane/jael.hoon index a1f1d9ca1..878ec69a4 100644 --- a/sys/vane/jael.hoon +++ b/sys/vane/jael.hoon @@ -1341,14 +1341,19 @@ :- (file-discontinuity who) %= ..file hul.eth (~(put by hul.eth) who hel) - :: - moz :* [hen %slip %a %sunk who] - [hen %slip %c %sunk who] - [hen %slip %d %sunk who] - [hen %slip %e %sunk who] - [hen %slip %f %sunk who] - [hen %slip %g %sunk who] - moz + :: these must be appended here; +abet flops them + :: + moz =/ lyf=life + ~| sunk-unknown+who + life:(~(got by kyz.puk)) + %+ weld moz + ^- (list move) + :~ [hen %slip %a %sunk who lyf] + [hen %slip %c %sunk who lyf] + [hen %slip %d %sunk who lyf] + [hen %slip %e %sunk who lyf] + [hen %slip %f %sunk who lyf] + [hen %slip %g %sunk who lyf] == == :: hel: updated hull diff --git a/sys/zuse.hoon b/sys/zuse.hoon index b79d29d98..adf94b4eb 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -517,7 +517,7 @@ {$junk p/@} :: entropy {$kick p/@da} :: wake up {$nuke p/@p} :: toggle auto-block - {$sunk p=ship} :: report death + {$sunk p=ship q=life} :: report death {$tend ~} :: watch lane changes {$wake ~} :: timer activate {$wegh ~} :: report memory @@ -748,7 +748,7 @@ {$dirk des/desk} :: mark mount dirty {$ogre pot/$@(desk beam)} :: delete mount point {$perm our/ship des/desk pax/path rit/rite} :: change permissions - {$sunk p=ship} :: report death + {$sunk p=ship q=life} :: report death {$warp wer/sock rif/riff} :: internal file req {$werp who/ship wer/sock rif/riff} :: external file req {$wegh ~} :: report memory @@ -914,7 +914,7 @@ {$harm ~} :: all terms hung up {$init p/ship} :: after gall ready {$noop ~} :: no operation - {$sunk p=ship} :: report death + {$sunk p=ship q=life} :: report death {$talk p/tank} :: {$text p/tape} :: {$veer p/@ta q/path r/@t} :: install vane @@ -1014,7 +1014,7 @@ [%live p=@ud q=(unit @ud)] :: http/s ports [%rule p=http-rule] :: update config [%serv p=$@(desk beam)] :: set serving root - [%sunk p=ship] :: report death + [%sunk p=ship q=life] :: report death [%them p=(unit hiss)] :: outbound request [%they p=@ud q=httr] :: inbound response [%chis p=? q=clip r=httq] :: IPC inbound request @@ -1210,9 +1210,9 @@ :: our=@p == - :: %sunk: recieve a report that a foreign ship has lost continuity + :: %sunk: receive a report that a foreign ship has lost continuity :: - [%sunk =ship] + [%sunk =ship =life] :: %wegh: produce memory usage information :: [%wegh ~] @@ -1903,7 +1903,7 @@ $% {$conf p/dock q/culm} :: configure app {$init p/ship} :: set owner {$deal p/sock q/cush} :: full transmission - {$sunk p=ship} :: report death + {$sunk p=ship q/life} :: report death {$went p/sack q/path r/@ud s/coop} :: response confirm {$west p/sack q/path r/*} :: network request {$wegh ~} :: report memory @@ -2044,7 +2044,7 @@ == == :: $: @tas :: $% [%init p=ship] :: report install - [%sunk p=ship] :: report death + [%sunk p=ship q=life] :: report death == == == :: ++ public :: public key state $: live=? :: seen in current era