commit 907fb2ebf4c9b68ddc1b9ce9d5f8055d24b3552d
parent 7a718a5230f2bc376eb97b8e3eaef40b3d2996f2
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Sun, 25 Oct 2026 18:35:22 +0100
taldir/mailbox: fix getMailboxMessages plural. Rename AddMailboxMessage to UpsertMailboxMessage
Diffstat:
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-wallet-mailbox-basic.ts b/packages/taler-harness/src/integrationtests/test-wallet-mailbox-basic.ts
@@ -51,10 +51,10 @@ export async function runWalletMailboxBasicTest(t: GlobalTestState) {
talerUri: "taler://pay-pull/XQXA",
downloadedAt: TalerProtocolTimestamp.now(),
};
- await walletClient.call(WalletApiOperation.AddMailboxMessage, {
+ await walletClient.call(WalletApiOperation.UpsertMailboxMessage, {
message: messageBob,
});
- await walletClient.call(WalletApiOperation.AddMailboxMessage, {
+ await walletClient.call(WalletApiOperation.UpsertMailboxMessage, {
message: messageAlice,
});
diff --git a/packages/taler-util/src/types-taler-wallet.ts b/packages/taler-util/src/types-taler-wallet.ts
@@ -1796,7 +1796,7 @@ export const codecForMailboxInitializationRequest =
.build("MailboxInitializationRequest");
-export interface AddMailboxMessageRequest {
+export interface UpsertMailboxMessageRequest {
message: MailboxMessageRecord;
}
@@ -1829,17 +1829,17 @@ export const codecForDeleteContactRequest = (): Codec<DeleteContactRequest> =>
.property("contact", codecForContactEntry())
.build("DeleteContactRequest");
-export const codecForAddMailboxMessageRequest =
- (): Codec<AddMailboxMessageRequest> =>
- buildCodecForObject<AddMailboxMessageRequest>()
+export const codecForUpsertMailboxMessageRequest =
+ (): Codec<UpsertMailboxMessageRequest> =>
+ buildCodecForObject<UpsertMailboxMessageRequest>()
.property("message", codecForAny())
- .build("AddContactRequest");
+ .build("UpsertMailboxMessageRequest");
export const codecForDeleteMailboxMessageRequest =
(): Codec<DeleteMailboxMessageRequest> =>
buildCodecForObject<DeleteMailboxMessageRequest>()
.property("message", codecForAny())
- .build("DeleteContactRequest");
+ .build("DeleteMailboxMessageRequest");
export const codecForSendTalerUriMailboxMessageRequest =
(): Codec<SendTalerUriMailboxMessageRequest> =>
diff --git a/packages/taler-wallet-core/src/mailbox.ts b/packages/taler-wallet-core/src/mailbox.ts
@@ -22,7 +22,7 @@
import {
AbsoluteTime,
- AddMailboxMessageRequest,
+ UpsertMailboxMessageRequest,
DeleteMailboxMessageRequest,
Duration,
EmptyObject,
@@ -92,9 +92,9 @@ export function mailboxMetadataMatchesAddress(
/**
* Add message to the database.
*/
-export async function addMailboxMessage(
+export async function upsertMailboxMessage(
wex: WalletExecutionContext,
- req: AddMailboxMessageRequest,
+ req: UpsertMailboxMessageRequest,
): Promise<EmptyObject> {
await wex.runWalletDbTx(async (tx) => {
await tx.upsertMailboxMessage(req.message);
@@ -436,7 +436,7 @@ async function internalRefreshMailbox(
};
records.push(newMessage);
await runWithProgressRetries(wex, async () =>
- await addMailboxMessage(wex, { message: newMessage }),
+ await upsertMailboxMessage(wex, { message: newMessage }),
);
}
diff --git a/packages/taler-wallet-core/src/requests.ts b/packages/taler-wallet-core/src/requests.ts
@@ -165,7 +165,7 @@ import {
codecForAddExchangeRequest,
codecForAddGlobalCurrencyAuditorRequest,
codecForAddGlobalCurrencyExchangeRequest,
- codecForAddMailboxMessageRequest,
+ codecForUpsertMailboxMessageRequest,
codecForAny,
codecForApplyDevExperiment,
codecForCancelProgressToken,
@@ -349,7 +349,7 @@ import {
} from "./exchanges.js";
import { convertDepositAmount } from "./instructedAmountConversion.js";
import {
- addMailboxMessage,
+ upsertMailboxMessage,
deleteMailboxMessage,
getMailbox,
initializeMailbox,
@@ -2602,9 +2602,9 @@ const handlers: { [T in WalletApiOperation]: HandlerWithValidator<T> } = {
codec: codecForSendTalerUriMailboxMessageRequest(),
handler: sendTalerUriMessage,
},
- [WalletApiOperation.AddMailboxMessage]: {
- codec: codecForAddMailboxMessageRequest(),
- handler: addMailboxMessage,
+ [WalletApiOperation.UpsertMailboxMessage]: {
+ codec: codecForUpsertMailboxMessageRequest(),
+ handler: upsertMailboxMessage,
},
[WalletApiOperation.DeleteMailboxMessage]: {
codec: codecForDeleteMailboxMessageRequest(),
diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -40,7 +40,7 @@ import {
AddExchangeResponse,
AddGlobalCurrencyAuditorRequest,
AddGlobalCurrencyExchangeRequest,
- AddMailboxMessageRequest,
+ UpsertMailboxMessageRequest,
AmountResponse,
ApplyDevExperimentRequest,
BalancesResponse,
@@ -376,8 +376,8 @@ export enum WalletApiOperation {
GetContacts = "getContacts",
GetMailbox = "getMailbox",
InitializeMailbox = "initializeMailbox",
- GetMailboxMessages = "getMailboxMessage",
- AddMailboxMessage = "addMailboxMessage",
+ GetMailboxMessages = "getMailboxMessages",
+ UpsertMailboxMessage = "upsertMailboxMessage",
DeleteMailboxMessage = "deleteMailboxMessage",
SendTalerUriMailboxMessage = "sendTalerUriMailboxMessage",
RefreshMailbox = "refreshMailbox",
@@ -693,8 +693,8 @@ export type DeleteMailboxMessageOp = {
* add message.
*/
export type AddMailboxMessageOp = {
- op: WalletApiOperation.AddMailboxMessage;
- request: AddMailboxMessageRequest;
+ op: WalletApiOperation.UpsertMailboxMessage;
+ request: UpsertMailboxMessageRequest;
response: EmptyObject;
};
@@ -2275,7 +2275,7 @@ export type WalletOperations = {
[WalletApiOperation.GetContacts]: GetContactsOp;
[WalletApiOperation.GetMailboxMessages]: GetMailboxMessagesOp;
[WalletApiOperation.DeleteMailboxMessage]: DeleteMailboxMessageOp;
- [WalletApiOperation.AddMailboxMessage]: AddMailboxMessageOp;
+ [WalletApiOperation.UpsertMailboxMessage]: AddMailboxMessageOp;
[WalletApiOperation.RegisterAlias]: RegisterAliasOp;
[WalletApiOperation.CompleteRegisterAlias]: CompleteRegisterAliasOp;
[WalletApiOperation.LookupAlias]: LookupAliasOp;