Git-Mirrors/haveno-ts
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno-ts.git synced 2025-08-02 03:26:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

use underscores in grpc.proto for correct camelcase in grpc-web

Browse source 
fix possibly undefined typescript checks
rebuild protobuf TS definitions
This commit is contained in:
woodser 2021-09-15 08:06:50 -04:00
parent febe4d7526
commit 3d8e37e646
6 changed files with 1354 additions and 1354 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/HavenoDaemon.test.tsx
View file

@ -15,10 +15,10 @@ test("Can get the version", async () => {
test("Can get the user's balances", async () => {
let balances: XmrBalanceInfo = await daemon.getBalances();
expect(balances.getUnlockedbalance()); // TODO: correct camelcase in grpc
expect(balances.getLockedbalance());
expect(balances.getReservedofferbalance());
expect(balances.getReservedtradebalance());
expect(balances.getUnlockedBalance());
expect(balances.getLockedBalance());
expect(balances.getReservedOfferBalance());
expect(balances.getReservedTradeBalance());
});
test("Can get offers", async () => {
@ -64,7 +64,7 @@ test("Can post and remove an offer", async () => {
if (!ethPaymentAccount) throw new Error("Test requires ethereum payment account to post offer");
// get unlocked balance before reserving offer
let unlockedBalanceBefore: bigint = BigInt((await daemon.getBalances()).getUnlockedbalance()); // TODO: correct camelcase
let unlockedBalanceBefore: bigint = BigInt((await daemon.getBalances()).getUnlockedBalance());
// post offer
let amount: bigint = BigInt("250000000000");
@ -88,7 +88,7 @@ test("Can post and remove an offer", async () => {
testOffer(offer);
// unlocked balance has decreased
let unlockedBalanceAfter: bigint = BigInt((await daemon.getBalances()).getUnlockedbalance());
let unlockedBalanceAfter: bigint = BigInt((await daemon.getBalances()).getUnlockedBalance());
expect(unlockedBalanceAfter).toBeLessThan(unlockedBalanceBefore);
// offer is included in my offers only
@ -102,7 +102,7 @@ test("Can post and remove an offer", async () => {
if (getOffer(await daemon.getOffers("buy"), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in my offers after removal");
// reserved balance restored
expect(unlockedBalanceBefore).toEqual(BigInt((await daemon.getBalances()).getUnlockedbalance()));
expect(unlockedBalanceBefore).toEqual(BigInt((await daemon.getBalances()).getUnlockedBalance()));
});
// ------------------------------- HELPERS ------------------------------------

36
src/HavenoDaemon.tsx
View file

@ -58,7 +58,7 @@ class HavenoDaemon {
return new Promise(function(resolve, reject) {
that._walletsClient.getBalances(request, {password: that._password}, function(err: grpcWeb.Error, response: GetBalancesReply) {
if (err) reject(err);
else resolve(response.getBalances()?.getXmr());
else resolve(response.getBalances()!.getXmr()!);
});
});
}
@ -73,7 +73,7 @@ class HavenoDaemon {
async getOffers(direction: string): Promise<OfferInfo[]> {
let request = new GetOffersRequest()
.setDirection(direction)
.setCurrencycode("XMR");
.setCurrencyCode("XMR");
let that = this;
return new Promise(function(resolve, reject) {
that._offersClient.getOffers(request, {password: that._password}, function(err: grpcWeb.Error, response: GetOffersReply) {
@ -94,7 +94,7 @@ class HavenoDaemon {
let that = this;
let request = new GetOffersRequest()
.setDirection(direction)
.setCurrencycode("XMR");
.setCurrencyCode("XMR");
return new Promise(function(resolve, reject) {
that._offersClient.getMyOffers(request, {password: that._password}, function(err: grpcWeb.Error, response: GetOffersReply) {
if (err) reject(err);
@ -113,7 +113,7 @@ class HavenoDaemon {
return new Promise(function(resolve, reject) {
that._paymentAccountsClient.getPaymentAccounts(new GetPaymentAccountsRequest(), {password: that._password}, function(err: grpcWeb.Error, response: GetPaymentAccountsReply) {
if (err) reject(err);
else resolve(response.getPaymentaccountsList());
else resolve(response.getPaymentAccountsList());
});
});
}
@ -133,14 +133,14 @@ class HavenoDaemon {
tradeInstant: boolean): Promise<PaymentAccount> {
let that = this;
let request = new CreateCryptoCurrencyPaymentAccountRequest()
.setAccountname(accountName)
.setCurrencycode(currencyCode)
.setAccountName(accountName)
.setCurrencyCode(currencyCode)
.setAddress(address)
.setTradeinstant(tradeInstant);
.setTradeInstant(tradeInstant);
return new Promise(function(resolve, reject) {
that._paymentAccountsClient.createCryptoCurrencyPaymentAccount(request, {password: that._password}, function(err: grpcWeb.Error, response: CreateCryptoCurrencyPaymentAccountReply) {
if (err) reject(err);
else resolve(response.getPaymentaccount());
else resolve(response.getPaymentAccount()!);
});
});
}
@ -172,21 +172,21 @@ class HavenoDaemon {
triggerPrice?: number): Promise<OfferInfo> {
let that = this;
let request = new CreateOfferRequest()
.setCurrencycode(currencyCode)
.setCurrencyCode(currencyCode)
.setDirection(direction)
.setPrice(price.toString())
.setUsemarketbasedprice(useMarketBasedPrice)
.setMarketpricemargin(marketPriceMargin)
.setUseMarketBasedPrice(useMarketBasedPrice)
.setMarketPriceMargin(marketPriceMargin)
.setAmount(amount.toString())
.setMinamount(minAmount.toString())
.setBuyersecuritydeposit(buyerSecurityDeposit)
.setPaymentaccountid(paymentAccountId)
.setMakerfeecurrencycode("XMR");
if (triggerPrice) request.setTriggerprice(BigInt(triggerPrice.toString()).toString());
.setMinAmount(minAmount.toString())
.setBuyerSecurityDeposit(buyerSecurityDeposit)
.setPaymentAccountId(paymentAccountId)
.setMakerFeeCurrencyCode("XMR");
if (triggerPrice) request.setTriggerPrice(BigInt(triggerPrice.toString()).toString());
return new Promise(function(resolve, reject) {
that._offersClient.createOffer(request, {password: that._password}, function(err: grpcWeb.Error, response: CreateOfferReply) {
if (err) reject(err);
else resolve(response.getOffer());
else resolve(response.getOffer()!);
});
});
}
@ -196,7 +196,7 @@ class HavenoDaemon {
*
* @param {string} id - the offer id to cancel
*/
async cancelOffer(id: string) {
async cancelOffer(id: string): Promise<void> {
let that = this;
return new Promise(function(resolve, reject) {
that._offersClient.cancelOffer(new CancelOfferRequest().setId(id), {password: that._password}, function(err: grpcWeb.Error) {

812
src/protobuf/grpc_pb.d.ts vendored
View file

File diff suppressed because it is too large Load diff

1590
src/protobuf/grpc_pb.js
View file

File diff suppressed because it is too large Load diff