From c013e2a6f4b14af9570f0de220cb80ae752ef1b7 Mon Sep 17 00:00:00 2001 From: Keith Date: Sat, 2 Nov 2019 22:00:54 +0200 Subject: [PATCH 1/5] combine values --- packages/api-contract/src/base/Contract.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/api-contract/src/base/Contract.ts b/packages/api-contract/src/base/Contract.ts index 5b230af658c1..477d2fcb455c 100644 --- a/packages/api-contract/src/base/Contract.ts +++ b/packages/api-contract/src/base/Contract.ts @@ -71,6 +71,7 @@ export default class Contract extends BaseWithTxAndRpc let output: string; if (result.isSuccess) { const { data } = result.asSuccess; + console.log(data.toHex()); output = message.returnType ? formatData(data, message.returnType).toString() : data.toHex(); From 856a705b3b51a1b83afbddc98462161cfd5320c6 Mon Sep 17 00:00:00 2001 From: Keith Date: Sat, 9 Nov 2019 08:50:11 +0100 Subject: [PATCH 2/5] findRecord newest --- packages/api/src/submittable/Result.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/api/src/submittable/Result.ts b/packages/api/src/submittable/Result.ts index 3db258b2388c..fb19e0544e9d 100644 --- a/packages/api/src/submittable/Result.ts +++ b/packages/api/src/submittable/Result.ts @@ -10,7 +10,7 @@ export default class SubmittableResult implements SubmittableResultImpl { public readonly status: ExtrinsicStatus; - constructor ({ events, status }: SubmittableResultValue) { + public constructor ({ events, status }: SubmittableResultValue) { this.events = events || []; this.status = status; } @@ -30,8 +30,8 @@ export default class SubmittableResult implements SubmittableResultImpl { /** * @description Finds an EventRecord for the specified method & section */ - public findRecord (section: string, method: string): EventRecord | undefined { - return this.events.find(({ event }): boolean => + public findRecord (section: string, method: string, newest?: boolean): EventRecord | undefined { + return (newest ? this.events.reverse() : this.events).find(({ event }): boolean => event.section === section && event.method === method ); } From 83570632b5461b0241b861660dc0046beab90a2b Mon Sep 17 00:00:00 2001 From: Keith Date: Sat, 9 Nov 2019 09:36:17 +0100 Subject: [PATCH 3/5] constructor --- packages/api/src/submittable/Result.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/submittable/Result.ts b/packages/api/src/submittable/Result.ts index fb19e0544e9d..982adc1813da 100644 --- a/packages/api/src/submittable/Result.ts +++ b/packages/api/src/submittable/Result.ts @@ -10,7 +10,7 @@ export default class SubmittableResult implements SubmittableResultImpl { public readonly status: ExtrinsicStatus; - public constructor ({ events, status }: SubmittableResultValue) { + constructor ({ events, status }: SubmittableResultValue) { this.events = events || []; this.status = status; } From 6b60bf655559f6dca1a8adecff60e0200ea6cf18 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 9 Nov 2019 11:11:13 +0100 Subject: [PATCH 4/5] Add filterRecords --- packages/api/src/submittable/Result.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/api/src/submittable/Result.ts b/packages/api/src/submittable/Result.ts index 982adc1813da..7f4e0a7f1af7 100644 --- a/packages/api/src/submittable/Result.ts +++ b/packages/api/src/submittable/Result.ts @@ -27,11 +27,20 @@ export default class SubmittableResult implements SubmittableResultImpl { return this.status.isFinalized; } + /** + * @description Filters EventRecords for the specified method & section (there could be multiple) + */ + public filterRecords (section: string, method: string): EventRecord[] { + return this.events.filter(({ event }): boolean => + event.section === section && event.method === method + ); + } + /** * @description Finds an EventRecord for the specified method & section */ - public findRecord (section: string, method: string, newest?: boolean): EventRecord | undefined { - return (newest ? this.events.reverse() : this.events).find(({ event }): boolean => + public findRecord (section: string, method: string): EventRecord | undefined { + return this.events.find(({ event }): boolean => event.section === section && event.method === method ); } From 5b8c00e0afd461762c4688d8b427413bec536f0b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 9 Nov 2019 11:18:39 +0100 Subject: [PATCH 5/5] Update interface --- packages/api/src/submittable/types.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/api/src/submittable/types.ts b/packages/api/src/submittable/types.ts index e2fb08eec215..ef8b870f2b0c 100644 --- a/packages/api/src/submittable/types.ts +++ b/packages/api/src/submittable/types.ts @@ -15,7 +15,8 @@ export interface SubmittableResultImpl { readonly isError: boolean; readonly isFinalized: boolean; - findRecord(section: string, method: string): EventRecord | undefined; + filterRecords (section: string, method: string): EventRecord[]; + findRecord (section: string, method: string): EventRecord | undefined; } export interface SubmittableResultValue {