Fix tests

prosopo · Apr 23, 2024 · b688b4b · b688b4b
1 parent f14ce03
commit b688b4b
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 23 deletions.
diff --git a/examples/plugins/output/events/my_psp22.ts b/examples/plugins/output/events/my_psp22.ts
@@ -32,7 +32,7 @@ export default class EventsClass {
 					const [address, data] = record.event.data;
 
 					if (address.toString() === this.__nativeContract.address.toString()) {
-						const {args, event} = this.__nativeContract.abi.decodeEvent(data);
+						const {args, event} = this.__nativeContract.abi.decodeEvent(record);
 
 						if (filter(event.identifier.toString()))
 							callback(args, event);
@@ -42,4 +42,4 @@ export default class EventsClass {
 		});
 	}
 
-}
+}
diff --git a/examples/plugins/output/shared/utils.ts b/examples/plugins/output/shared/utils.ts
@@ -20,7 +20,7 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 	}).map((record: any) => {
 		const [address, data] = record.event.data;
 
-		const {args, event} = contract.abi.decodeEvent(data);
+		const {args, event} = contract.abi.decodeEvent(record);
 
 		const _event: Record < string, any > = {};
 
@@ -35,4 +35,4 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 			args: _event,
 		};
 	});
-}
+}
diff --git a/examples/psp22/out/events/my_psp22.ts b/examples/psp22/out/events/my_psp22.ts
@@ -32,7 +32,7 @@ export default class EventsClass {
 					const [address, data] = record.event.data;
 
 					if (address.toString() === this.__nativeContract.address.toString()) {
-						const {args, event} = this.__nativeContract.abi.decodeEvent(data);
+						const {args, event} = this.__nativeContract.abi.decodeEvent(record);
 
 						if (filter(event.identifier.toString()))
 							callback(args, event);
@@ -42,4 +42,4 @@ export default class EventsClass {
 		});
 	}
 
-}
+}
diff --git a/examples/psp22/out/shared/utils.ts b/examples/psp22/out/shared/utils.ts
@@ -20,7 +20,7 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 	}).map((record: any) => {
 		const [address, data] = record.event.data;
 
-		const {args, event} = contract.abi.decodeEvent(data);
+		const {args, event} = contract.abi.decodeEvent(record);
 
 		const _event: Record < string, any > = {};
 
@@ -35,4 +35,4 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 			args: _event,
 		};
 	});
-}
+}
diff --git a/examples/psp34/out/events/my_psp34.ts b/examples/psp34/out/events/my_psp34.ts
@@ -32,7 +32,7 @@ export default class EventsClass {
 					const [address, data] = record.event.data;
 
 					if (address.toString() === this.__nativeContract.address.toString()) {
-						const {args, event} = this.__nativeContract.abi.decodeEvent(data);
+						const {args, event} = this.__nativeContract.abi.decodeEvent(record);
 
 						if (filter(event.identifier.toString()))
 							callback(args, event);
@@ -42,4 +42,4 @@ export default class EventsClass {
 		});
 	}
 
-}
+}
diff --git a/examples/psp34/out/shared/utils.ts b/examples/psp34/out/shared/utils.ts
@@ -20,7 +20,7 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 	}).map((record: any) => {
 		const [address, data] = record.event.data;
 
-		const {args, event} = contract.abi.decodeEvent(data);
+		const {args, event} = contract.abi.decodeEvent(record);
 
 		const _event: Record < string, any > = {};
 
@@ -35,4 +35,4 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 			args: _event,
 		};
 	});
-}
+}
diff --git a/examples/psp34_enumerable/out/events/my_psp34_enumerable.ts b/examples/psp34_enumerable/out/events/my_psp34_enumerable.ts
@@ -32,7 +32,7 @@ export default class EventsClass {
 					const [address, data] = record.event.data;
 
 					if (address.toString() === this.__nativeContract.address.toString()) {
-						const {args, event} = this.__nativeContract.abi.decodeEvent(data);
+						const {args, event} = this.__nativeContract.abi.decodeEvent(record);
 
 						if (filter(event.identifier.toString()))
 							callback(args, event);
@@ -42,4 +42,4 @@ export default class EventsClass {
 		});
 	}
 
-}
+}
diff --git a/examples/psp34_enumerable/out/shared/utils.ts b/examples/psp34_enumerable/out/shared/utils.ts
@@ -20,7 +20,7 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 	}).map((record: any) => {
 		const [address, data] = record.event.data;
 
-		const {args, event} = contract.abi.decodeEvent(data);
+		const {args, event} = contract.abi.decodeEvent(record);
 
 		const _event: Record < string, any > = {};
 
@@ -35,4 +35,4 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 			args: _event,
 		};
 	});
-}
+}
diff --git a/packages/typechain-polkadot/src/templates/events.hbs b/packages/typechain-polkadot/src/templates/events.hbs
@@ -48,7 +48,7 @@ export default class EventsClass {
 					const [address, data] = record.event.data;
 
 					if (address.toString() === this.__nativeContract.address.toString()) {
-						const {args, event} = this.__nativeContract.abi.decodeEvent(data);
+						const {args, event} = this.__nativeContract.abi.decodeEvent(record);
 
 						if (filter(event.identifier.toString()))
 							callback(args, event);
@@ -58,4 +58,4 @@ export default class EventsClass {
 		});
 	}
 
-}
+}
diff --git a/packages/typechain-polkadot/src/templates/raw/shared/utils.ts b/packages/typechain-polkadot/src/templates/raw/shared/utils.ts
@@ -18,9 +18,8 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 
 		return event.method == 'ContractEmitted' && address.toString() === contract.address.toString();
 	}).map((record: any) => {
-		const [address, data] = record.event.data;
 
-		const {args, event} = contract.abi.decodeEvent(data);
+		const {args, event} = contract.abi.decodeEvent(record);
 
 		const _event: Record < string, any > = {};
 
@@ -35,4 +34,4 @@ export function decodeEvents(events: any[], contract: ContractPromise, types: an
 			args: _event,
 		};
 	});
-}
+}
diff --git a/tests/events/general.test.ts b/tests/events/general.test.ts
@@ -52,7 +52,7 @@ describe("Events", () => {
 			}
 		];
 
-		contract.events.subscribeOnTransferEvent((event) => {
+		await contract.events.subscribeOnTransferEvent((event) => {
 			expect(event).toMatchObject(eventsToBeSent[eventsCount]!);
 
 			eventsCount++;
@@ -99,4 +99,4 @@ describe("Events", () => {
 		});
 	});
 
-});
+});