Skip to content

Commit 639c447

Browse files
Richard BRichard B
authored andcommitted
wrapped Upward for RejectReason in blockItemSummary
Jira-Id: COR-1843
1 parent 460aab9 commit 639c447

File tree

8 files changed

+17
-16
lines changed

8 files changed

+17
-16
lines changed

examples/nodejs/client/getBlockItemStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const client = new ConcordiumGRPCNodeClient(
9494
const { failedTransactionType, rejectReason } = summary;
9595
console.log(
9696
'Transaction of type "' + failedTransactionType + '" failed because:',
97-
rejectReason.tag
97+
rejectReason?.tag ?? "undefined"
9898
);
9999
break;
100100
default:

examples/nodejs/plt/modify-list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ const client = new ConcordiumGRPCNodeClient(
156156
});
157157
break;
158158
case TransactionKindString.Failed:
159-
if (result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
160-
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason.tag);
159+
if (!result.summary.rejectReason || result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
160+
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason?.tag);
161161
}
162162
const details = Cbor.decode(result.summary.rejectReason.contents.details);
163163
console.error(result.summary.rejectReason.contents, details);

examples/nodejs/plt/pause.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ const client = new ConcordiumGRPCNodeClient(
121121
});
122122
break;
123123
case TransactionKindString.Failed:
124-
if (result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
125-
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason.tag);
124+
if (!result.summary.rejectReason || result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
125+
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason?.tag);
126126
}
127127
const details = Cbor.decode(result.summary.rejectReason.contents.details);
128128
console.error(result.summary.rejectReason.contents, details);

examples/nodejs/plt/transfer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ const client = new ConcordiumGRPCNodeClient(
129129
result.summary.events.forEach((e) => console.log(e));
130130
break;
131131
case TransactionKindString.Failed:
132-
if (result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
133-
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason.tag);
132+
if (!result.summary.rejectReason || result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
133+
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason?.tag);
134134
}
135135
const details = Cbor.decode(result.summary.rejectReason.contents.details);
136136
console.error(result.summary.rejectReason.contents, details);

examples/nodejs/plt/update-supply.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ const client = new ConcordiumGRPCNodeClient(addr, Number(port), credentials.crea
123123
result.summary.events.forEach((e) => console.log(e));
124124
break;
125125
case TransactionKindString.Failed:
126-
if (result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
127-
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason.tag);
126+
if (!result.summary.rejectReason || result.summary.rejectReason.tag !== RejectReasonTag.TokenUpdateTransactionFailed) {
127+
throw new Error('Unexpected reject reason tag: ' + result.summary.rejectReason?.tag);
128128
}
129129
const details = Cbor.decode(result.summary.rejectReason.contents.details);
130130
console.error(result.summary.rejectReason.contents, details);

packages/sdk/src/grpc/translation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ function trDelegationEvent(
10111011
}
10121012

10131013
function trRejectReason(rejectReason: GRPC.RejectReason | undefined): Upward<SDK.RejectReason> {
1014-
function simpleReason(tag: SDK.SimpleRejectReasonTag): Upward<SDK.RejectReason> {
1014+
function simpleReason(tag: SDK.SimpleRejectReasonTag): SDK.RejectReason {
10151015
return {
10161016
tag: SDK.RejectReasonTag[tag],
10171017
};

packages/sdk/src/types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/**
22
* @module Common GRPC-Client
33
*/
4+
import type { Upward } from './grpc/upward.js';
45
import { Cbor, TokenId } from './plt/index.js';
56
import { TokenAccountInfo } from './plt/types.js';
67
import * as AccountAddress from './types/AccountAddress.js';
@@ -1590,7 +1591,7 @@ export interface InvokeContractSuccessResult {
15901591
export interface InvokeContractFailedResult {
15911592
tag: 'failure';
15921593
usedEnergy: Energy.Type;
1593-
reason: RejectReason;
1594+
reason: Upward<RejectReason>;
15941595
/**
15951596
* Return value from smart contract call, used to provide error messages.
15961597
* Is only defined when smart contract instance is a V1 smart contract and

packages/sdk/src/types/blockItemSummary.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ export interface UpdateCredentialsSummary {
210210
export interface FailedTransactionSummary {
211211
transactionType: TransactionKindString.Failed;
212212
failedTransactionType?: TransactionKindString;
213-
rejectReason: RejectReason;
213+
rejectReason: Upward<RejectReason>;
214214
}
215215

216216
/**
@@ -389,15 +389,15 @@ export const isSuccessTransaction = (
389389
*
390390
* @param {BlockItemSummary} summary - The block item summary to check.
391391
*
392-
* @returns {RejectReason | undfined} Reject reason if `summary` is a rejected transaction. Otherwise returns undefined.
392+
* @returns {RejectReason | undefined} Reject reason if `summary` is a rejected transaction. Otherwise returns undefined.
393393
*/
394-
export function getTransactionRejectReason<T extends FailedTransactionSummary>(summary: T): RejectReason;
394+
export function getTransactionRejectReason<T extends FailedTransactionSummary>(summary: T): Upward<RejectReason>;
395395
export function getTransactionRejectReason(summary: AccountCreationSummary | UpdateSummary): undefined;
396396
export function getTransactionRejectReason(
397397
summary: Exclude<AccountTransactionSummary, FailedTransactionSummary>
398398
): undefined;
399-
export function getTransactionRejectReason(summary: BlockItemSummary): RejectReason | undefined;
400-
export function getTransactionRejectReason(summary: BlockItemSummary): RejectReason | undefined {
399+
export function getTransactionRejectReason(summary: BlockItemSummary): Upward<RejectReason> | undefined;
400+
export function getTransactionRejectReason(summary: BlockItemSummary): Upward<RejectReason> | undefined {
401401
if (!isRejectTransaction(summary)) {
402402
return undefined;
403403
}

0 commit comments

Comments
 (0)