From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Oct 2020 22:11:18 +0000 (+0100)
Subject: make piece held check overrideable
X-Git-Tag: otter-0.2.0~801
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0ce349cb731e76af2519c5f4caba4dc4b3fc9092;p=otter.git

make piece held check overrideable

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

diff --git a/src/api.rs b/src/api.rs
index 2e43a3b0..34829bc8 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -21,6 +21,13 @@ trait ApiPieceOp : Debug {
         p: &dyn Piece,
         lens: &dyn Lens /* used for LogEntry and PieceId but not Pos */)
         -> PieceUpdateFromOp;
+
+  #[throws(OnlineError)]
+  fn check_held(&self, pc: &PieceState, player: PlayerId) {
+    if pc.held != None && pc.held != Some(player) {
+      throw!(OnlineError::PieceHeld)
+    }
+  }
 }
 
 #[derive(Error,Debug)]
@@ -119,9 +126,7 @@ fn api_piece_op<O: ApiPieceOp>(form : Json<ApiPiece<O>>)
       else { pc.gen };
 
     if u_gen > q_gen { throw!(PieceOpError::Conflict) }
-    if pc.held != None && pc.held != Some(player) {
-      throw!(OnlineError::PieceHeld)
-    };
+    form.op.check_held(pc,player)?;
     let (wrc, update, logents) = form.op.op(gs,player,piece,p.as_ref(),&lens)?;
     Ok::<_,ApiPieceOpError>((wrc, update, logents))
   })() {