Merge branch 'master' into wsapi
This commit is contained in:
@@ -19,6 +19,8 @@ export interface OrderParamsV5 {
|
||||
orderType: OrderTypeV5;
|
||||
qty: string;
|
||||
marketUnit?: 'baseCoin' | 'quoteCoin';
|
||||
slippageToleranceType?: string;
|
||||
slippageTolerance?: string;
|
||||
price?: string;
|
||||
triggerDirection?: 1 | 2;
|
||||
orderFilter?: OrderFilterV5;
|
||||
|
||||
@@ -42,6 +42,8 @@ export interface AccountOrderV5 {
|
||||
stopOrderType: StopOrderTypeV5;
|
||||
orderIv: string;
|
||||
marketUnit: 'baseCoin' | 'quoteCoin';
|
||||
slippageToleranceType: string;
|
||||
slippageTolerance: string;
|
||||
triggerPrice: string;
|
||||
takeProfit: string;
|
||||
stopLoss: string;
|
||||
|
||||
@@ -64,6 +64,7 @@ interface SignedRequest<T> {
|
||||
interface UnsignedRequest<T> {
|
||||
originalParams: T;
|
||||
paramsWithSign: T;
|
||||
serializedParams: string;
|
||||
sign?: string;
|
||||
timestamp?: number;
|
||||
recvWindow?: number;
|
||||
@@ -276,7 +277,9 @@ export default abstract class BaseRestClient {
|
||||
return {
|
||||
...options,
|
||||
headers,
|
||||
params: signResult.originalParams,
|
||||
url: signResult.serializedParams
|
||||
? options.url + '?' + signResult.serializedParams
|
||||
: options.url,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -188,7 +188,35 @@ describe('Private READ V5 REST API Endpoints', () => {
|
||||
accountType: accountType,
|
||||
coin: settleCoin,
|
||||
}),
|
||||
).toMatchObject({ ...successResponseObjectV3() });
|
||||
).toMatchObject({
|
||||
...successResponseObjectV3(),
|
||||
// retMsg: '',
|
||||
});
|
||||
});
|
||||
|
||||
it('getAllCoinsBalance() unified with one symbol', async () => {
|
||||
const result = await api.getAllCoinsBalance({
|
||||
accountType: 'UNIFIED',
|
||||
coin: 'USDT',
|
||||
});
|
||||
|
||||
if (result.retCode !== 0) {
|
||||
console.error(expect.getState().currentTestName, 'exception: ', result);
|
||||
}
|
||||
|
||||
expect(result).toMatchObject({ ...successResponseObjectV3() });
|
||||
});
|
||||
|
||||
it('getAllCoinsBalance() unified with multiple symbols', async () => {
|
||||
const result = await api.getAllCoinsBalance({
|
||||
accountType: 'UNIFIED',
|
||||
coin: 'USDT,ETH',
|
||||
});
|
||||
|
||||
if (result.retCode !== 0) {
|
||||
console.error(expect.getState().currentTestName, 'exception: ', result);
|
||||
}
|
||||
expect(result).toMatchObject({ ...successResponseObjectV3() });
|
||||
});
|
||||
|
||||
it('getTransferableCoinList()', async () => {
|
||||
|
||||
Reference in New Issue
Block a user