Allow travelers to pay in two-party travel deals
Verify and publish checkpoint container / container (push) Canceled after 0s

This commit is contained in:
Quintine committed 2026-10-29 17:39:06 +11:00
1 parent c1ffa1c28a
commit 3987c5c16b
9 files changed
+90 -21

No files matched your search

+41 -2
View File
@@ -117,11 +117,50 @@ void test('unanimous release ends the pending travel obligation without refundin
assert.equal(player(game, f.target).bribes, escrow);
});
void test('paid travel excludes reversed, deferred and multiparty payment variants', () => {
void test('paid travel excludes deferred and multiparty payment variants', () => {
const f = fixture(), travel = { kind: 'ship', territory: f.shipmentTerritory, minimum: 1, answer: true };
const base = { type: 'dealOffer', target: f.target, terms: 'Travel.', travel } satisfies Action;
reject(f.game, f.asker, { ...base, payment: { kind: 'immediateBribe', payer: f.target, recipient: f.asker, amount: 1 } });
reject(f.game, f.asker, { ...base, payment: { kind: 'deferredBribe', payer: f.asker, recipient: f.target, amount: 1, dueTurn: f.game.turn } });
reject(f.game, f.asker, { type: 'dealOffer', targets: [f.target, f.asker], terms: 'Travel.', travel,
payment: { kind: 'immediateBribe', payer: f.asker, recipient: f.target, amount: 1 } });
});
void test('the travelling recipient can pay the proposer at final consent and then complete shipment', () => {
const f = fixture(), payerBefore = player(f.game, f.target).spice,
recipientBefore = player(f.game, f.asker).bribes;
assert.ok(payerBefore >= f.shipmentCost + 1);
const payment = { kind: 'immediateBribe', payer: f.target, recipient: f.asker, amount: 1 };
const travel = { kind: 'ship', territory: f.shipmentTerritory, minimum: 1, answer: true };
const offered = act(f.game, f.asker, { type: 'dealOffer', target: f.target,
terms: 'Payment for agreed travel.', payment, travel });
const deal = offered.deals!.at(-1)!;
assert.equal(player(offered, f.target).spice, payerBefore);
const accepted = accept(offered, f.target, deal.id);
assert.equal(accepted.deals!.find(row => row.id === deal.id)!.status, 'active');
assert.equal(player(accepted, f.target).spice, payerBefore - 1);
assert.equal(player(accepted, f.asker).bribes, recipientBefore + 1);
assert.equal(accepted.travelPromises!.filter(row => row.sourceDeal === deal.id).length, 1);
assert.equal(status(accepted, f.target, deal.id), 'pending');
const shipped = settle(act(accepted, f.target, f.shipmentAction));
assert.equal(status(shipped, f.target, deal.id), 'fulfilled');
assert.equal(player(shipped, f.target).spice, payerBefore - 1 - f.shipmentCost);
assert.equal(player(shipped, f.asker).bribes, recipientBefore + 1);
assert.deepEqual(inventory(shipped), f.originalCards);
});
void test('reverse payment that consumes the travel funds rolls back the final consent atomically', () => {
const f = fixture(), cash = player(f.game, f.target).spice,
recipientEscrow = player(f.game, f.asker).bribes;
assert.ok(cash >= f.shipmentCost);
const payment = { kind: 'immediateBribe', payer: f.target, recipient: f.asker, amount: cash };
const travel = { kind: 'ship', territory: f.shipmentTerritory, minimum: 1, answer: true };
const offered = act(f.game, f.asker, { type: 'dealOffer', target: f.target,
terms: 'Payment for agreed travel.', payment, travel });
const deal = offered.deals!.at(-1)!;
reject(offered, f.target, { type: 'dealRespond', deal: deal.id, accept: true });
assert.equal(offered.deals!.find(row => row.id === deal.id)!.status, 'offered');
assert.equal(player(offered, f.target).spice, cash);
assert.equal(player(offered, f.asker).bribes, recipientEscrow);
assert.equal(offered.travelPromises?.some(row => row.sourceDeal === deal.id) ?? false, false);
assert.deepEqual(inventory(offered), f.originalCards);
});