Skip to content

Commit ae8b077

Browse files
majectymajecty
committed
Remove page from all APIs
1 parent eee4391 commit ae8b077

14 files changed

+10
-150
lines changed

‎src/models/logic/aggsUTXO.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ import { aggsUTXOPagination } from "../../routers/pagination";
77
export async function getByAddress(params: {
88
address: string;
99
assetType?: H160 | null;
10-
page?: number | null;
1110
itemsPerPage?: number | null;
1211
firstEvaluatedKey?: [number] | null;
1312
lastEvaluatedKey?: [number] | null;
1413
}) {
1514
const {
1615
address,
1716
assetType,
18-
page = 1,
1917
itemsPerPage = 15,
2018
firstEvaluatedKey,
2119
lastEvaluatedKey
@@ -45,10 +43,6 @@ export async function getByAddress(params: {
4543
lastEvaluatedKey
4644
}),
4745
limit: itemsPerPage!,
48-
offset:
49-
firstEvaluatedKey || lastEvaluatedKey
50-
? 0
51-
: (page! - 1) * itemsPerPage!,
5246
include: includeArray
5347
});
5448
} catch (err) {
@@ -60,15 +54,13 @@ export async function getByAddress(params: {
6054
export async function getByAssetType(params: {
6155
assetType: H160;
6256
address?: string | null;
63-
page?: number | null;
6457
itemsPerPage?: number | null;
6558
firstEvaluatedKey?: [number] | null;
6659
lastEvaluatedKey?: [number] | null;
6760
}) {
6861
const {
6962
address,
7063
assetType,
71-
page = 1,
7264
itemsPerPage = 15,
7365
firstEvaluatedKey,
7466
lastEvaluatedKey
@@ -98,10 +90,6 @@ export async function getByAssetType(params: {
9890
lastEvaluatedKey
9991
}),
10092
limit: itemsPerPage!,
101-
offset:
102-
firstEvaluatedKey || lastEvaluatedKey
103-
? 0
104-
: (page! - 1) * itemsPerPage!,
10593
include: includeArray
10694
});
10795
} catch (err) {

‎src/models/logic/block.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,12 @@ export async function deleteBlockByNumber(
126126

127127
export async function getBlocks(params: {
128128
address?: string;
129-
page?: number | null;
130129
itemsPerPage?: number | null;
131130
firstEvaluatedKey?: [number] | null;
132131
lastEvaluatedKey?: [number] | null;
133132
}) {
134133
const {
135134
address,
136-
page = 1,
137135
itemsPerPage = 15,
138136
firstEvaluatedKey,
139137
lastEvaluatedKey
@@ -145,10 +143,6 @@ export async function getBlocks(params: {
145143
lastEvaluatedKey
146144
}),
147145
limit: itemsPerPage!,
148-
offset:
149-
firstEvaluatedKey || lastEvaluatedKey
150-
? 0
151-
: (page! - 1) * itemsPerPage!,
152146
where: {
153147
...(address && { author: address }),
154148
...((firstEvaluatedKey || lastEvaluatedKey) &&

‎src/models/logic/cccChange.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,13 @@ export async function reportDoubleVote(
213213
export async function getByAddress(
214214
address: string,
215215
option: {
216-
page: number;
217216
itemsPerPage: number;
218217
reasonFilter?: string[];
219218
firstEvaluatedKey?: number[] | null;
220219
lastEvaluatedKey?: number[] | null;
221220
}
222221
): Promise<CCCChangeInstance[]> {
223222
const {
224-
page,
225223
itemsPerPage,
226224
reasonFilter = defaultAllReasons,
227225
firstEvaluatedKey,
@@ -264,10 +262,6 @@ export async function getByAddress(
264262
}
265263
],
266264
limit: itemsPerPage,
267-
offset:
268-
firstEvaluatedKey || lastEvaluatedKey
269-
? 0
270-
: (page - 1) * itemsPerPage,
271265
order: cccChangesPagination.byAccount.orderby({
272266
firstEvaluatedKey,
273267
lastEvaluatedKey

‎src/models/logic/transaction.ts

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ export async function applyTransaction(
251251

252252
export async function getPendingTransactions(params: {
253253
address?: string | null;
254-
page: number;
255254
itemsPerPage: number;
256255
firstEvaluatedKey: [number, number] | null;
257256
lastEvaluatedKey: [number, number] | null;
@@ -271,12 +270,11 @@ export async function getPendingTransactions(params: {
271270
}
272271

273272
async function getAnyPendingTransactions(params: {
274-
page: number;
275273
itemsPerPage: number;
276274
firstEvaluatedKey: [number, number] | null;
277275
lastEvaluatedKey: [number, number] | null;
278276
}) {
279-
const { page, itemsPerPage, firstEvaluatedKey, lastEvaluatedKey } = params;
277+
const { itemsPerPage, firstEvaluatedKey, lastEvaluatedKey } = params;
280278
const query: any[] = [
281279
{
282280
isPending: true
@@ -302,10 +300,6 @@ async function getAnyPendingTransactions(params: {
302300
lastEvaluatedKey
303301
}),
304302
limit: itemsPerPage,
305-
offset:
306-
firstEvaluatedKey || lastEvaluatedKey
307-
? 0
308-
: (page - 1) * itemsPerPage,
309303
include: [...fullIncludeArray]
310304
});
311305
} catch (err) {
@@ -316,7 +310,6 @@ async function getAnyPendingTransactions(params: {
316310

317311
async function getPendingTransactionsByAddress(params: {
318312
address: string;
319-
page: number;
320313
itemsPerPage: number;
321314
firstEvaluatedKey: [number, number] | null;
322315
lastEvaluatedKey: [number, number] | null;
@@ -350,14 +343,12 @@ async function getPendingTransactionsByAddress(params: {
350343

351344
async function getPendingHashesByPlatformAddress(params: {
352345
address: string;
353-
page: number;
354346
itemsPerPage: number;
355347
firstEvaluatedKey: [number, number] | null;
356348
lastEvaluatedKey: [number, number] | null;
357349
}): Promise<string[]> {
358350
const {
359351
address,
360-
page,
361352
itemsPerPage,
362353
firstEvaluatedKey,
363354
lastEvaluatedKey
@@ -389,11 +380,7 @@ async function getPendingHashesByPlatformAddress(params: {
389380
firstEvaluatedKey,
390381
lastEvaluatedKey
391382
}),
392-
limit: itemsPerPage,
393-
offset:
394-
firstEvaluatedKey || lastEvaluatedKey
395-
? 0
396-
: (page - 1) * itemsPerPage
383+
limit: itemsPerPage
397384
}).map(r => r.get("transactionHash"));
398385
} catch (err) {
399386
console.error(err);
@@ -517,15 +504,13 @@ export async function removeOutdatedPendings(
517504

518505
async function getHashesByPlatformAddress(params: {
519506
address: string;
520-
page: number;
521507
itemsPerPage: number;
522508
firstEvaluatedKey: [number, number] | null;
523509
lastEvaluatedKey: [number, number] | null;
524510
includePending: boolean | null;
525511
}): Promise<string[]> {
526512
const {
527513
address,
528-
page,
529514
itemsPerPage,
530515
firstEvaluatedKey,
531516
lastEvaluatedKey
@@ -555,11 +540,7 @@ async function getHashesByPlatformAddress(params: {
555540
firstEvaluatedKey,
556541
lastEvaluatedKey
557542
}),
558-
limit: itemsPerPage,
559-
offset:
560-
firstEvaluatedKey || lastEvaluatedKey
561-
? 0
562-
: (page - 1) * itemsPerPage
543+
limit: itemsPerPage
563544
}).map(r => r.get("transactionHash"));
564545
} catch (err) {
565546
console.error(err);
@@ -570,7 +551,6 @@ async function getHashesByPlatformAddress(params: {
570551
async function getHashesByAssetAddress(params: {
571552
address: string;
572553
assetType?: string | null;
573-
page: number;
574554
itemsPerPage: number;
575555
firstEvaluatedKey: [number, number] | null;
576556
lastEvaluatedKey: [number, number] | null;
@@ -579,7 +559,6 @@ async function getHashesByAssetAddress(params: {
579559
const {
580560
address,
581561
assetType,
582-
page,
583562
itemsPerPage,
584563
firstEvaluatedKey,
585564
lastEvaluatedKey
@@ -611,11 +590,7 @@ async function getHashesByAssetAddress(params: {
611590
firstEvaluatedKey,
612591
lastEvaluatedKey
613592
}),
614-
limit: itemsPerPage,
615-
offset:
616-
firstEvaluatedKey || lastEvaluatedKey
617-
? 0
618-
: (page - 1) * itemsPerPage
593+
limit: itemsPerPage
619594
}).map(r => r.get("transactionHash"));
620595
} catch (err) {
621596
console.error(err);
@@ -625,15 +600,13 @@ async function getHashesByAssetAddress(params: {
625600

626601
async function getHashesByAssetType(params: {
627602
assetType: string;
628-
page: number;
629603
itemsPerPage: number;
630604
firstEvaluatedKey: [number, number] | null;
631605
lastEvaluatedKey: [number, number] | null;
632606
includePending: boolean | null;
633607
}): Promise<string[]> {
634608
const {
635609
assetType,
636-
page,
637610
itemsPerPage,
638611
firstEvaluatedKey,
639612
lastEvaluatedKey
@@ -664,11 +637,7 @@ async function getHashesByAssetType(params: {
664637
firstEvaluatedKey,
665638
lastEvaluatedKey
666639
}),
667-
limit: itemsPerPage,
668-
offset:
669-
firstEvaluatedKey || lastEvaluatedKey
670-
? 0
671-
: (page - 1) * itemsPerPage
640+
limit: itemsPerPage
672641
}).map(r => r.get("transactionHash"));
673642
} catch (err) {
674643
console.error(err);
@@ -679,7 +648,6 @@ async function getHashesByAssetType(params: {
679648
async function getHashes(params: {
680649
address?: string | null;
681650
assetType?: string | null;
682-
page: number;
683651
itemsPerPage: number;
684652
firstEvaluatedKey: [number, number] | null;
685653
lastEvaluatedKey: [number, number] | null;
@@ -689,7 +657,6 @@ async function getHashes(params: {
689657
const {
690658
address,
691659
assetType,
692-
page,
693660
itemsPerPage,
694661
firstEvaluatedKey,
695662
lastEvaluatedKey,
@@ -699,7 +666,6 @@ async function getHashes(params: {
699666
return getHashesByAssetAddress({
700667
address,
701668
assetType,
702-
page,
703669
itemsPerPage,
704670
firstEvaluatedKey,
705671
lastEvaluatedKey,
@@ -709,7 +675,6 @@ async function getHashes(params: {
709675
if (AssetAddress.check(address)) {
710676
return getHashesByAssetAddress({
711677
address,
712-
page,
713678
itemsPerPage,
714679
firstEvaluatedKey,
715680
lastEvaluatedKey,
@@ -718,7 +683,6 @@ async function getHashes(params: {
718683
} else if (PlatformAddress.check(address)) {
719684
return getHashesByPlatformAddress({
720685
address,
721-
page,
722686
itemsPerPage,
723687
firstEvaluatedKey,
724688
lastEvaluatedKey,
@@ -729,7 +693,6 @@ async function getHashes(params: {
729693
} else if (assetType != null) {
730694
return getHashesByAssetType({
731695
assetType,
732-
page,
733696
itemsPerPage,
734697
firstEvaluatedKey,
735698
lastEvaluatedKey,
@@ -761,19 +724,14 @@ async function getHashes(params: {
761724
firstEvaluatedKey,
762725
lastEvaluatedKey
763726
}),
764-
limit: itemsPerPage,
765-
offset:
766-
firstEvaluatedKey || lastEvaluatedKey
767-
? 0
768-
: (page - 1) * itemsPerPage
727+
limit: itemsPerPage
769728
}).map(result => result.get("hash"));
770729
}
771730

772731
export async function getTransactions(params: {
773732
address?: string | null;
774733
assetType?: string | null;
775734
type?: string[] | null;
776-
page: number;
777735
itemsPerPage: number;
778736
firstEvaluatedKey: [number, number] | null;
779737
lastEvaluatedKey: [number, number] | null;
@@ -809,15 +767,13 @@ export async function getTransactions(params: {
809767
}
810768

811769
export async function getTransactionsOfBlock(params: {
812-
page: number;
813770
itemsPerPage: number;
814771
blockNumber: number;
815772
firstEvaluatedKey?: number[] | null;
816773
lastEvaluatedKey?: number[] | null;
817774
}) {
818775
try {
819776
const {
820-
page,
821777
itemsPerPage,
822778
blockNumber,
823779
firstEvaluatedKey,
@@ -843,10 +799,6 @@ export async function getTransactionsOfBlock(params: {
843799
lastEvaluatedKey
844800
}),
845801
limit: itemsPerPage,
846-
offset:
847-
firstEvaluatedKey || lastEvaluatedKey
848-
? 0
849-
: (page - 1) * itemsPerPage,
850802
include: [...fullIncludeArray]
851803
});
852804
} catch (err) {

0 commit comments

Comments
 (0)