Git-Mirrors/haveno-ts
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno-ts.git synced 2024-12-29 01:06:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

clean up postOffer() params and use typed test config

Browse Source
This commit is contained in:
woodser 2022-04-13 11:28:41 -04:00
parent 9a63afa5f8
commit 0e612aec74
2 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/haveno.test.ts
View File

@ -121,14 +121,14 @@ const TestConfig = {
devPrivilegePrivKey: "6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a", // from DEV_PRIVILEGE_PRIV_KEY
tradeInitTimeout: 60000,
timeout: 900000, // timeout in ms for all tests to complete (15 minutes)
postOffer: { // TODO (woodser): use typed config
postOffer: { // default post offer config
direction: "buy", // buy or sell xmr
amount: BigInt("200000000000"), // amount of xmr to trade
assetCode: "eth", // counter asset to trade
price: undefined, // use market price if undefined // TODO: converted to long on backend
paymentAccountId: undefined,
priceMargin: 0.0,
minAmount: BigInt("150000000000"), // TODO: disable by default
minAmount: BigInt("150000000000"), // TODO: disable by default, test somewhere
buyerSecurityDeposit: 0.15,
awaitUnlockedBalance: false,
triggerPrice: undefined // TODO: fails if there is a decimal, converted to long on backend
@ -139,6 +139,19 @@ interface TxContext {
isCreatedTx: boolean;
}
interface PostOfferConfig {
direction?: string,
amount?: bigint,
assetCode?: string,
paymentAccountId?: string,
buyerSecurityDeposit?: number,
price?: number,
priceMargin?: number,
triggerPrice?: number,
minAmount?: bigint,
awaitUnlockedBalance?: boolean
}
// clients
let startupHavenods: HavenoClient[] = [];
let arbitrator: HavenoClient;
@ -1949,41 +1962,39 @@ async function createCryptoPaymentAccount(trader: HavenoClient, currencyCode = "
}
// TODO: specify counter currency code
async function postOffer(maker: HavenoClient, config?: any) {
async function postOffer(maker: HavenoClient, config?: PostOfferConfig) {
// assign default options
config = Object.assign({}, TestConfig.postOffer, config);
// wait for unlocked balance
if (config.awaitUnlockedBalance) await waitForUnlockedBalance(config.amount * BigInt("2"), maker);
if (config.awaitUnlockedBalance) await waitForUnlockedBalance(config.amount! * BigInt("2"), maker);
// create payment account if not given
if (!config.paymentAccountId) config.paymentAccountId = (await createPaymentAccount(maker, config.assetCode)).getId();
if (!config.paymentAccountId) config.paymentAccountId = (await createPaymentAccount(maker, config.assetCode!)).getId();
// get unlocked balance before reserving offer
let unlockedBalanceBefore: bigint = BigInt((await maker.getBalances()).getUnlockedBalance());
// post offer
// TODO: re-arrange post offer parameters like this postOffer() or use config interface?
let offer: OfferInfo = await maker.postOffer(
config.assetCode,
config.direction,
config.direction!,
config.amount!,
config.assetCode!,
config.paymentAccountId!,
config.buyerSecurityDeposit!,
config.price,
config.price ? false : true, // TODO: redundant with price field?
config.priceMargin,
config.amount,
config.minAmount,
config.buyerSecurityDeposit,
config.paymentAccountId,
config.triggerPrice);
config.triggerPrice,
config.minAmount);
testOffer(offer, config);
// offer is included in my offers only
if (!getOffer(await maker.getMyOffers(config.assetCode, config.direction), offer.getId())) {
if (!getOffer(await maker.getMyOffers(config.assetCode!, config.direction), offer.getId())) {
await wait(10000);
if (!getOffer(await maker.getMyOffers(config.assetCode, config.direction), offer.getId())) throw new Error("Offer " + offer.getId() + " was not found in my offers");
if (!getOffer(await maker.getMyOffers(config.assetCode!, config.direction), offer.getId())) throw new Error("Offer " + offer.getId() + " was not found in my offers");
}
if (getOffer(await maker.getOffers(config.assetCode, config.direction), offer.getId())) throw new Error("My offer " + offer.getId() + " should not appear in available offers");
if (getOffer(await maker.getOffers(config.assetCode!, config.direction), offer.getId())) throw new Error("My offer " + offer.getId() + " should not appear in available offers");
// unlocked balance has decreased
let unlockedBalanceAfter: bigint = BigInt((await maker.getBalances()).getUnlockedBalance());

52
src/haveno.ts
View File

@ -961,40 +961,38 @@ class HavenoClient {
/**
* Post an offer.
*
* @param {string} assetCode - traded asset code
* @param {string} direction - one of "buy" or "sell"
* @param {number} price - trade price
* @param {bool} useMarketBasedPrice - base trade on market price // TODO: this field redundant with price
* @param {number} marketPriceMargin - % from market price to tolerate
* @param {bigint} amount - amount to trade
* @param {bigint} minAmount - minimum amount to trade
* @param {number} buyerSecurityDeposit - buyer security deposit as % of trade amount
* @param {string} direction - "buy" or "sell" XMR
* @param {bigint} amount - amount of XMR to trade
* @param {string} assetCode - asset code to trade for XMR
* @param {string} paymentAccountId - payment account id
* @param {number} triggerPrice - price to remove offer
* @return {OfferInfo} the posted offer
* @param {number} buyerSecurityDeposit - buyer security deposit as % of trade amount
* @param {number} price - trade price (optional, default to market price)
* @param {number} marketPriceMargin - if using market price, % from market price to accept (optional, default 0%)
* @param {bigint} minAmount - minimum amount to trade (optional, default to fixed amount)
* @param {number} triggerPrice - price to remove offer (optional)
* @return {OfferInfo} the posted offer
*/
async postOffer(assetCode: string,
direction: string,
price: number,
useMarketBasedPrice: boolean,
marketPriceMargin: number,
amount: bigint,
minAmount: bigint,
buyerSecurityDeposit: number,
paymentAccountId: string,
triggerPrice?: number): Promise<OfferInfo> {
async postOffer(direction: string,
amount: bigint,
assetCode: string,
paymentAccountId: string,
buyerSecurityDeposit: number,
price?: number,
marketPriceMargin?: number,
triggerPrice?: number,
minAmount?: bigint): Promise<OfferInfo> {
let that = this;
let request = new CreateOfferRequest()
.setCurrencyCode(assetCode)
.setDirection(direction)
.setUseMarketBasedPrice(useMarketBasedPrice)
.setPrice(useMarketBasedPrice ? "1.0" : price.toString()) // TODO: positive price required even if using market price
.setMarketPriceMargin(marketPriceMargin)
.setAmount(amount.toString())
.setMinAmount(minAmount.toString())
.setCurrencyCode(assetCode)
.setPaymentAccountId(paymentAccountId)
.setBuyerSecurityDeposit(buyerSecurityDeposit)
.setPaymentAccountId(paymentAccountId);
if (triggerPrice) request.setTriggerPrice(BigInt(triggerPrice.toString()).toString());
.setPrice(price ? price.toString() : "1.0") // TOOD (woodser): positive price required even if using market price?
.setUseMarketBasedPrice(price === undefined) // TODO (woodser): this field is redundant; remove from api
if (marketPriceMargin) request.setMarketPriceMargin(marketPriceMargin);
if (triggerPrice) request.setTriggerPrice(triggerPrice.toString());
if (minAmount) request.setMinAmount(minAmount.toString());
return new Promise(function(resolve, reject) {
that._offersClient.createOffer(request, {password: that._password}, function(err: grpcWeb.RpcError, response: CreateOfferReply) {
if (err) reject(err);