From 17d2e57b028a9d2a67ad9ed803cc99e888e5d5d1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 21 May 2022 13:17:24 +0100 Subject: [PATCH] at-currency: Break out move_money Signed-off-by: Ian Jackson --- apitest/at-currency.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apitest/at-currency.rs b/apitest/at-currency.rs index 6bf7123a..2b63264a 100644 --- a/apitest/at-currency.rs +++ b/apitest/at-currency.rs @@ -6,6 +6,17 @@ use crate::*; type Ctx = UsualCtx; +#[throws(Explode)] +fn move_money(alice: &mut Session, + a_pieces: &mut Pieces, piece: PI, + qty: i32, z: &str, pos: Pos) { + alice.api_piece_op_single(PuSynch((&mut *a_pieces, piece)).id(), ( + "multigrab", json!({ "n": qty, 'z': z }) + ))?; + + alice.api_piece(GH::Ungrab, PuSynch((&mut *a_pieces, piece)), pos)?; +} + impl Ctx { #[throws(Explode)] fn multigrab(&mut self) { @@ -67,11 +78,8 @@ impl Ctx { alice.synchu(&mut a_pieces)?; let bank = a_pieces.find_by_desc_glob("*400ƒ*"); - alice.api_piece_op_single(PuSynch((&mut a_pieces, bank)).id(), ( - "multigrab", json!({ "n": 399, 'z': "u000000000" }) - ))?; - alice.api_piece(GH::Ungrab, PuSynch((&mut a_pieces, bank)), hand_pos)?; + move_money(&mut alice, &mut a_pieces, bank, 399, "u000000000", hand_pos)?; alice.synchu(&mut a_pieces)?; let _ = &mut bob; -- 2.30.2