Skip to content

Commit ba8db0c

Browse files
towerdocs: minor fixes
1 parent c12901f commit ba8db0c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/choreo/tower/fd_tower.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
and 7 respectively. This action of voting triggered the popping of
126126
the expired votes from the top of the tower.
127127
128-
Next, we add a vote for slot 11:
128+
Next, we add a vote for slot 10:
129129
130130
(before) slot | conf
131131
-----------
@@ -135,12 +135,12 @@
135135
136136
(after) slot | conf
137137
-----------
138-
11 | 1
138+
10 | 1
139139
9 | 2
140140
2 | 3
141141
1 | 4
142142
143-
The next vote for slot 11 doesn’t involve expirations, so we just add
143+
The next vote for slot 10 doesn’t involve expirations, so we just add
144144
it to the top of the tower. Also, here is an important property of
145145
lockouts. Note that the lockout for vote slot 9 doubled (ie. the
146146
confirmation count increased by 1) but the lockouts of vote slots 2
@@ -149,7 +149,7 @@
149149
The reason for this is confirmation counts only increase when they
150150
are consecutive in the vote tower. Because 4 and 3 were expired
151151
previously by the vote for 9, that consecutive property was broken.
152-
In this case, the vote for slot 11 is only consecutive with slot 9,
152+
In this case, the vote for slot 10 is only consecutive with slot 9,
153153
but not 2 and 1. Specifically, there is a gap in the before-tower at
154154
confirmation count 2.
155155
@@ -158,27 +158,27 @@
158158
result in all lockouts doubling as long as it doesn’t result in more
159159
expirations.
160160
161-
One other thing I’d like to point out about this vote for slot 11.
162-
Even though 11 exceeds the expiration slot of vote slot 2, which is
161+
One other thing I’d like to point out about this vote for slot 10.
162+
Even though 10 >= the expiration slot of vote slot 2, which is
163163
10, voting for 11 did not expire the vote for 2. This is because
164164
expiration happens top-down and contiguously. Because vote slot 9 was
165165
not expired, we do not proceed with expiring 2.
166166
167-
In the Tower rules, once a vote reaches a max lockout of 32, it is
167+
In the Tower rules, once a vote reaches a conf count of 32, it is
168168
considered rooted and it is popped from the bottom of the tower. Here
169-
is an example:
169+
is an example where 1 got rooted and therefore popped from the bottom:
170170
171171
(before) slot | conf
172172
-----------
173173
50 | 1
174174
... | ... (29 votes elided)
175-
1 | 4
175+
1 | 31
176176
177177
(after) slot | conf
178178
-----------
179179
53 | 1
180180
... | ... (29 votes elided)
181-
1 | 4
181+
2 | 31
182182
183183
So the tower is really a double-ended queue rather than a stack.
184184
@@ -242,7 +242,7 @@
242242
2 | 3
243243
1 | 4
244244
245-
Here the new Slot 9 descends from 5, and exceeds vote slot 2’s
245+
Here the new Slot 9 descends from 5, and exceeds vote slot 4’s
246246
expiration slot of 6 unlike 5.
247247
248248
After your lockout expires, the tower rules allow you to vote for

0 commit comments

Comments
 (0)