This commit is contained in:
Aleksandr Kraiz
2023-02-08 01:35:06 +04:00
parent 1f19a50839
commit f5b7b019c8
2 changed files with 39 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
import { ethers } from 'ethers'; // import { ethers } from 'ethers';
import Orion from '../Orion'; import Orion from '../Orion';
import OrionAnalytics from '../services/OrionAnalytics'; import OrionAnalytics from '../services/OrionAnalytics';
import { ReferralSystem } from '../services/ReferralSystem'; import { ReferralSystem } from '../services/ReferralSystem';
@@ -255,8 +255,9 @@ describe('Orion', () => {
const timeout = setTimeout(() => { const timeout = setTimeout(() => {
reject(new Error('Timeout')); reject(new Error('Timeout'));
}, 10000); }, 10000);
orionUnitBSC.orionAggregator.ws.subscribe('aobus', { orionUnitBSC.orionAggregator.ws.subscribe('aobus', {
payload: 'BTC-USDT', payload: 'ORN-USDT',
callback: () => { callback: () => {
resolve(true); resolve(true);
orionUnitBSC.orionAggregator.ws.destroy(); orionUnitBSC.orionAggregator.ws.destroy();
@@ -265,44 +266,44 @@ describe('Orion', () => {
}) })
}); });
expect(aobusDone).toBe(true); expect(aobusDone).toBe(true);
const candles = await simpleFetch(orionUnitBSC.priceFeed.getCandles)( // const candles = await simpleFetch(orionUnitBSC.priceFeed.getCandles)(
'BTC-USDT', // 'BTC-USDT',
Math.floor((Date.now() - 1000 * 60 * 60 * 24 * 30) / 1000), // 1 month ago // Math.floor((Date.now() - 1000 * 60 * 60 * 24 * 30) / 1000), // 1 month ago
Math.floor(Date.now() / 1000), // now // Math.floor(Date.now() / 1000), // now
'1d' // '1d'
); // );
expect(candles).toBeDefined(); // expect(candles).toBeDefined();
const allTickersDone = await new Promise<boolean>((resolve, reject) => { // const allTickersDone = await new Promise<boolean>((resolve, reject) => {
const timeout = setTimeout(() => { // const timeout = setTimeout(() => {
reject(new Error('Timeout')); // reject(new Error('Timeout'));
}, 10000); // }, 10000);
const { unsubscribe } = orionUnitBSC.priceFeed.ws.subscribe( // const { unsubscribe } = orionUnitBSC.priceFeed.ws.subscribe(
'allTickers', // 'allTickers',
{ // {
callback: () => { // callback: () => {
resolve(true); // resolve(true);
unsubscribe(); // unsubscribe();
clearTimeout(timeout); // clearTimeout(timeout);
} // }
} // }
) // )
}); // });
expect(allTickersDone).toBe(true); // expect(allTickersDone).toBe(true);
const blockNumber = await orionUnitBSC.provider.getBlockNumber(); // const blockNumber = await orionUnitBSC.provider.getBlockNumber();
expect(blockNumber).toBeDefined(); // expect(blockNumber).toBeDefined();
const network = await orionUnitBSC.provider.getNetwork(); // const network = await orionUnitBSC.provider.getNetwork();
expect(network.chainId).toBe(97); // expect(network.chainId).toBe(97);
const stats = await simpleFetch(orion.orionAnalytics.getOverview)(); // const stats = await simpleFetch(orion.orionAnalytics.getOverview)();
expect(stats).toBeDefined(); // expect(stats).toBeDefined();
const zeroAddressWithout0x = ethers.constants.AddressZero.slice(2); // const zeroAddressWithout0x = ethers.constants.AddressZero.slice(2);
expect(simpleFetch(orion.referralSystem.getMiniStats)(zeroAddressWithout0x)) // expect(simpleFetch(orion.referralSystem.getMiniStats)(zeroAddressWithout0x))
.rejects // .rejects
.toThrow('empty reward history'); // .toThrow('empty reward history');
}); });
test('Get Orion unit by networkCode', () => { test('Get Orion unit by networkCode', () => {

View File

@@ -193,7 +193,9 @@ class OrionAggregatorWS {
private send(data: unknown) { private send(data: unknown) {
if (this.ws?.readyState === 1) { if (this.ws?.readyState === 1) {
this.ws.send(JSON.stringify(data)); const jsonData = JSON.stringify(data);
this.ws.send(jsonData);
this.logger?.(`Sent: ${jsonData}`);
} else { } else {
setTimeout(() => { setTimeout(() => {
this.send(data); this.send(data);