From 74b5a9c6f4ecb825c94327d803129419e439b898 Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 14 Dec 2017 16:57:18 +0100 Subject: [PATCH 1/3] Revising a previously heard message no longer just deletes it. --- app/talk.hoon | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/talk.hoon b/app/talk.hoon index a408b2cd75..d8349bd180 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -460,7 +460,10 @@ |= {num/@ud gam/telegram} =+ old=(snag num grams) ?: =(gam old) +>.$ :: no change - =. grams (oust [num 1] grams) + =. grams + %+ welp + (scag num grams) + [gam (slag +(num) grams)] ?: =(sep.gam sep.old) +>.$ :: no worthy change =< sh-done (~(sh-gram sh cli) gam) From bd46499dab8c40802942c1843670769661027fce Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 14 Dec 2017 16:58:21 +0100 Subject: [PATCH 2/3] Force full rebuild of talk's message state. --- app/talk.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/talk.hoon b/app/talk.hoon index d8349bd180..3e7902a404 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -120,7 +120,7 @@ ^- (quip move _..prep) ?~ old ta-done:ta-init:ta - :_ ..prep(+<+ u.old) + :_ ..prep(+<+ u.old(grams ~, known ~, count 0)) :~ [ost.bol %pull /server/client server ~] [ost.bol %pull /server/inbox server ~] peer-client From 55715fcd5ded27bc523399eb2eed48470e7a83ac Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 14 Dec 2017 16:58:51 +0100 Subject: [PATCH 3/3] Changed debug poke 'check' to always give some information. --- app/talk.hoon | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/talk.hoon b/app/talk.hoon index 3e7902a404..540ebd580b 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -2255,13 +2255,12 @@ ?: =(a 'check') ~& 'verifying message reference integrity...' =- ~&(- [~ +>.$]) + ~& [%count--lent count (lent grams)] =+ %- ~(rep by known) |= {{u/serial a/@ud} k/@ud m/@ud} :- ?:((gth a k) a k) ?: =(u uid:(snag (sub count +(a)) grams)) m +(m) - :^ %check-talk - count=count - lent=(lent grams) + :- %check-talk [known=k mismatch=m] ?: =(a 'rebuild') ~& 'rebuilding message references...'