fix(fetchEndpoint): error handling and test case fix

starknet-io · Jun 17, 2022 · 629479f · 629479f
1 parent de3e004
commit 629479f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/__tests__/provider.test.ts b/__tests__/provider.test.ts
@@ -26,6 +26,7 @@ describe('defaultProvider', () => {
     if (transaction.status !== 'REJECTED') {
       exampleBlockHash = transaction.block_hash;
       exampleBlockNumber = transaction.block_number;
+      console.log(exampleBlockNumber);
     }
   });
 

diff --git a/src/account/default.ts b/src/account/default.ts
@@ -269,18 +269,15 @@ export class Account extends Provider implements AccountInterface {
    */
   public async verifyMessageHash(hash: BigNumberish, signature: Signature): Promise<boolean> {
     try {
-      const response = await this.callContract({
+      await this.callContract({
         contractAddress: this.address,
         entrypoint: 'is_valid_signature',
         calldata: compileCalldata({
           hash: toBN(hash).toString(),
           signature: signature.map((x) => toBN(x).toString()),
         }),
       });
-      if (response.result) {
-        return true;
-      }
-      return false;
+      return true;
     } catch {
       return false;
     }

diff --git a/src/provider/default.ts b/src/provider/default.ts
@@ -159,7 +159,12 @@ export class Provider implements ProviderInterface {
       body: stringify(request),
       headers,
     })
-      .then((res) => res.text())
+      .then((res) => {
+        if (res.status !== 200) {
+          throw Error(res.statusText);
+        }
+        return res.text();
+      })
       .then((res) => {
         if (endpoint === 'estimate_fee') {
           return parse(res, (_, v) => {
@@ -170,6 +175,9 @@ export class Provider implements ProviderInterface {
           });
         }
         return parse(res) as Endpoints[T]['RESPONSE'];
+      })
+      .catch((err) => {
+        throw Error(`Could not ${method} from endpoint: ${url} ${err.message}`);
       });
   }
 

diff --git a/src/provider/utils.ts b/src/provider/utils.ts
@@ -49,7 +49,7 @@ export function getBlockIdentifier(blockIdentifier: BlockIdentifier): BlockIdent
   if (blockIdentifier === 'pending') {
     return { type: 'BLOCK_NUMBER', data: 'pending' };
   }
-  if (typeof blockIdentifier === 'number') {
+  if (typeof blockIdentifier === 'number' || typeof blockIdentifier === 'bigint') {
     return { type: 'BLOCK_NUMBER', data: blockIdentifier };
   }
   if (typeof blockIdentifier === 'string' && blockIdentifier.startsWith('0x')) {