trie: remove use of deprecated setRoot (#1376)

ethereumjs · Jul 26, 2021 · 6461858 · 6461858
1 parent 8b358df
commit 6461858
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/packages/trie/CHANGELOG.md b/packages/trie/CHANGELOG.md
@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [UNRELEASED]
+
+**New Features**
+
+**Bug Fixes**
+
+**Maintenance**
+
+- Remove use of deprecated setRoot, PR [#1376](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1376)
+
+**Dependencies, CI and Docs**
+
 ## 4.2.0 - 2021-05-20
 
 ### Changed Delete Behavior: NO Default Node Deletes

diff --git a/packages/trie/src/baseTrie.ts b/packages/trie/src/baseTrie.ts
@@ -65,16 +65,25 @@ export class Trie {
     this._deleteFromDB = deleteFromDB
 
     if (root) {
-      this.setRoot(root)
+      this.root = root
     }
   }
 
-  /** Sets the current root of the `trie` */
+  /**
+   * Sets the current root of the `trie`
+   */
   set root(value: Buffer) {
-    this.setRoot(value)
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (!value) {
+      value = this.EMPTY_TRIE_ROOT
+    }
+    assert(value.length === 32, 'Invalid root length. Roots are 32 bytes')
+    this._root = value
   }
 
-  /** Gets the current root of the `trie` */
+  /**
+   * Gets the current root of the `trie`
+   */
   get root(): Buffer {
     return this._root
   }
@@ -87,11 +96,7 @@ export class Trie {
    * @deprecated
    */
   setRoot(value?: Buffer) {
-    if (!value) {
-      value = this.EMPTY_TRIE_ROOT
-    }
-    assert(value.length === 32, 'Invalid root length. Roots are 32 bytes')
-    this._root = value
+    this.root = value ?? this.EMPTY_TRIE_ROOT
   }
 
   /**