refactor(provider): removed event as non response type from response …

…types
starknet-io · Dec 13, 2023 · 6b77f54 · 6b77f54
1 parent 7ecb069
commit 6b77f54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/types/api/rpcspec_0_6/nonspec.ts b/src/types/api/rpcspec_0_6/nonspec.ts
@@ -12,6 +12,8 @@ import {
   CONTRACT_CLASS,
   CONTRACT_STORAGE_DIFF_ITEM,
   DEPRECATED_CONTRACT_CLASS,
+  EMITTED_EVENT,
+  EVENT,
   EVENTS_CHUNK,
   EVENT_FILTER,
   FEE_ESTIMATE,
@@ -65,6 +67,8 @@ export type BlockTransactionsTraces = { transaction_hash: FELT; trace_root: TRAN
 export type Syncing = false | SYNC_STATUS;
 // response starknet_getEvents
 export type Events = EVENTS_CHUNK;
+export type EmittedEvent = EMITTED_EVENT;
+export type Event = EVENT;
 // response starknet_addInvokeTransaction
 export type InvokedTransaction = { transaction_hash: TXN_HASH };
 // response starknet_addDeclareTransaction

diff --git a/src/types/provider/response.ts b/src/types/provider/response.ts
@@ -33,13 +33,6 @@ export type Block = {
 
 export type GetTransactionResponse = RPC.TransactionWithHash;
 
-// TODO: solve this one
-export interface Event {
-  from_address: string;
-  keys: Array<string>;
-  data: Array<string>;
-}
-
 // TODO Check if can be pending discriminated
 export type GetTransactionReceiptResponse = RPC.Receipt | RPC.PendingReceipt;
 // Spread individual types for usage convenience

diff --git a/src/utils/events/index.ts b/src/utils/events/index.ts
@@ -8,8 +8,8 @@ import {
   LegacyEvent,
   ParsedEvent,
   ParsedEvents,
+  RPC,
 } from '../../types';
-import { Event as ProviderEvent } from '../../types/provider/response';
 import responseParser from '../calldata/responseParser';
 import { starkCurve } from '../ec';
 import { addHexPrefix, utf8ToArray } from '../encode';
@@ -36,7 +36,7 @@ export function getAbiEvents(abi: Abi): AbiEvents {
  * @return ParsedEvents - parsed events corresponding to the abi
  */
 export function parseEvents(
-  providerReceivedEvents: Array<ProviderEvent>,
+  providerReceivedEvents: RPC.Event[],
   abiEvents: AbiEvents,
   abiStructs: AbiStructs,
   abiEnums: AbiEnums