Fix Central Exchange cancel/expiry letter copy by order side.
Use correct grammar for returned coin escrow on buy orders and keep listed-goods wording for sell returns.
@@ -3,7 +3,7 @@ import assert from "node:assert/strict";
3
3
import { ItemId } from "../../shared/definitions/items.js";
4
4
import { BlockType } from "../../shared/definitions/tiles.js";
5
5
import { canSellOnMarketplace, assertMarketplaceSellable } from "../../shared/items/marketplace.js";
6
import { midpointTradePrice, MARKET_ORDER_MAX_AGE_MS, soldLetterBody, marketOrderListingFee } from "../../shared/market/exchange.js";
6
import { midpointTradePrice, MARKET_ORDER_MAX_AGE_MS, soldLetterBody, marketOrderListingFee, orderCancelledLetterBody, orderExpiredLetterBody } from "../../shared/market/exchange.js";
7
7
import { formatLetterSignature, CENTRAL_EXCHANGE_ORG } from "../../shared/courier/systemLetters.js";
8
8
import { writtenOrigin, originLabel, CraftOriginVerb } from "../../shared/items/origin.js";
9
9
import { takeMarketFunds, resolveMarketSellListing } from "../../shared/market/funds.js";
@@ -79,6 +79,39 @@ test("listing fee is 3% of notional rounded up", () =>
79
79
assert.equal(marketOrderListingFee(0, 5), 0);
80
80
});
81
81
82
test("cancel and expiry letters use side-specific escrow copy", () =>
83
{
84
const buyCancel = orderCancelledLetterBody({
85
side: "buy",
86
itemName: "Flower",
87
quantity: 1,
88
escrowLabel: "coins",
89
clerkName: "Ada Ledger"
90
});
91
assert.match(buyCancel, /buy order for 1× Flower was cancelled/);
92
assert.match(buyCancel, /coins have been returned/);
93
assert.doesNotMatch(buyCancel, /coins has been returned/);
94
95
const sellCancel = orderCancelledLetterBody({
96
side: "sell",
97
itemName: "Apple",
98
quantity: 2,
99
escrowLabel: "Apple",
100
clerkName: "Ada Ledger"
101
});
102
assert.match(sellCancel, /sell order for 2× Apple was cancelled/);
103
assert.match(sellCancel, /listed goods have been returned/);
104
105
const buyExpired = orderExpiredLetterBody({
106
side: "buy",
107
itemName: "Flower",
108
quantity: 1,
109
escrowLabel: "coins",
110
clerkName: "Ada Ledger"
111
});
112
assert.match(buyExpired, /coins have been returned/);
113
});
114
82
115
test("market funds spend whole coin cheques and return change", () =>
83
116
{
84
117
const slots = emptySlots();
@@ -3,7 +3,7 @@ import assert from "node:assert/strict";3
import { ItemId } from "../../shared/definitions/items.js";3
import { ItemId } from "../../shared/definitions/items.js";4
import { BlockType } from "../../shared/definitions/tiles.js";4
import { BlockType } from "../../shared/definitions/tiles.js";5
import { canSellOnMarketplace, assertMarketplaceSellable } from "../../shared/items/marketplace.js";5
import { canSellOnMarketplace, assertMarketplaceSellable } from "../../shared/items/marketplace.js";6
import { midpointTradePrice, MARKET_ORDER_MAX_AGE_MS, soldLetterBody, marketOrderListingFee } from "../../shared/market/exchange.js";6
import { midpointTradePrice, MARKET_ORDER_MAX_AGE_MS, soldLetterBody, marketOrderListingFee, orderCancelledLetterBody, orderExpiredLetterBody } from "../../shared/market/exchange.js";7
import { formatLetterSignature, CENTRAL_EXCHANGE_ORG } from "../../shared/courier/systemLetters.js";7
import { formatLetterSignature, CENTRAL_EXCHANGE_ORG } from "../../shared/courier/systemLetters.js";8
import { writtenOrigin, originLabel, CraftOriginVerb } from "../../shared/items/origin.js";8
import { writtenOrigin, originLabel, CraftOriginVerb } from "../../shared/items/origin.js";9
import { takeMarketFunds, resolveMarketSellListing } from "../../shared/market/funds.js";9
import { takeMarketFunds, resolveMarketSellListing } from "../../shared/market/funds.js";@@ -79,6 +79,39 @@ test("listing fee is 3% of notional rounded up", () =>79
assert.equal(marketOrderListingFee(0, 5), 0);79
assert.equal(marketOrderListingFee(0, 5), 0);80
});80
});81
81
82
test("cancel and expiry letters use side-specific escrow copy", () =>83
{84
const buyCancel = orderCancelledLetterBody({85
side: "buy",86
itemName: "Flower",87
quantity: 1,88
escrowLabel: "coins",89
clerkName: "Ada Ledger"90
});91
assert.match(buyCancel, /buy order for 1× Flower was cancelled/);92
assert.match(buyCancel, /coins have been returned/);93
assert.doesNotMatch(buyCancel, /coins has been returned/);94
95
const sellCancel = orderCancelledLetterBody({96
side: "sell",97
itemName: "Apple",98
quantity: 2,99
escrowLabel: "Apple",100
clerkName: "Ada Ledger"101
});102
assert.match(sellCancel, /sell order for 2× Apple was cancelled/);103
assert.match(sellCancel, /listed goods have been returned/);104
105
const buyExpired = orderExpiredLetterBody({106
side: "buy",107
itemName: "Flower",108
quantity: 1,109
escrowLabel: "coins",110
clerkName: "Ada Ledger"111
});112
assert.match(buyExpired, /coins have been returned/);113
});114
82
test("market funds spend whole coin cheques and return change", () =>115
test("market funds spend whole coin cheques and return change", () =>83
{116
{84
const slots = emptySlots();117
const slots = emptySlots();