Remove initialized and init(...) #4

bokkypoobah · Feb 24, 2019 · 8133a67 · 8133a67
1 parent d1d3649
commit 8133a67
Show file tree

Hide file tree

Showing 11 changed files with 150 additions and 176 deletions.
diff --git a/contracts/BokkyPoobahsRedBlackTreeLibrary.sol b/contracts/BokkyPoobahsRedBlackTreeLibrary.sol
@@ -24,19 +24,12 @@ library BokkyPooBahsRedBlackTreeLibrary {
     struct Tree {
         uint root;
         mapping(uint => Node) nodes;
-        bool initialised;
     }
 
     uint private constant SENTINEL = 0;
 
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
-    function init(Tree storage self) internal {
-        require(!self.initialised);
-        self.root = SENTINEL;
-        self.nodes[SENTINEL] = Node(SENTINEL, SENTINEL, SENTINEL, false);
-        self.initialised = true;
-    }
     function first(Tree storage self) internal view returns (uint _key) {
         _key = self.root;
         while (_key != SENTINEL && self.nodes[_key].left != SENTINEL) {

diff --git a/contracts/TestBokkyPoobahsRedBlackTree.sol b/contracts/TestBokkyPoobahsRedBlackTree.sol
@@ -25,7 +25,6 @@ contract TestBokkyPooBahsRedBlackTree {
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
     constructor() public {
-        tree.init();
     }
     function root() public view returns (uint _key) {
         _key = tree.root;

diff --git a/contracts/TestBokkyPoobahsRedBlackTreeRaw.sol b/contracts/TestBokkyPoobahsRedBlackTreeRaw.sol
@@ -24,7 +24,6 @@ contract TestBokkyPooBahsRedBlackTreeRaw {
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
     constructor() public {
-        tree.init();
     }
     function root() public view returns (uint _key) {
         _key = tree.root;

diff --git a/flattened/TestBokkyPooBahsRedBlackTreeRaw_flattened.sol b/flattened/TestBokkyPooBahsRedBlackTreeRaw_flattened.sol
@@ -25,19 +25,12 @@ library BokkyPooBahsRedBlackTreeLibrary {
     struct Tree {
         uint root;
         mapping(uint => Node) nodes;
-        bool initialised;
     }
 
     uint private constant SENTINEL = 0;
 
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
-    function init(Tree storage self) internal {
-        require(!self.initialised);
-        self.root = SENTINEL;
-        self.nodes[SENTINEL] = Node(SENTINEL, SENTINEL, SENTINEL, false);
-        self.initialised = true;
-    }
     function first(Tree storage self) internal view returns (uint _key) {
         _key = self.root;
         while (_key != SENTINEL && self.nodes[_key].left != SENTINEL) {
@@ -398,7 +391,6 @@ contract TestBokkyPooBahsRedBlackTreeRaw {
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
     constructor() public {
-        tree.init();
     }
     function root() public view returns (uint _key) {
         _key = tree.root;

diff --git a/test/BokkyPoobahsRedBlackTreeLibrary.sol b/test/BokkyPoobahsRedBlackTreeLibrary.sol
@@ -24,19 +24,12 @@ library BokkyPooBahsRedBlackTreeLibrary {
     struct Tree {
         uint root;
         mapping(uint => Node) nodes;
-        bool initialised;
     }
 
     uint private constant SENTINEL = 0;
 
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
-    function init(Tree storage self) internal {
-        require(!self.initialised);
-        self.root = SENTINEL;
-        self.nodes[SENTINEL] = Node(SENTINEL, SENTINEL, SENTINEL, false);
-        self.initialised = true;
-    }
     function first(Tree storage self) internal view returns (uint _key) {
         _key = self.root;
         while (_key != SENTINEL && self.nodes[_key].left != SENTINEL) {

diff --git a/test/TestBokkyPooBahsRedBlackTreeRaw.js b/test/TestBokkyPooBahsRedBlackTreeRaw.js
diff --git a/test/TestBokkyPoobahsRedBlackTree.sol b/test/TestBokkyPoobahsRedBlackTree.sol
@@ -25,7 +25,6 @@ contract TestBokkyPooBahsRedBlackTree {
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
     constructor() public {
-        tree.init();
     }
     function root() public view returns (uint _key) {
         _key = tree.root;

diff --git a/test/TestBokkyPoobahsRedBlackTreeRaw.sol b/test/TestBokkyPoobahsRedBlackTreeRaw.sol
@@ -24,7 +24,6 @@ contract TestBokkyPooBahsRedBlackTreeRaw {
     event Log(string where, string action, uint key, uint parent, uint left, uint right, bool red);
 
     constructor() public {
-        tree.init();
     }
     function root() public view returns (uint _key) {
         _key = tree.root;

diff --git a/test/deploymentData.js b/test/deploymentData.js