Merge pull request #16 from SpringRole/removing-reserved-keywords

removed reserve keywords logic

Author: vinay035

contracts/VanityURL.sol

@@ -106,8 +106,6 @@ contract VanityURL is Ownable,Pausable {
 
   // This declares a state variable that would store the contract address
   Token public tokenAddress;
-  // This declares a state variable that would store mapping for reserved _keyword
-  mapping (string => uint) reservedKeywords;
   // This declares a state variable that mapping for vanityURL to address
   mapping (string => address) vanity_address_mapping;
   // This declares a state variable that mapping for address to vanityURL
@@ -140,19 +138,6 @@ contract VanityURL is Ownable,Pausable {
     transferTokenTo = _transferTokenTo;
   }
 
-  /* function to add reserve keyword */
-  function addReservedKeyword (string _keyword) onlyOwner public {
-    reservedKeywords[_keyword] = 1;
-  }
-
-
-  /*
-   function to remove reserved keyword
-  */
-  function removeReservedKeyword (string _keyword) onlyOwner public {
-    delete(reservedKeywords[_keyword]);
-  }
-
   /* function to set reserve pricing */
   function setReservePricing (uint256 _reservePricing) onlyOwner public {
     reservePricing = _reservePricing;
@@ -182,7 +167,6 @@ contract VanityURL is Ownable,Pausable {
     require(checkForValidity(_vanity_url));
     require(vanity_address_mapping[_vanity_url]  == address(0x0));
     require(bytes(address_vanity_mapping[msg.sender]).length == 0);
-    require(reservedKeywords[_vanity_url] != 1);
     require(tokenAddress.doTransfer(msg.sender,transferTokenTo,reservePricing));
     vanity_address_mapping[_vanity_url] = msg.sender;
     address_vanity_mapping[msg.sender] = _vanity_url;
@@ -239,7 +223,6 @@ contract VanityURL is Ownable,Pausable {
     _vanity_url = _toLower(_vanity_url);
     require(checkForValidity(_vanity_url));
     require(vanity_address_mapping[_vanity_url]  == address(0x0));
-    require(reservedKeywords[_vanity_url] != 1);
     vanity_address_mapping[_vanity_url] = msg.sender;
     address_vanity_mapping[msg.sender] = _vanity_url;
     VanityReserved(msg.sender, _vanity_url);
@@ -263,7 +246,6 @@ contract VanityURL is Ownable,Pausable {
   function reserveVanityURLByOwner(address _to,string _vanity_url) whenNotPaused onlyOwner public {
       _vanity_url = _toLower(_vanity_url);
       require(checkForValidity(_vanity_url));
-      require(reservedKeywords[_vanity_url] != 1);
       /* check if vanity url is being used by anyone */
       if(vanity_address_mapping[_vanity_url]  != address(0x0))
       {

test/2_vanity.js

@@ -16,9 +16,6 @@ contract('VanityURL', function(accounts) {
         }).then(function(minted) {
             return tokenInstance.transfer(accounts[1],10);
         }).then(function(transfer) {
-            // add admin as reserved keyword
-            return vanityInstance.addReservedKeyword('admin');
-        }).then(function(minted) {
             // add vanity contract to whitelist
             return tokenInstance.addWhiteListedContracts(vanityInstance.address);
         }).then(function(result) {
@@ -94,14 +91,6 @@ contract('VanityURL', function(accounts) {
         })
     });
 
-    it("should fail when tried to reserve reserved keywords", function() {
-        return vanityInstance.reserve('admin').then(function(instance){
-            assert.isUndefined(instance,"should fail when tried to reserve reserved keywords")
-        }).catch(function(error){
-            assert.isDefined(error,"should fail when tried to reserve reserved keywords")
-        })
-    });
-
     it("should fail when tried to reserve non alphanumeric keywords", function() {
         return vanityInstance.reserve('Vi@345').then(function(instance){
             assert.isUndefined(instance,"should fail when tried to reserve non alphanumeric keywords")