Skip to content

Commit df102a7

Browse files
committed
refactor: 💡 Node updated to use latest types and changes
1 parent bc75f05 commit df102a7

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

‎src/node/index.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,16 @@ import { PeerId } from '@libp2p/interface-peer-id';
1010
import { peerIdFromString } from '@libp2p/peer-id';
1111
import { AbstractProvider, AbstractSigner, Wallet } from 'ethers';
1212
import { noncePeriod as defaultNoncePeriod } from '../constants.js';
13-
import {
14-
buildOffer,
15-
BuildOfferOptions,
16-
GenericOfferOptions,
17-
GenericQuery,
18-
OfferData,
19-
} from '../shared/messages.js';
13+
import { GenericOfferOptions, GenericQuery, OfferData } from '../shared/types.js';
14+
import { buildOffer, BuildOfferOptions } from '../shared/messages.js';
2015
import { CenterSub, centerSub } from '../shared/pubsub.js';
2116
import { RequestManager, RequestEvent } from './requestManager.js';
2217
import { decodeText, encodeText } from '../utils/text.js';
2318
import { ContractConfig } from '../utils/contract.js';
2419
import { NodeOptions } from '../shared/options.js';
2520
import { parseSeconds } from '../utils/time.js';
2621
import { createLogger } from '../utils/logger.js';
22+
import { stringify } from '../utils/hash.js';
2723

2824
const logger = createLogger('Node');
2925

@@ -156,7 +152,7 @@ export class Node<
156152

157153
this.serverPeerId = peerIdFromString(serverPeerIdString);
158154
this.requestManager = new RequestManager<CustomRequestQuery>({
159-
noncePeriod: parseSeconds(noncePeriod ?? defaultNoncePeriod),
155+
noncePeriod: Number(parseSeconds(noncePeriod ?? defaultNoncePeriod)),
160156
});
161157
this.requestManager.addEventListener('request', (e) => this.handleRequest(e));
162158
logger.trace('Node instantiated');
@@ -261,7 +257,7 @@ export class Node<
261257
});
262258
logger.trace(`Offer #${offer.id} is built`);
263259

264-
await this.libp2p.pubsub.publish(offer.request.id, encodeText(JSON.stringify(offer)));
260+
await this.libp2p.pubsub.publish(offer.request.id, encodeText(stringify(offer)));
265261
logger.trace(`Offer #${offer.id} is published`);
266262

267263
return offer;

‎src/node/requestManager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events';
2-
import { RequestData, GenericQuery } from '../shared/messages.js';
2+
import { RequestData, GenericQuery } from '../shared/types.js';
33
import { RequestManagerOptions } from '../shared/options.js';
44
import { isExpired, nowSec, parseSeconds } from '../utils/time.js';
55
import { createLogger } from '../utils/logger.js';
@@ -40,7 +40,7 @@ export class RequestManager<CustomRequestQuery extends GenericQuery> extends Eve
4040

4141
this.cache = new Map<string, RequestData<CustomRequestQuery>>(); // requestId => request
4242
this.cacheTopic = new Map<string, string>(); // requestId => topic
43-
this.noncePeriod = parseSeconds(noncePeriod);
43+
this.noncePeriod = Number(parseSeconds(noncePeriod));
4444
}
4545

4646
add(topic: string, data: string) {
@@ -51,7 +51,7 @@ export class RequestManager<CustomRequestQuery extends GenericQuery> extends Eve
5151
return;
5252
}
5353

54-
if (nowSec() + this.noncePeriod > requestData.expire) {
54+
if (BigInt(nowSec() + this.noncePeriod) > BigInt(requestData.expire)) {
5555
logger.trace(`Request #${requestData.id} will expire before it can bee processed`);
5656
return;
5757
}

0 commit comments

Comments
 (0)