trie: simplify get method logic

ethereumjs · Aug 30, 2022 · 089295e · 089295e
1 parent d78f903
commit 089295e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/packages/trie/benchmarks/engines/level.ts b/packages/trie/benchmarks/engines/level.ts
@@ -32,13 +32,14 @@ export class LevelDB implements DB {
     try {
       value = await this._leveldb.get(key, ENCODING_OPTS)
     } catch (error: any) {
-      if (error.notFound !== undefined) {
-        // not found, returning null
-      } else {
+      // https://github.com/Level/abstract-level/blob/915ad1317694d0ce8c580b5ab85d81e1e78a3137/abstract-level.js#L309
+      // This should be `true` if the error came from LevelDB
+      // so we can check for `NOT true` to identify any non-404 errors
+      if (error.notFound !== true) {
         throw error
       }
     }
-    return value as Buffer
+    return value
   }
 
   /**

diff --git a/packages/trie/recipes/level-legacy.ts b/packages/trie/recipes/level-legacy.ts
@@ -17,13 +17,14 @@ export class LevelDB implements DB {
     try {
       value = await this._leveldb.get(key, ENCODING_OPTS)
     } catch (error: any) {
-      if (error.notFound !== undefined) {
-        // not found, returning null
-      } else {
+      // https://github.com/Level/abstract-level/blob/915ad1317694d0ce8c580b5ab85d81e1e78a3137/abstract-level.js#L309
+      // This should be `true` if the error came from LevelDB
+      // so we can check for `NOT true` to identify any non-404 errors
+      if (error.notFound !== true) {
         throw error
       }
     }
-    return value as Buffer
+    return value
   }
 
   async put(key: Buffer, val: Buffer): Promise<void> {

diff --git a/packages/trie/recipes/level.ts b/packages/trie/recipes/level.ts
@@ -19,13 +19,14 @@ export class LevelDB implements DB {
     try {
       value = await this._leveldb.get(key, ENCODING_OPTS)
     } catch (error: any) {
-      if (error.notFound !== undefined) {
-        // not found, returning null
-      } else {
+      // https://github.com/Level/abstract-level/blob/915ad1317694d0ce8c580b5ab85d81e1e78a3137/abstract-level.js#L309
+      // This should be `true` if the error came from LevelDB
+      // so we can check for `NOT true` to identify any non-404 errors
+      if (error.notFound !== true) {
         throw error
       }
     }
-    return value as Buffer
+    return value
   }
 
   async put(key: Buffer, val: Buffer): Promise<void> {