test havenod 1.0.2, update dist

This commit is contained in:
woodser 2024-04-29 08:36:22 -04:00
parent d0da85167a
commit 0d51340033
7 changed files with 17 additions and 68 deletions

View File

@ -6158,11 +6158,6 @@ export class Trade extends jspb.Message {
getIsCompleted(): boolean;
setIsCompleted(value: boolean): Trade;
getImportedMultisigHexesList(): Array<string>;
setImportedMultisigHexesList(value: Array<string>): Trade;
clearImportedMultisigHexesList(): Trade;
addImportedMultisigHexes(value: string, index?: number): Trade;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Trade.AsObject;
static toObject(includeInstance: boolean, msg: Trade): Trade.AsObject;
@ -6201,7 +6196,6 @@ export namespace Trade {
counterCurrencyExtraData: string,
uid: string,
isCompleted: boolean,
importedMultisigHexesList: Array<string>,
}
export enum State {

View File

@ -49595,7 +49595,7 @@ proto.io.haveno.protobuffer.Tradable.prototype.hasArbitratorTrade = function() {
* @private {!Array<number>}
* @const
*/
proto.io.haveno.protobuffer.Trade.repeatedFields_ = [20,29];
proto.io.haveno.protobuffer.Trade.repeatedFields_ = [20];
@ -49656,8 +49656,7 @@ proto.io.haveno.protobuffer.Trade.toObject = function(includeInstance, msg) {
refundResultState: jspb.Message.getFieldWithDefault(msg, 25, 0),
counterCurrencyExtraData: jspb.Message.getFieldWithDefault(msg, 26, ""),
uid: jspb.Message.getFieldWithDefault(msg, 27, ""),
isCompleted: jspb.Message.getBooleanFieldWithDefault(msg, 28, false),
importedMultisigHexesList: (f = jspb.Message.getRepeatedField(msg, 29)) == null ? undefined : f
isCompleted: jspb.Message.getBooleanFieldWithDefault(msg, 28, false)
};
if (includeInstance) {
@ -49813,10 +49812,6 @@ proto.io.haveno.protobuffer.Trade.deserializeBinaryFromReader = function(msg, re
var value = /** @type {boolean} */ (reader.readBool());
msg.setIsCompleted(value);
break;
case 29:
var value = /** @type {string} */ (reader.readString());
msg.addImportedMultisigHexes(value);
break;
default:
reader.skipField();
break;
@ -50049,13 +50044,6 @@ proto.io.haveno.protobuffer.Trade.serializeBinaryToWriter = function(message, wr
f
);
}
f = message.getImportedMultisigHexesList();
if (f.length > 0) {
writer.writeRepeatedString(
29,
f
);
}
};
@ -50809,43 +50797,6 @@ proto.io.haveno.protobuffer.Trade.prototype.setIsCompleted = function(value) {
};
/**
* repeated string imported_multisig_hexes = 29;
* @return {!Array<string>}
*/
proto.io.haveno.protobuffer.Trade.prototype.getImportedMultisigHexesList = function() {
return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 29));
};
/**
* @param {!Array<string>} value
* @return {!proto.io.haveno.protobuffer.Trade} returns this
*/
proto.io.haveno.protobuffer.Trade.prototype.setImportedMultisigHexesList = function(value) {
return jspb.Message.setField(this, 29, value || []);
};
/**
* @param {string} value
* @param {number=} opt_index
* @return {!proto.io.haveno.protobuffer.Trade} returns this
*/
proto.io.haveno.protobuffer.Trade.prototype.addImportedMultisigHexes = function(value, opt_index) {
return jspb.Message.addToRepeatedField(this, 29, value, opt_index);
};
/**
* Clears the list making it empty but non-null.
* @return {!proto.io.haveno.protobuffer.Trade} returns this
*/
proto.io.haveno.protobuffer.Trade.prototype.clearImportedMultisigHexesList = function() {
return this.setImportedMultisigHexesList([]);
};

File diff suppressed because one or more lines are too long

View File

@ -16,12 +16,14 @@ export default class TaskLooper {
/**
* Start the task loop.
*
* @param {int} periodInMs the loop period in milliseconds
* @param {number} periodInMs the loop period in milliseconds
* @param {boolean} targetFixedPeriod specifies if the task should target a fixed period by accounting for run time (default false)
* @return {TaskLooper} this instance for chaining
*/
start(periodInMs: number): void;
start(periodInMs: number, targetFixedPeriod: boolean): void;
/**
* Stop the task loop.
*/
stop(): void;
_runLoop(periodInMs: number): Promise<void>;
_runLoop(periodInMs: number, targetFixedPeriod: boolean): Promise<void>;
}

View File

@ -32,15 +32,17 @@ class TaskLooper {
/**
* Start the task loop.
*
* @param {int} periodInMs the loop period in milliseconds
* @param {number} periodInMs the loop period in milliseconds
* @param {boolean} targetFixedPeriod specifies if the task should target a fixed period by accounting for run time (default false)
* @return {TaskLooper} this instance for chaining
*/
start(periodInMs) {
start(periodInMs, targetFixedPeriod) {
if (periodInMs <= 0)
throw new Error("Looper period must be greater than 0 ms");
if (this._isStarted)
return;
this._isStarted = true;
this._runLoop(periodInMs);
this._runLoop(periodInMs, targetFixedPeriod);
}
/**
* Stop the task loop.
@ -52,13 +54,13 @@ class TaskLooper {
clearTimeout(this._timeout);
this._timeout = undefined;
}
async _runLoop(periodInMs) {
async _runLoop(periodInMs, targetFixedPeriod) {
this._isLooping = true;
while (this._isStarted) {
const startTime = Date.now();
await this._fn();
if (this._isStarted)
await new Promise((resolve) => { this._timeout = setTimeout(resolve, periodInMs - (Date.now() - startTime)); });
await new Promise((resolve) => { this._timeout = setTimeout(resolve, periodInMs - (targetFixedPeriod ? (Date.now() - startTime) : 0)); });
}
this._isLooping = false;
}

View File

@ -1 +1 @@
{"version":3,"file":"TaskLooper.js","sourceRoot":"","sources":["../../src/utils/TaskLooper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAGH;;GAEG;AACH,MAAqB,UAAU;IAO7B;;;;OAIG;IACH,YAAY,EAAuB;QACjC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAkB;QACtB,IAAI,UAAU,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACzF,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,YAAY,CAAC,IAAI,CAAC,QAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAkB;QAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC,UAAU,EAAE;YACtB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YACjB,IAAI,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACtI;QACD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;CACF;AAjDD,6BAiDC"}
{"version":3,"file":"TaskLooper.js","sourceRoot":"","sources":["../../src/utils/TaskLooper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAGH;;GAEG;AACH,MAAqB,UAAU;IAO7B;;;;OAIG;IACH,YAAY,EAAuB;QACjC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,UAAkB,EAAE,iBAA0B;QAClD,IAAI,UAAU,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACzF,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,YAAY,CAAC,IAAI,CAAC,QAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAkB,EAAE,iBAA0B;QAC3D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC,UAAU,EAAE;YACtB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YACjB,IAAI,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAChK;QACD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;CACF;AAnDD,6BAmDC"}

View File

@ -355,7 +355,7 @@ const TestConfig = {
testDataDir: "./testdata",
haveno: {
path: "../haveno",
version: "1.0.1"
version: "1.0.2"
},
monerod: {
url: "http://localhost:" + getNetworkStartPort() + "8081", // 18081, 28081, 38081 for mainnet, testnet, and stagenet, respectively