Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix transaction sender methods and error handling #167

Merged
merged 4 commits into from
Dec 6, 2023
Merged

Fix transaction sender methods and error handling #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d2bf58
fix(transaction): update optional parameters in send method
Rudy-Perrin Dec 5, 2023
8f0ec20
refactor(transaction_sender): remove unnecessary return statement
Rudy-Perrin Dec 5, 2023
4af9fe6
refactor(transaction_sender): fix error handling
Rudy-Perrin Dec 5, 2023
f65df0e
refactor(transaction_sender): fix destructuring assignment
Rudy-Perrin Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class ExtendedTransactionBuilder extends TransactionBuilder {
}

//Override TransactionSender.send to use the node resolution
send(confirmationThreshold: number, timeout: number) {
send(confirmationThreshold?: number, timeout?: number) {
this.core.requestNode((endpoint) => this.sender.send(this, endpoint, confirmationThreshold, timeout));
}

Expand Down
16 changes: 7 additions & 9 deletions src/transaction_sender.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ export default class TransactionSender {

this.timeout = undefined;
this.nbConfirmationReceived = 0;

return this;
}

/**
Expand Down Expand Up @@ -71,19 +69,19 @@ export default class TransactionSender {
break;

default:
throw "Event " + event + " is not supported";
throw new Error("Event " + event + " is not supported");
}

return this;
}

async send(tx: TransactionBuilder, endpoint: string, confirmationThreshold: number = 100, timeout: number = 60) {
if (confirmationThreshold < 0 && confirmationThreshold > 100) {
throw "'confirmationThreshold' must be an integer between 0 and 100";
if (confirmationThreshold < 0 || confirmationThreshold > 100) {
throw new Error("'confirmationThreshold' must be an integer between 0 and 100");
}

if (timeout <= 0) {
throw "'timeout' must be an integer greater than 0";
throw new Error("'timeout' must be an integer greater than 0");
}

const txAddress = uint8ArrayToHex(tx.address);
Expand Down Expand Up @@ -148,7 +146,7 @@ export default class TransactionSender {
break;

default:
throw "Event " + event + " is not supported";
throw new Error("Event " + event + " is not supported");
}
} else {
absinthe.cancel(this.absintheSocket as AbsintheSocket, this.confirmationNotifier);
Expand Down Expand Up @@ -179,7 +177,7 @@ async function waitConfirmations(
const notifier = absinthe.send(absintheSocket, operation);
return absinthe.observe(absintheSocket, notifier, (result: any) => {
if (result.data.transactionConfirmed) {
const { nbConfirmations: nbConfirmations, maxConfirmations: maxConfirmations } = result.data.transactionConfirmed;
const { nbConfirmations, maxConfirmations } = result.data.transactionConfirmed;

handler(nbConfirmations, maxConfirmations);
}
Expand All @@ -198,7 +196,7 @@ async function waitError(address: string | Uint8Array, absintheSocket: any, hand
const notifier = absinthe.send(absintheSocket, operation);
return absinthe.observe(absintheSocket, notifier, (result: any) => {
if (result.data.transactionError) {
const { context: context, reason: reason } = result.data.transactionError;
const { context, reason } = result.data.transactionError;
handler(context, reason);
}
});
Expand Down
Loading