Skip to content

Commit 28da7dd

Browse files
authored
refactor(api-http): remove senderId from schema (#1262)
* remove senderId from schema * empty commit
1 parent edd61cb commit 28da7dd

4 files changed

Lines changed: 2 additions & 31 deletions

File tree

packages/api-database/source/search/filters/transaction-filter.ts

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ export class TransactionFilter {
2525
case "address": {
2626
return handleOrCriteria(criteria.address, async (c) =>
2727
// @ts-ignore
28-
this.handleAddressCriteria(c, walletRepository),
29-
);
30-
}
31-
case "senderId": {
32-
return handleOrCriteria(criteria.senderId, async (c) =>
33-
// @ts-ignore
34-
this.handleSenderIdCriteria(c, walletRepository),
28+
this.handleAddressCriteria(c),
3529
);
3630
}
3731
case "to": {
@@ -118,30 +112,13 @@ export class TransactionFilter {
118112
walletRepository: WalletRepository,
119113
): Promise<Expression<Transaction>> {
120114
const expressions: Expression<Transaction>[] = await Promise.all([
121-
this.handleSenderIdCriteria(criteria, walletRepository),
115+
this.handleSenderAddressCritera(criteria),
122116
this.handleRecipientAddressCriteria(criteria),
123117
]);
124118

125119
return { expressions, op: "or" };
126120
}
127121

128-
private static async handleSenderIdCriteria(
129-
criteria: EqualCriteria<string>,
130-
walletRepository: WalletRepository,
131-
): Promise<Expression<Transaction>> {
132-
const wallet = await walletRepository
133-
.createQueryBuilder()
134-
.select("public_key")
135-
.where("address = :address", { address: criteria })
136-
.getRawOne<{ public_key: string }>();
137-
138-
if (!wallet || !wallet.public_key) {
139-
return { op: "false" };
140-
}
141-
142-
return this.handleSenderPublicKeyCriteria(wallet.public_key);
143-
}
144-
145122
private static async handleSenderPublicKeyCriteria(
146123
criteria: EqualCriteria<string>,
147124
): Promise<Expression<Transaction>> {

packages/api-database/source/search/types/criteria.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export type BlockDataWithTransactionData = {
3737

3838
export type TransactionCriteria = {
3939
address?: OrEqualCriteria<string>;
40-
senderId?: OrEqualCriteria<string>;
4140
to?: OrEqualCriteria<string>;
4241
hash?: OrEqualCriteria<string>;
4342
version?: OrEqualCriteria<number>;

packages/api-http/integration/routes/transactions.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ describe<{
8181
path: `/transactions?from=${transaction.from}`,
8282
result: [...transactionsResponse].filter((tx) => tx.from === transaction.from),
8383
},
84-
{
85-
path: `/transactions?senderId=${transaction.from}`,
86-
result: [...transactionsResponse].filter((tx) => tx.from === transaction.from),
87-
},
8884
{
8985
path: `/transactions?address=${transaction.to}`,
9086
result: [...transactionsResponse].filter((tx) => tx.to === transaction.to),

packages/api-http/source/schemas/schemas.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export const transactionCriteriaSchemas = {
7272
gasPrice: Schemas.orNumericCriteria(Joi.number().integer().min(0)),
7373
hash: Schemas.orEqualCriteria(Joi.string().hex().length(64)),
7474
nonce: Schemas.orNumericCriteria(Joi.number().integer().positive()),
75-
senderId: Schemas.orEqualCriteria(address),
7675
senderPublicKey: Schemas.orEqualCriteria(Joi.string().hex().length(66)),
7776
timestamp: Schemas.orNumericCriteria(Joi.number().integer().min(0)),
7877
to: Schemas.orEqualCriteria(address),

0 commit comments

Comments
 (0)