Added initialize protection to MappedSinglyLinkedList

pooltogether · Aug 14, 2020 · 790ee5d · 790ee5d
1 parent 30c0ada
commit 790ee5d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/contracts/test/MappedSinglyLinkedListExposed.sol b/contracts/test/MappedSinglyLinkedListExposed.sol
@@ -7,7 +7,7 @@ contract MappedSinglyLinkedListExposed {
 
   MappedSinglyLinkedList.Mapping list;
 
-  constructor () public {
+  function initialize() external {
     list.initialize();
   }
 

diff --git a/contracts/utils/MappedSinglyLinkedList.sol b/contracts/utils/MappedSinglyLinkedList.sol
@@ -19,8 +19,8 @@ library MappedSinglyLinkedList {
   /// @notice Initializes the list.
   /// @dev It is important that this is called so that the SENTINAL is correctly setup.
   function initialize(Mapping storage self) internal {
+    require(self.count == 0, "Already init");
     self.addressMap[SENTINAL] = SENTINAL;
-    self.count = 0;
   }
 
   function addAddresses(Mapping storage self, address[] memory addresses) internal {

diff --git a/test/MappedSinglyLinkedListExposed.test.js b/test/MappedSinglyLinkedListExposed.test.js
@@ -22,13 +22,18 @@ describe('MappedSinglyLinkedListExposed', function() {
     [wallet, wallet2, wallet3, wallet4] = await buidler.ethers.getSigners()
 
     list = await deployContract(wallet, MappedSinglyLinkedListExposed, [], overrides)
+    await list.initialize()
     await list.addAddresses([wallet2._address])
   })
 
   describe('initialize()', () => {
     it('should have initialized with a value', async () => {
       expect(await list.contains(wallet2._address)).to.be.true
     })
+
+    it('should not be initialized after it contains values', async () => {
+      await expect(list.initialize()).to.be.revertedWith('Already init')
+    })
   })
 
   describe('addressArray', () =>{