@@ -2,20 +2,20 @@ import { JsonRpcError, EthereumProviderError } from './classes';
22import { errorCodes } from './error-constants' ;
33import { OptionalDataWithOptionalCause , getMessageFromCode } from './utils' ;
44
5- type EthereumErrorOptions < T extends OptionalDataWithOptionalCause > = {
5+ type EthereumErrorOptions < Data extends OptionalDataWithOptionalCause > = {
66 message ?: string ;
7- data ?: T ;
7+ data ?: Data ;
88} ;
99
10- type ServerErrorOptions < T extends OptionalDataWithOptionalCause > = {
10+ type ServerErrorOptions < Data extends OptionalDataWithOptionalCause > = {
1111 code : number ;
12- } & EthereumErrorOptions < T > ;
12+ } & EthereumErrorOptions < Data > ;
1313
14- type CustomErrorArg < T extends OptionalDataWithOptionalCause > =
15- ServerErrorOptions < T > ;
14+ type CustomErrorArg < Data extends OptionalDataWithOptionalCause > =
15+ ServerErrorOptions < Data > ;
1616
17- type JsonRpcErrorsArg < T extends OptionalDataWithOptionalCause > =
18- | EthereumErrorOptions < T >
17+ type JsonRpcErrorsArg < Data extends OptionalDataWithOptionalCause > =
18+ | EthereumErrorOptions < Data >
1919 | string ;
2020
2121export const rpcErrors = {
@@ -25,7 +25,7 @@ export const rpcErrors = {
2525 * @param arg - The error message or options bag.
2626 * @returns An instance of the {@link JsonRpcError} class.
2727 */
28- parse : < T extends OptionalDataWithOptionalCause > ( arg ?: JsonRpcErrorsArg < T > ) =>
28+ parse : < Data extends OptionalDataWithOptionalCause > ( arg ?: JsonRpcErrorsArg < Data > ) =>
2929 getJsonRpcError ( errorCodes . rpc . parse , arg ) ,
3030
3131 /**
@@ -34,8 +34,8 @@ export const rpcErrors = {
3434 * @param arg - The error message or options bag.
3535 * @returns An instance of the {@link JsonRpcError} class.
3636 */
37- invalidRequest : < T extends OptionalDataWithOptionalCause > (
38- arg ?: JsonRpcErrorsArg < T > ,
37+ invalidRequest : < Data extends OptionalDataWithOptionalCause > (
38+ arg ?: JsonRpcErrorsArg < Data > ,
3939 ) => getJsonRpcError ( errorCodes . rpc . invalidRequest , arg ) ,
4040
4141 /**
@@ -44,8 +44,8 @@ export const rpcErrors = {
4444 * @param arg - The error message or options bag.
4545 * @returns An instance of the {@link JsonRpcError} class.
4646 */
47- invalidParams : < T extends OptionalDataWithOptionalCause > (
48- arg ?: JsonRpcErrorsArg < T > ,
47+ invalidParams : < Data extends OptionalDataWithOptionalCause > (
48+ arg ?: JsonRpcErrorsArg < Data > ,
4949 ) => getJsonRpcError ( errorCodes . rpc . invalidParams , arg ) ,
5050
5151 /**
@@ -54,8 +54,8 @@ export const rpcErrors = {
5454 * @param arg - The error message or options bag.
5555 * @returns An instance of the {@link JsonRpcError} class.
5656 */
57- methodNotFound : < T extends OptionalDataWithOptionalCause > (
58- arg ?: JsonRpcErrorsArg < T > ,
57+ methodNotFound : < Data extends OptionalDataWithOptionalCause > (
58+ arg ?: JsonRpcErrorsArg < Data > ,
5959 ) => getJsonRpcError ( errorCodes . rpc . methodNotFound , arg ) ,
6060
6161 /**
@@ -64,8 +64,8 @@ export const rpcErrors = {
6464 * @param arg - The error message or options bag.
6565 * @returns An instance of the {@link JsonRpcError} class.
6666 */
67- internal : < T extends OptionalDataWithOptionalCause > (
68- arg ?: JsonRpcErrorsArg < T > ,
67+ internal : < Data extends OptionalDataWithOptionalCause > (
68+ arg ?: JsonRpcErrorsArg < Data > ,
6969 ) => getJsonRpcError ( errorCodes . rpc . internal , arg ) ,
7070
7171 /**
@@ -76,8 +76,8 @@ export const rpcErrors = {
7676 * @param opts - The error options bag.
7777 * @returns An instance of the {@link JsonRpcError} class.
7878 */
79- server : < T extends OptionalDataWithOptionalCause > (
80- opts : ServerErrorOptions < T > ,
79+ server : < Data extends OptionalDataWithOptionalCause > (
80+ opts : ServerErrorOptions < Data > ,
8181 ) => {
8282 if ( ! opts || typeof opts !== 'object' || Array . isArray ( opts ) ) {
8383 throw new Error (
@@ -99,8 +99,8 @@ export const rpcErrors = {
9999 * @param arg - The error message or options bag.
100100 * @returns An instance of the {@link JsonRpcError} class.
101101 */
102- invalidInput : < T extends OptionalDataWithOptionalCause > (
103- arg ?: JsonRpcErrorsArg < T > ,
102+ invalidInput : < Data extends OptionalDataWithOptionalCause > (
103+ arg ?: JsonRpcErrorsArg < Data > ,
104104 ) => getJsonRpcError ( errorCodes . rpc . invalidInput , arg ) ,
105105
106106 /**
@@ -109,8 +109,8 @@ export const rpcErrors = {
109109 * @param arg - The error message or options bag.
110110 * @returns An instance of the {@link JsonRpcError} class.
111111 */
112- resourceNotFound : < T extends OptionalDataWithOptionalCause > (
113- arg ?: JsonRpcErrorsArg < T > ,
112+ resourceNotFound : < Data extends OptionalDataWithOptionalCause > (
113+ arg ?: JsonRpcErrorsArg < Data > ,
114114 ) => getJsonRpcError ( errorCodes . rpc . resourceNotFound , arg ) ,
115115
116116 /**
@@ -119,8 +119,8 @@ export const rpcErrors = {
119119 * @param arg - The error message or options bag.
120120 * @returns An instance of the {@link JsonRpcError} class.
121121 */
122- resourceUnavailable : < T extends OptionalDataWithOptionalCause > (
123- arg ?: JsonRpcErrorsArg < T > ,
122+ resourceUnavailable : < Data extends OptionalDataWithOptionalCause > (
123+ arg ?: JsonRpcErrorsArg < Data > ,
124124 ) => getJsonRpcError ( errorCodes . rpc . resourceUnavailable , arg ) ,
125125
126126 /**
@@ -129,8 +129,8 @@ export const rpcErrors = {
129129 * @param arg - The error message or options bag.
130130 * @returns An instance of the {@link JsonRpcError} class.
131131 */
132- transactionRejected : < T extends OptionalDataWithOptionalCause > (
133- arg ?: JsonRpcErrorsArg < T > ,
132+ transactionRejected : < Data extends OptionalDataWithOptionalCause > (
133+ arg ?: JsonRpcErrorsArg < Data > ,
134134 ) => getJsonRpcError ( errorCodes . rpc . transactionRejected , arg ) ,
135135
136136 /**
@@ -139,8 +139,8 @@ export const rpcErrors = {
139139 * @param arg - The error message or options bag.
140140 * @returns An instance of the {@link JsonRpcError} class.
141141 */
142- methodNotSupported : < T extends OptionalDataWithOptionalCause > (
143- arg ?: JsonRpcErrorsArg < T > ,
142+ methodNotSupported : < Data extends OptionalDataWithOptionalCause > (
143+ arg ?: JsonRpcErrorsArg < Data > ,
144144 ) => getJsonRpcError ( errorCodes . rpc . methodNotSupported , arg ) ,
145145
146146 /**
@@ -149,8 +149,8 @@ export const rpcErrors = {
149149 * @param arg - The error message or options bag.
150150 * @returns An instance of the {@link JsonRpcError} class.
151151 */
152- limitExceeded : < T extends OptionalDataWithOptionalCause > (
153- arg ?: JsonRpcErrorsArg < T > ,
152+ limitExceeded : < Data extends OptionalDataWithOptionalCause > (
153+ arg ?: JsonRpcErrorsArg < Data > ,
154154 ) => getJsonRpcError ( errorCodes . rpc . limitExceeded , arg ) ,
155155} ;
156156
@@ -161,8 +161,8 @@ export const providerErrors = {
161161 * @param arg - The error message or options bag.
162162 * @returns An instance of the {@link EthereumProviderError} class.
163163 */
164- userRejectedRequest : < T extends OptionalDataWithOptionalCause > (
165- arg ?: JsonRpcErrorsArg < T > ,
164+ userRejectedRequest : < Data extends OptionalDataWithOptionalCause > (
165+ arg ?: JsonRpcErrorsArg < Data > ,
166166 ) => {
167167 return getEthProviderError ( errorCodes . provider . userRejectedRequest , arg ) ;
168168 } ,
@@ -173,8 +173,8 @@ export const providerErrors = {
173173 * @param arg - The error message or options bag.
174174 * @returns An instance of the {@link EthereumProviderError} class.
175175 */
176- unauthorized : < T extends OptionalDataWithOptionalCause > (
177- arg ?: JsonRpcErrorsArg < T > ,
176+ unauthorized : < Data extends OptionalDataWithOptionalCause > (
177+ arg ?: JsonRpcErrorsArg < Data > ,
178178 ) => {
179179 return getEthProviderError ( errorCodes . provider . unauthorized , arg ) ;
180180 } ,
@@ -185,8 +185,8 @@ export const providerErrors = {
185185 * @param arg - The error message or options bag.
186186 * @returns An instance of the {@link EthereumProviderError} class.
187187 */
188- unsupportedMethod : < T extends OptionalDataWithOptionalCause > (
189- arg ?: JsonRpcErrorsArg < T > ,
188+ unsupportedMethod : < Data extends OptionalDataWithOptionalCause > (
189+ arg ?: JsonRpcErrorsArg < Data > ,
190190 ) => {
191191 return getEthProviderError ( errorCodes . provider . unsupportedMethod , arg ) ;
192192 } ,
@@ -197,8 +197,8 @@ export const providerErrors = {
197197 * @param arg - The error message or options bag.
198198 * @returns An instance of the {@link EthereumProviderError} class.
199199 */
200- disconnected : < T extends OptionalDataWithOptionalCause > (
201- arg ?: JsonRpcErrorsArg < T > ,
200+ disconnected : < Data extends OptionalDataWithOptionalCause > (
201+ arg ?: JsonRpcErrorsArg < Data > ,
202202 ) => {
203203 return getEthProviderError ( errorCodes . provider . disconnected , arg ) ;
204204 } ,
@@ -209,8 +209,8 @@ export const providerErrors = {
209209 * @param arg - The error message or options bag.
210210 * @returns An instance of the {@link EthereumProviderError} class.
211211 */
212- chainDisconnected : < T extends OptionalDataWithOptionalCause > (
213- arg ?: JsonRpcErrorsArg < T > ,
212+ chainDisconnected : < Data extends OptionalDataWithOptionalCause > (
213+ arg ?: JsonRpcErrorsArg < Data > ,
214214 ) => {
215215 return getEthProviderError ( errorCodes . provider . chainDisconnected , arg ) ;
216216 } ,
@@ -221,8 +221,8 @@ export const providerErrors = {
221221 * @param opts - The error options bag.
222222 * @returns An instance of the {@link EthereumProviderError} class.
223223 */
224- custom : < T extends OptionalDataWithOptionalCause > (
225- opts : CustomErrorArg < T > ,
224+ custom : < Data extends OptionalDataWithOptionalCause > (
225+ opts : CustomErrorArg < Data > ,
226226 ) => {
227227 if ( ! opts || typeof opts !== 'object' || Array . isArray ( opts ) ) {
228228 throw new Error (
@@ -246,10 +246,10 @@ export const providerErrors = {
246246 * @param arg - The error message or options bag.
247247 * @returns An instance of the {@link JsonRpcError} class.
248248 */
249- function getJsonRpcError < T extends OptionalDataWithOptionalCause > (
249+ function getJsonRpcError < Data extends OptionalDataWithOptionalCause > (
250250 code : number ,
251- arg ?: JsonRpcErrorsArg < T > ,
252- ) : JsonRpcError < T > {
251+ arg ?: JsonRpcErrorsArg < Data > ,
252+ ) : JsonRpcError < Data > {
253253 const [ message , data ] = parseOpts ( arg ) ;
254254 return new JsonRpcError ( code , message ?? getMessageFromCode ( code ) , data ) ;
255255}
@@ -261,10 +261,10 @@ function getJsonRpcError<T extends OptionalDataWithOptionalCause>(
261261 * @param arg - The error message or options bag.
262262 * @returns An instance of the {@link EthereumProviderError} class.
263263 */
264- function getEthProviderError < T extends OptionalDataWithOptionalCause > (
264+ function getEthProviderError < Data extends OptionalDataWithOptionalCause > (
265265 code : number ,
266- arg ?: JsonRpcErrorsArg < T > ,
267- ) : EthereumProviderError < T > {
266+ arg ?: JsonRpcErrorsArg < Data > ,
267+ ) : EthereumProviderError < Data > {
268268 const [ message , data ] = parseOpts ( arg ) ;
269269 return new EthereumProviderError (
270270 code ,
@@ -279,9 +279,9 @@ function getEthProviderError<T extends OptionalDataWithOptionalCause>(
279279 * @param arg - The error message or options bag.
280280 * @returns A tuple containing the error message and optional data.
281281 */
282- function parseOpts < T extends OptionalDataWithOptionalCause > (
283- arg ?: JsonRpcErrorsArg < T > ,
284- ) : [ message ?: string | undefined , data ?: T | undefined ] {
282+ function parseOpts < Data extends OptionalDataWithOptionalCause > (
283+ arg ?: JsonRpcErrorsArg < Data > ,
284+ ) : [ message ?: string | undefined , data ?: Data | undefined ] {
285285 if ( arg ) {
286286 if ( typeof arg === 'string' ) {
287287 return [ arg ] ;
0 commit comments