From 90c0ccdad0eb0e49dc1cc15f4a8180b6e72b1502 Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 15 Jun 2017 18:53:47 -0700 Subject: [PATCH] Renamed sre and sourcee back to src and source. --- app/talk-agent.hoon | 6 +++--- app/talk-guardian.hoon | 32 ++++++++++++++++---------------- lib/talk.hoon | 10 +++++----- sur/talk.hoon | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/talk-agent.hoon b/app/talk-agent.hoon index d49be83bb..27b45c57c 100644 --- a/app/talk-agent.hoon +++ b/app/talk-agent.hoon @@ -274,7 +274,7 @@ $circle %. gaz.piz %= ta-lesson - sources sre.loc.cos.piz + sources src.loc.cos.piz mirrors (~(put by rem.cos.piz) incir loc.cos.piz) remotes (~(put by rem.pes.piz) inpan loc.pes.piz) == @@ -315,7 +315,7 @@ $config %= +> sources - ?. ?& ?=($sourcee -.dif.dif) + ?. ?& ?=($source -.dif.dif) =(cir.dif incir) == sources @@ -1506,7 +1506,7 @@ =. +>.$ %+ sh-show-sources (weld (trip inbox) ": ") - (sh-set-diff sre.laz sre.loc) + (sh-set-diff src.laz src.loc) ?: !=(sec.con.loc sec.con.laz) =. +>.$ (sh-note :(weld pre "but " (sh-cure sec.con.loc))) %^ sh-show-permits diff --git a/app/talk-guardian.hoon b/app/talk-guardian.hoon index 59f0fec79..9aa94db59 100644 --- a/app/talk-guardian.hoon +++ b/app/talk-guardian.hoon @@ -693,12 +693,12 @@ %+ weld ^- (list diff-story) ?~ old ~ - ::TODO? what to do about sre? - :~ ::[%follow | sre.u.old] + ::TODO? what to do about src? + :~ ::[%follow | src.u.old] [%config so-cir %permit | ses.con.u.old] == ^- (list diff-story) - :~ ::[%follow & sre.cof] ::TODO double-check da-$follow checks existing sre + :~ ::[%follow & src.cof] ::TODO double-check da-$follow checks existing src [%config so-cir %caption cap.cof] [%config so-cir %filter fit.cof] [%config so-cir %secure sec.con.cof] @@ -743,7 +743,7 @@ ::TODO? these checks are still important, because :: when things are slow we may get diffs from :: things we already unsubscribed from, right? - ~? ?! ?| (~(has in sre.shape) [%& src]) + ~? ?! ?| (~(has in src.shape) [%& src]) =(src so-cir) == [%unexpected-rumor-source nom -.dif src] @@ -832,7 +832,7 @@ |= {add/? pas/(set partner)} ^+ +> =/ sus/(set partner) - %. sre.shape + %. src.shape ?:(add ~(dif in pas) ~(int in pas)) ?~ sus +>.$ (so-delta-our %follow & sus) @@ -886,16 +886,16 @@ :: |= pan/partner ^+ +> - ?: (~(has in sre.shape) pan) +> - (so-delta-our %config so-cir %sourcee & [pan ~ ~]) + ?: (~(has in src.shape) pan) +> + (so-delta-our %config so-cir %source & [pan ~ ~]) :: ++ so-leave ::< subscription ended ::> delete {pan} from our sources. :: |= pan/partner ^+ +> - ?. (~(has in sre.shape) pan) +> - (so-delta-our %config so-cir %sourcee | [pan ~ ~]) + ?. (~(has in src.shape) pan) +> + (so-delta-our %config so-cir %source | [pan ~ ~]) :: ++ so-start ::< subscribe follower ::> called upon subscribe. deduces the range of @@ -1344,7 +1344,7 @@ ++ sa-delete ::< deletion of story ::> :: - (sa-abjure (~(tap in sre.shape))) + (sa-abjure (~(tap in src.shape))) :: ++ sa-change ::< apply circle delta ::> @@ -1400,16 +1400,16 @@ :: $follow :: we have to do the effects first, because it - :: checks for new sub targets using sre.shape. + :: checks for new sub targets using src.shape. ~& [%sa-change-follow nom sub.dif pas.dif] =. +> (sa-emil (sa-follow-effects sub.dif pas.dif)) %_ +> ::TODO delete, only done once success - sre.shape ::TODO =? + src.shape ::TODO =? %. pas.dif ?: sub.dif - ~(uni in sre.shape) - ~(dif in sre.shape) + ~(uni in src.shape) + ~(dif in src.shape) == == :: @@ -1478,7 +1478,7 @@ |= {sub/? pas/(set partner)} ^- (list move) =/ sus/(set partner) - %. sre.shape + %. src.shape ?:(sub ~(dif in pas) ~(int in pas)) %. (~(tap in sus)) ?:(sub sa-acquire sa-abjure) @@ -1669,7 +1669,7 @@ :- %friend %- ~(gas in *(set circle)) %+ murn - =- (~(tap in sre.shape.-)) + =- (~(tap in src.shape.-)) (~(got by stories) (main our.bol)) |= p/partner ^- (unit circle) diff --git a/lib/talk.hoon b/lib/talk.hoon index b6b948df5..a17343072 100644 --- a/lib/talk.hoon +++ b/lib/talk.hoon @@ -99,14 +99,14 @@ $filter cof(fit fit.dif) $remove cof :: - $sourcee + $source %= cof - sre + src %. `(set partner)`pas.dif ::TODO? why do we *need* to cast? - ~& [%doing-sourcee add.dif pas.dif] + ~& [%doing-source add.dif pas.dif] ?: add.dif - ~(uni in sre.cof) - ~(dif in sre.cof) + ~(uni in src.cof) + ~(dif in src.cof) == :: $permit diff --git a/sur/talk.hoon b/sur/talk.hoon index 01a2a9ec4..ed8e1b16a 100644 --- a/sur/talk.hoon +++ b/sur/talk.hoon @@ -76,7 +76,7 @@ ++ diff-config ::> config change $% {$full cof/config} ::< set w/o side-effects ::TODO maybe just single partner, since we prob always do that - {$sourcee add/? pas/(set partner)} ::< add/rem sources + {$source add/? pas/(set partner)} ::< add/rem sources {$caption cap/cord} ::< changed description {$filter fit/filter} ::< changed filter {$secure sec/security} ::< changed security @@ -150,7 +150,7 @@ :: circle configurations. :: ++ lobby {loc/config rem/(map circle config)} ::< our & srcs configs ++ config ::> circle config - $: sre/(set partner) ::< active sources + $: src/(set partner) ::< active sources cap/cord ::< description fit/filter ::< message rules con/control ::< restrictions