chiark / gitweb /
otter.git
3 years agoapitest: updates: explicitly ignore Log
Ian Jackson [Sun, 1 May 2022 17:49:55 +0000 (18:49 +0100)]
apitest: updates: explicitly ignore Log

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: explicitly ignore various other updates
Ian Jackson [Sun, 1 May 2022 17:49:20 +0000 (18:49 +0100)]
apitest: updates: explicitly ignore various other updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: explicitly ignore SetTable*
Ian Jackson [Sun, 1 May 2022 17:48:08 +0000 (18:48 +0100)]
apitest: updates: explicitly ignore SetTable*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: handle RecordedUnpredictable
Ian Jackson [Sun, 1 May 2022 17:47:23 +0000 (18:47 +0100)]
apitest: updates: handle RecordedUnpredictable

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: explicitly ignore MoveHist*
Ian Jackson [Sun, 1 May 2022 17:46:08 +0000 (18:46 +0100)]
apitest: updates: explicitly ignore MoveHist*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: handle Image
Ian Jackson [Sun, 1 May 2022 17:45:25 +0000 (18:45 +0100)]
apitest: updates: handle Image

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Introduce and use JsV extension extend
Ian Jackson [Sun, 1 May 2022 17:43:45 +0000 (18:43 +0100)]
apitest: Introduce and use JsV extension extend

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: Always call findp
Ian Jackson [Sun, 1 May 2022 17:33:16 +0000 (18:33 +0100)]
apitest: updates: Always call findp

This makes the code smaller.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: Refactor findp again
Ian Jackson [Sun, 1 May 2022 17:32:24 +0000 (18:32 +0100)]
apitest: updates: Refactor findp again

I keep shilly-shallying.  I think I want this to be called all the time.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Add a comment about what PieceInfo<JsV> means
Ian Jackson [Sun, 1 May 2022 17:23:41 +0000 (18:23 +0100)]
apitest: Add a comment about what PieceInfo<JsV> means

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updatess: Implement Recorded
Ian Jackson [Sun, 1 May 2022 17:22:13 +0000 (18:22 +0100)]
apitest: updatess: Implement Recorded

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updatess: Expect to find the pieces we are updating
Ian Jackson [Sun, 1 May 2022 17:21:55 +0000 (18:21 +0100)]
apitest: updatess: Expect to find the pieces we are updating

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Break out findp
Ian Jackson [Sun, 1 May 2022 17:21:04 +0000 (18:21 +0100)]
apitest: Break out findp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Introduce and use JsV extension set
Ian Jackson [Sun, 1 May 2022 17:20:02 +0000 (18:20 +0100)]
apitest: Introduce and use JsV extension set

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: fold lines longer
Ian Jackson [Sun, 1 May 2022 16:03:24 +0000 (17:03 +0100)]
apitest: fold lines longer

Mostly they don't fold now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Refactor to make room for handling more piece ops
Ian Jackson [Sun, 1 May 2022 16:03:11 +0000 (17:03 +0100)]
apitest: Refactor to make room for handling more piece ops

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Add a bit of logging
Ian Jackson [Sun, 1 May 2022 16:02:58 +0000 (17:02 +0100)]
apitest: Add a bit of logging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: wip
Ian Jackson [Sun, 1 May 2022 14:39:48 +0000 (15:39 +0100)]
at-currency: wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Fix the log message
Ian Jackson [Sun, 1 May 2022 13:46:28 +0000 (14:46 +0100)]
currency: Fix the log message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit_delete: Implement, and use in currency
Ian Jackson [Sun, 1 May 2022 13:43:04 +0000 (14:43 +0100)]
fastsplit_delete: Implement, and use in currency

Amazingly, this seems to work at least in my basic ad-hoc test.
The log message needs a little work.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoheld_change_hook: Pass some more arguments
Ian Jackson [Sun, 1 May 2022 13:39:09 +0000 (14:39 +0100)]
held_change_hook: Pass some more arguments

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoToReculculate: Slightly improve docs and formatting of with
Ian Jackson [Sun, 1 May 2022 12:02:31 +0000 (13:02 +0100)]
ToReculculate: Slightly improve docs and formatting of with

This was a bit confusing at first.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoToRecalculate: Refactor implement methods
Ian Jackson [Sun, 1 May 2022 11:59:01 +0000 (12:59 +0100)]
ToRecalculate: Refactor implement methods

These are more convenient now, and the authorisation trickery is
now where we can more clearly justify it.

Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodelete_piece: Plumb PieceUpdateOp, and document re log
Ian Jackson [Sun, 1 May 2022 11:39:26 +0000 (12:39 +0100)]
delete_piece: Plumb PieceUpdateOp, and document re log

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodelete_piece: Break out into global.rs
Ian Jackson [Sun, 1 May 2022 11:19:35 +0000 (12:19 +0100)]
delete_piece: Break out into global.rs

fastsplit deletion is going to want this.  This may not be in its
final form, particularly because of ToRecalculate, which fastsplit
doesn't have one of yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agorename GOccults from GameOccults
Ian Jackson [Sun, 1 May 2022 11:14:12 +0000 (12:14 +0100)]
rename GOccults from GameOccults

Tried to refer to it as GOccults (without looking it up) and obviously
that's what it ought to be.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoRemove a pointless function
Ian Jackson [Sun, 1 May 2022 10:36:44 +0000 (11:36 +0100)]
Remove a pointless function

This seems to just recurse to itself.  Deleting it leaves everything
still compiling.  How odd.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoChange many .drain(..) into into_iter()
Ian Jackson [Sun, 1 May 2022 10:35:33 +0000 (11:35 +0100)]
Change many .drain(..) into into_iter()

In Rust 2021 this is more convenient to write.  We retain one.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMiscellaneous cleanups prompted by clippy
Ian Jackson [Sun, 1 May 2022 10:34:58 +0000 (11:34 +0100)]
Miscellaneous cleanups prompted by clippy

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOpOutcomeThunk: replace the other open-coded resolution site
Ian Jackson [Sun, 1 May 2022 10:15:44 +0000 (11:15 +0100)]
OpOutcomeThunk: replace the other open-coded resolution site

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOpOutcomeThunk: change resolve to be method on thunk
Ian Jackson [Sun, 1 May 2022 10:13:36 +0000 (11:13 +0100)]
OpOutcomeThunk: change resolve to be method on thunk

The other call site (which will come in a moment) doesn't have a
Result.  And this was a bit too cooked anyway.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce OpOutcomeThunkGeneric resolve on Result
Ian Jackson [Sun, 1 May 2022 10:08:59 +0000 (11:08 +0100)]
Introduce OpOutcomeThunkGeneric resolve on Result

On the way to getting rid of the other ad-hoc resolution site.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoGenericise OpOutcomeThunk
Ian Jackson [Sun, 1 May 2022 10:03:10 +0000 (11:03 +0100)]
Genericise OpOutcomeThunk

So that we can centralise resolution.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOpOutcomeThunk: Fix typo in comment
Ian Jackson [Sun, 1 May 2022 09:53:26 +0000 (10:53 +0100)]
OpOutcomeThunk: Fix typo in comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoReplace an open-coded into_unprepared call
Ian Jackson [Sun, 1 May 2022 01:38:13 +0000 (02:38 +0100)]
Replace an open-coded into_unprepared call

Found this will looking at this code.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOptimise into_unprepared slightly
Ian Jackson [Sun, 1 May 2022 01:37:33 +0000 (02:37 +0100)]
Optimise into_unprepared slightly

Prompted by seeing this optimisation at what ought to be a call site
of this method.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce OpHookThunk
Ian Jackson [Sun, 1 May 2022 00:31:56 +0000 (01:31 +0100)]
Introduce OpHookThunk

Currency merge needs this so that it can reborrow ipieces to delete
one of the merged notes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOpOutcomeThunk: Rationalise doc comment
Ian Jackson [Sun, 1 May 2022 00:12:34 +0000 (01:12 +0100)]
OpOutcomeThunk: Rationalise doc comment

Most of this comment is from earlier thoughts about how to solve the
problme that fastsplit now solves, and much of it wasn't really right.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoFix a tiny whitespace error
Ian Jackson [Sun, 1 May 2022 00:10:08 +0000 (01:10 +0100)]
Fix a tiny whitespace error

Noticed in passing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoscript: Allow multiselect of large numbers
Ian Jackson [Sat, 30 Apr 2022 23:32:55 +0000 (00:32 +0100)]
script: Allow multiselect of large numbers

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoscript: In error handler, use piece_checkconflict_nrda
Ian Jackson [Sat, 30 Apr 2022 23:09:12 +0000 (00:09 +0100)]
script: In error handler, use piece_checkconflict_nrda

This arranges that we stop drag if our grab failed for reasons other
than a conflict which is obvious to us.  Eg, insufficient currency.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoscript: piece_checkconflict_nrda: abolish unused return value
Ian Jackson [Sat, 30 Apr 2022 23:03:25 +0000 (00:03 +0100)]
script: piece_checkconflict_nrda: abolish unused return value

This was always false, and no longer used apparently.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce and use PieceTraitDowncastFailed error
Ian Jackson [Sat, 30 Apr 2022 17:47:21 +0000 (18:47 +0100)]
Introduce and use PieceTraitDowncastFailed error

We want this to be cheap to make - not InternalError which contains a
stack trace - so that we can use downcast_piece in contexts where it's
not an error.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce and use downcast_piece_fastsplit
Ian Jackson [Sat, 30 Apr 2022 17:07:10 +0000 (18:07 +0100)]
Introduce and use downcast_piece_fastsplit

Currency wants this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce and use PiceTrait downcaste_piece extension methoc
Ian Jackson [Sat, 30 Apr 2022 15:43:44 +0000 (16:43 +0100)]
Introduce and use PiceTrait downcaste_piece extension methoc

This is more convenient.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agogamestate: Add divider comment
Ian Jackson [Sat, 30 Apr 2022 15:32:35 +0000 (16:32 +0100)]
gamestate: Add divider comment

We're going to add more above here, and it's getting big.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit: Move Z check from multigrab into fastsplit impl
Ian Jackson [Sat, 30 Apr 2022 12:28:43 +0000 (13:28 +0100)]
fastsplit: Move Z check from multigrab into fastsplit impl

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit: Correct z order
Ian Jackson [Sat, 30 Apr 2022 12:24:21 +0000 (13:24 +0100)]
fastsplit: Correct z order

This was back to front.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoReorganise Z setting into two phases
Ian Jackson [Sat, 30 Apr 2022 12:21:34 +0000 (13:21 +0100)]
Reorganise Z setting into two phases

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMove op_do_set_z to gamestate
Ian Jackson [Sat, 30 Apr 2022 12:21:00 +0000 (13:21 +0100)]
Move op_do_set_z to gamestate

This is preparatory, to reduce diff noise.  We're going to change the
way this works in a moment.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit: Move a comment to its right place
Ian Jackson [Sat, 30 Apr 2022 11:05:12 +0000 (12:05 +0100)]
fastsplit: Move a comment to its right place

Some time in the development of this, pre-squash, kthe modperm was
acquired within the infallible closure.  But when it was moved,
evidently the comment didn't move with it.  Fix that.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit: Fix recovery
Ian Jackson [Sat, 30 Apr 2022 09:58:53 +0000 (10:58 +0100)]
fastsplit: Fix recovery

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Fix and improve multigrab (splitting) log message
Ian Jackson [Sat, 30 Apr 2022 01:24:13 +0000 (02:24 +0100)]
currency: Fix and improve multigrab (splitting) log message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agomultigrab/fastsplit: Plumb ShowUnocculted and &PieceTrait
Ian Jackson [Sat, 30 Apr 2022 01:21:05 +0000 (02:21 +0100)]
multigrab/fastsplit: Plumb ShowUnocculted and &PieceTrait

The implementation doesn't really want PieceRenderingInstructions,
just permission to get at trait objects.

The currency fastsplit implementation callback is going to want to
look at its Banknote so that it can make a nice log message.  I think
fastsplit piece impls are entitled access to their concret piece type.
So downcast it, and pass it down the layers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoPieceTrait: impl Downcast
Ian Jackson [Sat, 30 Apr 2022 01:21:13 +0000 (02:21 +0100)]
PieceTrait: impl Downcast

We're going to want this in a moment.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Many fixes to splitting
Ian Jackson [Sat, 30 Apr 2022 12:13:12 +0000 (13:13 +0100)]
currency: Many fixes to splitting

This was quite broken.

* Actually set the value of the new (change) piece.
* Set the value of tghe taken piece correctly.
* Set the WRC so that clients see the taken piece value.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Move some assignments about
Ian Jackson [Sat, 30 Apr 2022 12:13:07 +0000 (13:13 +0100)]
currency: Move some assignments about

Tidying up.  No functional change.
(Was originally part of the next, bugfix, commit.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Rename value
Ian Jackson [Sat, 30 Apr 2022 12:10:38 +0000 (13:10 +0100)]
currency: Rename value

Having the two pieces here is confusing.  All the variables should say
which piece they are.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: wip test
Ian Jackson [Mon, 18 Apr 2022 15:32:20 +0000 (16:32 +0100)]
currency: wip test

So far we test that splitting appears to succeed, but not what the
results look like.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Implement op_multigrab and therefore splitting
Ian Jackson [Mon, 18 Apr 2022 23:01:39 +0000 (00:01 +0100)]
currency: Implement op_multigrab and therefore splitting

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
ng

3 years agofastsplit: Implement splitting
Ian Jackson [Sat, 30 Apr 2022 10:14:23 +0000 (11:14 +0100)]
fastsplit: Implement splitting

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Make currency pieces be fastsplit
Ian Jackson [Mon, 25 Apr 2022 22:58:31 +0000 (23:58 +0100)]
currency: Make currency pieces be fastsplit

The actual machinery does all the hard work.

This shouldn't have any overall visible functional change.  It just
engages new contraptions during piece creation and load/save, but
right now they shouldn't have any work to do because we don't actually
ever split (or merge) currency.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit: Add some imprecations about not dropping FastSplitId
Ian Jackson [Sat, 30 Apr 2022 10:14:17 +0000 (11:14 +0100)]
fastsplit: Add some imprecations about not dropping FastSplitId

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit: Introduce fastsplit concept
Ian Jackson [Wed, 20 Apr 2022 08:40:03 +0000 (09:40 +0100)]
fastsplit: Introduce fastsplit concept

This has all the relevant data structures and support code, but does
not yet implemnet the actual splitting and deleting/merging
operations which will be needed for the piece api op impls.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoDrop an unneeded lifetime argument
Ian Jackson [Sat, 30 Apr 2022 11:46:08 +0000 (12:46 +0100)]
Drop an unneeded lifetime argument

This is not needed.  (I'm not sure whether I did this because
ambassador didn't like the lifetime argument, or just because I saw it
in passing.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoambassador: Introduce dependency and make some traits delegatiable
Ian Jackson [Sat, 23 Apr 2022 19:19:23 +0000 (20:19 +0100)]
ambassador: Introduce dependency and make some traits delegatiable

fastsplit pieces are going to want to delegate everything.  Not only
is this a lot of typing, open-coding it risks bugs when new trait
methods are added.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agomultigrab: Set the z coordinate
Ian Jackson [Sat, 30 Apr 2022 11:42:01 +0000 (12:42 +0100)]
multigrab: Set the z coordinate

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoBreak out op_do_set_z
Ian Jackson [Wed, 27 Apr 2022 22:13:20 +0000 (23:13 +0100)]
Break out op_do_set_z

We're going to make multigrab do z setting too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agomultigrab: Check that the piece is not held
Ian Jackson [Sat, 30 Apr 2022 10:43:45 +0000 (11:43 +0100)]
multigrab: Check that the piece is not held

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoHave OpOutcomeThunk::Deferrecd take &mut InstanceGuard
Ian Jackson [Fri, 29 Apr 2022 23:54:02 +0000 (00:54 +0100)]
Have OpOutcomeThunk::Deferrecd take &mut InstanceGuard

That way it can call modify_pieces_not_necessarily_saving_aux, which
the fastsplit_split implementaion wants.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapi: setz: Avoid an unwrap
Ian Jackson [Wed, 27 Apr 2022 22:13:33 +0000 (23:13 +0100)]
api: setz: Avoid an unwrap

Panicking is worse than failing.  Spotted this in passing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoModifyingPieces: Provide on-your-own-head constructors, and doc
Ian Jackson [Fri, 29 Apr 2022 21:17:10 +0000 (22:17 +0100)]
ModifyingPieces: Provide on-your-own-head constructors, and doc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoDocument z coordinate sense convention
Ian Jackson [Wed, 27 Apr 2022 20:37:17 +0000 (21:37 +0100)]
Document z coordinate sense convention

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoscript: multigrab: swap two if arms
Ian Jackson [Wed, 27 Apr 2022 21:52:01 +0000 (22:52 +0100)]
script: multigrab: swap two if arms

This seems clearer, by putting the usual case first.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoscript: piece_raise: allow overriding the actual implementation
Ian Jackson [Wed, 27 Apr 2022 21:46:17 +0000 (22:46 +0100)]
script: piece_raise: allow overriding the actual implementation

We're going to need to do something else for multigrab.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoChange type of UnpreparedPreparedUpdates
Ian Jackson [Fri, 29 Apr 2022 22:49:16 +0000 (23:49 +0100)]
Change type of UnpreparedPreparedUpdates

We're going to want to compose this in an additional place.  And all
this Option and None is awkward.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce and use PrepareUpdatesBuffer::only_unprepared_with
Ian Jackson [Fri, 29 Apr 2022 23:05:35 +0000 (00:05 +0100)]
Introduce and use PrepareUpdatesBuffer::only_unprepared_with

This saves us writing `if unprepared.len() != 0`.  I think that
pattern is asking for a reversed conditional at one random site.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce and use methods for applying UnpreparedUpdates
Ian Jackson [Fri, 29 Apr 2022 22:54:05 +0000 (23:54 +0100)]
Introduce and use methods for applying UnpreparedUpdates

There are quite a few call sites where the nature of an
UnpreparedUpdates is open-coded.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoUse default() for empty UnpreparedUpdates, not None
Ian Jackson [Fri, 29 Apr 2022 22:49:08 +0000 (23:49 +0100)]
Use default() for empty UnpreparedUpdates, not None

We are going to make this into a vec![].  Doing this change now will
reduce the textual impact a lot.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoDrop use of fehler in PieceTrait definition, for ambassador
Ian Jackson [Sat, 23 Apr 2022 08:51:01 +0000 (09:51 +0100)]
Drop use of fehler in PieceTrait definition, for ambassador

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agooccult ilks: Provide clone_id and clone_iilk
Ian Jackson [Sat, 23 Apr 2022 09:36:51 +0000 (10:36 +0100)]
occult ilks: Provide clone_id and clone_iilk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce OpOutcomeThunk
Ian Jackson [Tue, 19 Apr 2022 18:58:32 +0000 (19:58 +0100)]
Introduce OpOutcomeThunk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce PieceLoadArgs
Ian Jackson [Fri, 22 Apr 2022 18:26:29 +0000 (19:26 +0100)]
Introduce PieceLoadArgs

So that we can add more parameters to PieceTrait::load() without
having to edit everywhere *again*.

In fact it turns out I don't need to do this right now (for currency
and fastsplit) but I think it's worth keeping.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoPieceUpdateOps: Tabular formattint
Ian Jackson [Thu, 28 Apr 2022 00:58:32 +0000 (01:58 +0100)]
PieceUpdateOps: Tabular formattint

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce non-Quiet PUO::Insert
Ian Jackson [Thu, 28 Apr 2022 22:55:48 +0000 (23:55 +0100)]
Introduce non-Quiet PUO::Insert

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agots: Break out insert_piece function.
Ian Jackson [Thu, 28 Apr 2022 00:46:07 +0000 (01:46 +0100)]
ts: Break out insert_piece function.

We'll reuse this for non-Quiet Insert.  Have it return p for
convenience.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoRename PUO::Insert to InsertQuiet
Ian Jackson [Thu, 28 Apr 2022 00:43:30 +0000 (01:43 +0100)]
Rename PUO::Insert to InsertQuiet

This doesn't produce a halo, so it's Quiet.  We're going to want one
which *does* produce a halo, so we must make room.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce and use xdata_init
Ian Jackson [Thu, 28 Apr 2022 00:15:01 +0000 (01:15 +0100)]
Introduce and use xdata_init

Using get_mut for this seems slightly less careful.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoDocument what PUO::*Quiet mean
Ian Jackson [Wed, 27 Apr 2022 21:33:35 +0000 (22:33 +0100)]
Document what PUO::*Quiet mean

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoDocument OccultOwningId serialisation and refcount rules
Ian Jackson [Sat, 23 Apr 2022 18:09:51 +0000 (19:09 +0100)]
Document OccultOwningId serialisation and refcount rules

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofix serde_with_compat attribute syntax
Ian Jackson [Mon, 25 Apr 2022 22:49:40 +0000 (23:49 +0100)]
fix serde_with_compat attribute syntax

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to Rust 2021
Ian Jackson [Wed, 27 Apr 2022 20:49:20 +0000 (21:49 +0100)]
Switch to Rust 2021

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoPROTOCOL.md: fix a typo
Ian Jackson [Mon, 25 Apr 2022 22:45:18 +0000 (23:45 +0100)]
PROTOCOL.md: fix a typo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agohidden: Add checks for un-notched to vpid::consistency_check
Ian Jackson [Mon, 25 Apr 2022 00:26:28 +0000 (01:26 +0100)]
hidden: Add checks for un-notched to vpid::consistency_check

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofake rng: Remove an Arc
Ian Jackson [Sun, 24 Apr 2022 21:12:40 +0000 (22:12 +0100)]
fake rng: Remove an Arc

We don't in fact need this to be Clone, now that ServerConfig isn't.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-hidden: Add some more synch, just to complete things
Ian Jackson [Mon, 25 Apr 2022 00:02:21 +0000 (01:02 +0100)]
at-hidden: Add some more synch, just to complete things

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-hidden: Add more test, completing repro of unnotched bug
Ian Jackson [Sun, 24 Apr 2022 22:29:41 +0000 (23:29 +0100)]
at-hidden: Add more test, completing repro of unnotched bug

This test fails without the unnotched piece tracking.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agohidden: Fix handling of unnotched (Distinct) pieces
Ian Jackson [Mon, 25 Apr 2022 00:01:20 +0000 (01:01 +0100)]
hidden: Fix handling of unnotched (Distinct) pieces

We need to un-occult them.  But we were tracking what to recompute by
looking in occ.notches.  Un-notched pieces aren't there.

Introduce a new HashSet for these.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agohidden: Refactor a bit in preparation for unnotched pieces fix
Ian Jackson [Sun, 24 Apr 2022 23:41:55 +0000 (00:41 +0100)]
hidden: Refactor a bit in preparation for unnotched pieces fix

In both of these places, we're going to want to do something if there
is an occultation but notch is None.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agohidden: Have active_total_ppieces return usize
Ian Jackson [Mon, 25 Apr 2022 00:01:05 +0000 (01:01 +0100)]
hidden: Have active_total_ppieces return usize

The fix for the un-notched pieces bug is going to want to add a
HashMap len to this, and that's usize.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>