ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 20:31:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

ames: remove unused %krocs and %corks logic

Browse Source 
%krocs is still in peer-state, in lull.hoon and can be removed
next time ames-state is updated, same as for %corks (only in ames-state)
This commit is contained in:
yosoyubik 2023-03-12 13:47:40 +01:00
parent 86bad20baf
commit 943690f8ee
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/arvo/sys/vane/ames.hoon
View File

@ -616,12 +616,12 @@
:: ::
:: ::
+$ ames-state +$ ames-state
$: peers=(map ship ship-state) $: peers=(map ship ship-state) :: TODO: remove krocs from peer-state
=unix=duct =unix=duct
=life =life
crypto-core=acru:ames crypto-core=acru:ames
=bug =bug
corks=(set wire) corks=(set wire) :: TODO: remove next state update
snub=(set ship) snub=(set ship)
cong=[msg=@ud mem=@ud] cong=[msg=@ud mem=@ud]
== ==
@ -2595,9 +2595,9 @@
rcv (~(del by rcv) bone) rcv (~(del by rcv) bone)
corked (~(put in corked) bone) corked (~(put in corked) bone)
closing (~(del in closing) bone) closing (~(del in closing) bone)
krocs (~(del in krocs) bone)
== ==
peer-core peer-core
::
+| %internals +| %internals
:: +mu: constructor for |pump message sender core :: +mu: constructor for |pump message sender core
:: ::
@ -2895,7 +2895,6 @@
rcv (~(del by rcv) bone) rcv (~(del by rcv) bone)
corked (~(put in corked) bone) corked (~(put in corked) bone)
closing (~(del in closing) bone) closing (~(del in closing) bone)
krocs (~(del in krocs) bone)
by-duct.ossuary (~(del by by-duct.ossuary) (got-duct bone)) by-duct.ossuary (~(del by by-duct.ossuary) (got-duct bone))
by-bone.ossuary (~(del by by-bone.ossuary) bone) by-bone.ossuary (~(del by by-bone.ossuary) bone)
== ==
@ -3394,7 +3393,7 @@
:: ::
?: corked ?: corked
=? peer-core &(?=(%hear -.task) =(1 (end 0 bone))) =? peer-core &(?=(%hear -.task) =(1 (end 0 bone)))
%- (mi-trace odd.veb |.("plea on a closing bone={<bone>}")) %- (mi-trace odd.veb |.("hear plea on a corked bone={<bone>}"))
%+ send-shut-packet bone %+ send-shut-packet bone
[message-num.shut-packet.task %| %| ok=& lag=*@dr] [message-num.shut-packet.task %| %| ok=& lag=*@dr]
sink sink
@ -3653,20 +3652,15 @@
:: ::
++ sink-nack ++ sink-nack
^+ sink ^+ sink
:: if we get a naxplanation for a %cork, the publisher hasn't
:: received the OTA. The /recork timer will retry eventually.
::
%- %+ mi-trace msg.veb %- %+ mi-trace msg.veb
=/ dat [her bone=bone message-num=message-num] =/ dat [her bone=bone message-num=message-num]
|.("sink naxplanation {<dat>}") |.("sink naxplanation {<dat>}")
:: flip .bone's second bit to find referenced flow :: flip .bone's second bit to find referenced flow
:: ::
=/ target=^bone (mix 0b10 bone) =/ target=^bone (mix 0b10 bone)
:: XX not used, remove
=? peer-core (~(has in krocs.peer-state) target)
:: if we get a naxplanation for a %cork, the publisher hasn't
:: received the OTA. The /recork timer will retry eventually.
::
%. peer-core
%+ pe-trace msg.veb
|.("old publisher, %cork nacked on bone={<target>}")
=. peer-core =. peer-core
:: notify |message-pump that this message got naxplained :: notify |message-pump that this message got naxplained
:: ::
@ -3892,7 +3886,6 @@
:: /ax/peers/[ship]/forward-lane (list lane) :: /ax/peers/[ship]/forward-lane (list lane)
:: /ax/bones/[ship] [snd=(set bone) rcv=(set bone)] :: /ax/bones/[ship] [snd=(set bone) rcv=(set bone)]
:: /ax/snd-bones/[ship]/[bone] vase :: /ax/snd-bones/[ship]/[bone] vase
:: /ax/corks (list wire)
:: ::
?. ?=(%x ren) ~ ?. ?=(%x ren) ~
?+ tyl ~ ?+ tyl ~
@ -3972,8 +3965,5 @@
=/ res =/ res
u.mps u.mps
``noun+!>(!>(res)) ``noun+!>(!>(res))
::
[%corks ~]
``noun+!>(~(tap in corks.ames-state))
== ==
-- --