Add more tests, consolidate types

delvtech · Nov 29, 2024 · c31860a · c31860a
1 parent 4c2c643
commit c31860a
Show file tree

Hide file tree

Showing 6 changed files with 260 additions and 146 deletions.
diff --git a/packages/drift/src/adapter/types/Adapter.ts b/packages/drift/src/adapter/types/Adapter.ts
@@ -61,6 +61,11 @@ export interface WriteAdapter {
 
 export interface ReadWriteAdapter extends ReadAdapter, WriteAdapter {}
 
+export interface ContractParams<TAbi extends Abi = Abi> {
+  abi: TAbi;
+  address: Address;
+}
+
 export type FunctionArgsParam<
   TAbi extends Abi = Abi,
   TFunctionName extends FunctionName<TAbi> = FunctionName<TAbi>,
@@ -82,19 +87,16 @@ export type ReadParams<
     TAbi,
     "pure" | "view"
   >,
-> = {
-  abi: TAbi;
-  address: Address;
+> = ContractParams<TAbi> & {
   fn: TFunctionName;
 } & FunctionArgsParam<TAbi, TFunctionName> &
   ContractReadOptions;
 
 export interface GetEventsParams<
   TAbi extends Abi = Abi,
   TEventName extends EventName<TAbi> = EventName<TAbi>,
-> extends ContractGetEventsOptions<TAbi, TEventName> {
-  abi: TAbi;
-  address: Address;
+> extends ContractParams<TAbi>,
+    ContractGetEventsOptions<TAbi, TEventName> {
   event: TEventName;
 }
 
@@ -104,9 +106,7 @@ export type SimulateWriteParams<
     TAbi,
     "nonpayable" | "payable"
   > = FunctionName<TAbi, "nonpayable" | "payable">,
-> = {
-  abi: TAbi;
-  address: Address;
+> = ContractParams<TAbi> & {
   fn: TFunctionName;
 } & FunctionArgsParam<TAbi, TFunctionName> &
   ContractWriteOptions;