Fixed tests for chaingear

cybercongress · Dec 4, 2018 · 345dd14 · 345dd14
1 parent 393605e
commit 345dd14
Show file tree

Hide file tree

Showing 12 changed files with 495 additions and 472 deletions.
diff --git a/contracts/chaingear/Chaingear.sol b/contracts/chaingear/Chaingear.sol
@@ -5,6 +5,7 @@ import "openzeppelin-solidity/contracts/token/ERC721/ERC721Token.sol";
 import "openzeppelin-solidity/contracts/payment/SplitPayment.sol";
 import "openzeppelin-solidity/contracts/lifecycle/Pausable.sol";
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
+import "openzeppelin-solidity/contracts/AddressUtils.sol";
 
 import "../common/IDatabaseBuilder.sol";
 import "../common/IDatabase.sol";
@@ -20,6 +21,7 @@ import "../common/IChaingear.sol";
 contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPayment, ERC721Token {
 
     using SafeMath for uint256;
+    using AddressUtils for address;
 
     /*
     *  Storage
@@ -42,13 +44,14 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
     }
 
     DatabaseMeta[] private databases;
-
-    uint256 private headTokenID = 0;
-
     mapping(string => bool) private databasesNamesIndex;
     mapping(string => bool) private databasesSymbolsIndex;
-
+
+    uint256 private headTokenID = 0;
     mapping(address => uint256) private databasesIDsByAddressesIndex;
+
+    uint256 private amountOfBuilders = 0;
+    mapping(uint256 => string) private buildersVersionIndex;
     mapping(string => DatabaseBuilder) private buildersVersion;
 
     Safe private chaingearSafe;
@@ -115,31 +118,46 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
     */
 
     function addDatabaseBuilderVersion(
-        string              _version, 
-        IDatabaseBuilder    _builderAddress,
-        string              _linkToABI,
-        string              _description
+        string           _version, 
+        IDatabaseBuilder _builderAddress,
+        string           _linkToABI,
+        string           _description
     )
         external
         onlyOwner
         whenNotPaused
     {
         require(buildersVersion[_version].builderAddress == address(0));
+        require(address(_builderAddress).isContract() == true);
 
         buildersVersion[_version] = (DatabaseBuilder(
         {
             builderAddress: _builderAddress,
             linkToABI:      _linkToABI,
             description:    _description
         }));
+        buildersVersionIndex[amountOfBuilders] = _version;
+        amountOfBuilders = amountOfBuilders.add(1);
+    }
+
+    function updateDatabaseBuilderDescription(
+        string _version,
+        string _description
+    )
+        external
+        onlyOwner
+        whenNotPaused
+    {
+        require(buildersVersion[_version].builderAddress != address(0));
+        buildersVersion[_version].description = _description;
     }
 
     function createDatabase(
-        string      _version,
-        address[]   _benefitiaries,
-        uint256[]   _shares,
-        string      _name,
-        string      _symbol
+        string    _version,
+        address[] _benefitiaries,
+        uint256[] _shares,
+        string    _name,
+        string    _symbol
     )
         external
         payable
@@ -218,7 +236,7 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
         chaingearSafe.claim(msg.sender, _amount);
     }
 
-    function updateRegistrationFee(uint256 _newFee)
+    function updateCreationFee(uint256 _newFee)
         external
         onlyOwner
         whenPaused
@@ -230,6 +248,22 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
     *  Views
     */
 
+    function getAmountOfBuilders()
+        external
+        view
+        returns(uint256)
+    {
+        return amountOfBuilders;
+    }
+
+    function getBuilderById(uint256 _id)
+        external
+        view
+        returns(string)
+    {
+        return buildersVersionIndex[_id];
+    }
+
     function getDatabaseBuilder(string _version) 
         external
         view
@@ -246,6 +280,24 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
         );
     }
 
+    function getDatabasesIDs()
+        external
+        view
+        returns (uint256[])
+    {
+        return allTokens;
+    }
+
+    function getDatabaseIDByAddress(address _databaseAddress)
+        external
+        view
+        returns(uint256)
+    { 
+        uint256 id = databasesIDsByAddressesIndex[_databaseAddress];
+        require(exists(id) == true);
+        return id;
+    }
+
     function getDatabase(uint256 _databaseID)
         external
         view
@@ -278,7 +330,6 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
         view
         returns (uint256, uint256)
     {
-        require(exists(_databaseID) == true);
         uint256 databaseIndex = allTokensIndex[_databaseID];
 
         return (
@@ -287,24 +338,6 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
         );
     }
 
-    function getDatabasesIDs()
-        external
-        view
-        returns (uint256[])
-    {
-        return allTokens;
-    }
-
-    function getDatabaseIDByAddress(address _databaseAddress)
-        external
-        view
-        returns(uint256)
-    { 
-        uint256 id = databasesIDsByAddressesIndex[_databaseAddress];
-        require(exists(id) == true);
-        return id;
-    }
-
     function getChaingearDescription()
         external
         pure
@@ -313,7 +346,7 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
         return CHAINGEAR_DESCRIPTION;
     }
 
-    function getRegistrationFeeWei()
+    function getCreationFeeWei()
         external
         view
         returns (uint256)
@@ -337,6 +370,22 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
         return chaingearSafe;
     }
 
+    function getNameExist(string _name)
+        external
+        view
+        returns (bool)
+    {
+        return databasesNamesIndex[_name];
+    }
+
+    function getSymbolExist(string _symbol)
+        external
+        view
+        returns (bool)
+    {
+        return databasesSymbolsIndex[_symbol];
+    }
+
     /*
     *  Public functions
     */
@@ -418,14 +467,14 @@ contract Chaingear is IChaingear, SupportsInterfaceWithLookup, Pausable, SplitPa
             versionOfDatabase: _version,
             linkABI:           buildersVersion[_version].linkToABI, // delete this
             createdTimestamp:  block.timestamp,
-            currentWei:        uint256(0),
-            accumulatedWei:    uint256(0)
+            currentWei:        0,
+            accumulatedWei:    0
         }));
 
         databases.push(database);
 
         databasesNamesIndex[_name] = true;
-        databasesSymbolsIndex[_name] = true;
+        databasesSymbolsIndex[_symbol] = true;
 
         uint256 newTokenID = headTokenID;
         databasesIDsByAddressesIndex[databaseAddress] = newTokenID;    

diff --git a/contracts/common/Safe.sol b/contracts/common/Safe.sol
@@ -24,7 +24,7 @@ contract Safe {
         external
     {
         require(msg.sender == owner);
-        require(_amount <= address(this).balance);
+        // require(_amount <= address(this).balance);
         require(_entryOwner != address(0));
 
         _entryOwner.transfer(_amount);

diff --git a/...ons/3_deploy_chaingear_and_add_builder.js → docs/3_deploy_chaingear_and_add_builder.js b/...ons/3_deploy_chaingear_and_add_builder.js → docs/3_deploy_chaingear_and_add_builder.js
diff --git a/openzeppelin-solidity b/openzeppelin-solidity
@@ -0,0 +1 @@
+node_modules/openzeppelin-solidity/