Factor out Blockchain#_lockUnlock

ethereumjs · Mar 7, 2019 · ccd0af5 · ccd0af5
1 parent 8686de0
commit ccd0af5
Showing 1 changed file with 21 additions and 57 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -229,29 +229,13 @@ export default class Blockchain {
    * Adds a block to the blockchain
    */
   putBlock(block: object, cb: any, isGenesis?: any) {
-    const self = this;
-
     // make sure init has completed
-    self._initLock.await(() => {
+    this._initLock.await(() => {
       // perform put with mutex dance
-      lockUnlock((done: any) => {
-        self._putBlockOrHeader(block, done, isGenesis);
+      this._lockUnlock((done: any) => {
+        this._putBlockOrHeader(block, done, isGenesis);
       }, cb);
     });
-
-    // lock, call fn, unlock
-    function lockUnlock(fn: any, cb: any) {
-      // take lock
-      self._putSemaphore.take(function() {
-        // call fn
-        fn(function() {
-          // leave lock
-          self._putSemaphore.leave();
-          // exit
-          cb.apply(null, arguments);
-        });
-      });
-    }
   }
 
   /**
@@ -271,29 +255,13 @@ export default class Blockchain {
    * Adds a header to the blockchain
    */
   putHeader(header: object, cb: any) {
-    const self = this;
-
     // make sure init has completed
-    self._initLock.await(() => {
+    this._initLock.await(() => {
       // perform put with mutex dance
-      lockUnlock((done: any) => {
-        self._putBlockOrHeader(header, done);
+      this._lockUnlock((done: any) => {
+        this._putBlockOrHeader(header, done);
       }, cb);
     });
-
-    // lock, call fn, unlock
-    function lockUnlock(fn: any, cb: any) {
-      // take lock
-      self._putSemaphore.take(function() {
-        // call fn
-        fn(function() {
-          // leave lock
-          self._putSemaphore.leave();
-          // exit
-          cb.apply(null, arguments);
-        });
-      });
-    }
   }
 
   _putBlockOrHeader(item: any, cb: any, isGenesis?: any) {
@@ -728,29 +696,13 @@ export default class Blockchain {
    * and any encountered heads are set to the parent block
    */
   delBlock(blockHash: Buffer, cb: any) {
-    const self = this;
-
     // make sure init has completed
-    self._initLock.await(() => {
+    this._initLock.await(() => {
       // perform put with mutex dance
-      lockUnlock((done: boolean) => {
-        self._delBlock(blockHash, done);
+      this._lockUnlock((done: boolean) => {
+        this._delBlock(blockHash, done);
       }, cb);
     });
-
-    // lock, call fn, unlock
-    function lockUnlock(fn: any, cb: any) {
-      // take lock
-      self._putSemaphore.take(function() {
-        // call fn
-        fn(function() {
-          // leave lock
-          self._putSemaphore.leave();
-          // exit
-          cb.apply(null, arguments);
-        });
-      });
-    }
   }
 
   _delBlock(blockHash: any, cb: any) {
@@ -1057,4 +1009,16 @@ export default class Blockchain {
       }
     );
   }
+
+  _lockUnlock(fn: any, cb: any) {
+    const self = this
+    this._putSemaphore.take(() => {
+      fn(after)
+
+      function after() {
+        self._putSemaphore.leave();
+        cb.apply(null, arguments)
+      }
+    })
+  }
 }