Merge pull request #28 from SpringRole/no-token-vanity

removing token transfer

Author: vinay035

contracts/VanityURL.sol

@@ -5,12 +5,6 @@ pragma solidity ^0.4.19;
 * Go to beta.springrole.com to try this out!
 */
 
-contract Token{
-
-  function doTransfer(address _from, address _to, uint256 _value) public returns (bool);
-
-}
-
 /**
  * @title Ownable
  * @dev The Ownable contract has an owner address, and provides basic authorization control
@@ -108,45 +102,20 @@ contract Pausable is Ownable {
 
 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 mapping for vanityURL to address
   mapping (string => address) vanity_address_mapping;
   // This declares a state variable that mapping for address to vanityURL
   mapping (address => string ) address_vanity_mapping;
-  // This declares a state variable that stores pricing
-  uint256 public reservePricing;
-  // This declares a state variable address to which token to be transfered
-  address public transferTokenTo;
-
   /*
     constructor function to set token address & Pricing for reserving and token transfer address
    */
-  function VanityURL(address _tokenAddress, uint256 _reservePricing, address _transferTokenTo){
-    tokenAddress = Token(_tokenAddress);
-    reservePricing = _reservePricing;
-    transferTokenTo = _transferTokenTo;
+  function VanityURL(){
   }
 
   event VanityReserved(address _to, string _vanity_url);
   event VanityTransfered(address _to,address _from, string _vanity_url);
   event VanityReleased(string _vanity_url);
 
-  /* function to update Token address */
-  function updateTokenAddress (address _tokenAddress) onlyOwner public {
-    tokenAddress = Token(_tokenAddress);
-  }
-
-  /* function to update transferTokenTo */
-  function updateTokenTransferAddress (address _transferTokenTo) onlyOwner public {
-    transferTokenTo = _transferTokenTo;
-  }
-
-  /* function to set reserve pricing */
-  function setReservePricing (uint256 _reservePricing) onlyOwner public {
-    reservePricing = _reservePricing;
-  }
-
   /* function to retrive wallet address from vanity url */
   function retrieveWalletForVanity(string _vanity_url) constant public returns (address) {
     return vanity_address_mapping[_vanity_url];
@@ -171,7 +140,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(tokenAddress.doTransfer(msg.sender,transferTokenTo,reservePricing));
     vanity_address_mapping[_vanity_url] = msg.sender;
     address_vanity_mapping[msg.sender] = _vanity_url;
     VanityReserved(msg.sender, _vanity_url);

migrations/2_deploy_contracts.js

@@ -7,7 +7,7 @@ module.exports = function(deployer,network,accounts) {
     deployer.deploy(InviteToken,1000000).then(function() {
         return deployer.deploy(AirDrop, InviteToken.address);
     }).then(function() {
-        return deployer.deploy(VanityURL, InviteToken.address,1,accounts[2]);
+        return deployer.deploy(VanityURL);
     }).then(function() {
         return deployer.deploy(SpringToken,1000000);
     });

test/2_vanity.js

@@ -1,78 +1,22 @@
-var InviteToken = artifacts.require("./InviteToken.sol");
 var VanityURL = artifacts.require("./VanityURL.sol");
 
 contract('VanityURL', function(accounts) {
     var vanityInstance;
-    var tokenInstance;
 
     before(function () {
         return VanityURL.deployed().then(function(instance) {
             vanityInstance = instance;
-            return InviteToken.deployed();
-        }).then(function(token) {
-            tokenInstance = token;
-            // mint 1000 tokens
-            return tokenInstance.mint(1000);
-        }).then(function(minted) {
-            return tokenInstance.transfer(accounts[1],10);
-        }).then(function(transfer) {
-            // add vanity contract to whitelist
-            return tokenInstance.addWhiteListedContracts(vanityInstance.address);
-        }).then(function(result) {
-            assert.isDefined(result,"Vanity Contract should get added to whitelisted contracts")
-        }).catch(function(error){
-            assert.isUndefined(error,"Vanity Contract should get added to whitelisted contracts")
-        })
-    });
-
-    it("should have token defined", function() {
-        return vanityInstance.tokenAddress.call().then(function(instance){
-            assert.isDefined(instance, "Token address should be defined");
-            assert.equal(instance,tokenInstance.address ,"Token address should be same as SRPMT");
-        });
-    });
-
-    it("should have reservePricing defined", function() {
-        return vanityInstance.reservePricing.call().then(function(instance){
-            assert.isDefined(instance, "Token reservePricing should be defined");
         });
     });
 
     it("should be able to reserve a url", function() {
-
-        var amount = 1; //reserve fees
-        // Get initial balances of first and second account.
-        var account_one = accounts[1];
-        var account_two = accounts[2];
-
-        var account_one_starting_balance;
-        var account_two_starting_balance;
-        var account_one_ending_balance;
-        var account_two_ending_balance;
-
-        tokenInstance.balanceOf.call(account_one).then(function(balance){
-            account_one_starting_balance = balance.toNumber();
-            // check balance for account 2
-            return tokenInstance.balanceOf.call(account_two);
-        }).then(function(balance){
-            account_two_starting_balance = balance.toNumber();
-            return vanityInstance.reserve('vinay_035',{from:accounts[1]});
-        }).then(function(instance){
+        return vanityInstance.reserve('vinay_035',{from:accounts[1]}).then(function(instance){
             return vanityInstance.retrieveWalletForVanity.call('vinay_035');
         }).then(function(result) {
             assert.equal(result,accounts[1],"Should be able to retrive the same wallet address");
             return vanityInstance.retrieveVanityForWallet.call(accounts[1]);
         }).then(function(result) {
             assert.equal(result,'vinay_035',"Should be able to retrive the same vanity");
-        }).then(function() {
-            return tokenInstance.balanceOf.call(account_one);
-        }).then(function(balance) {
-            account_one_ending_balance = balance.toNumber();
-            return tokenInstance.balanceOf.call(account_two);
-        }).then(function(balance) {
-            account_two_ending_balance = balance.toNumber();
-            assert.equal(account_one_ending_balance, account_one_starting_balance - amount, "Amount wasn't correctly taken from the sender");
-            assert.equal(account_two_ending_balance, account_two_starting_balance + amount, "Amount wasn't correctly sent to tokenAddress");
         }).catch(function(error){
             assert.isUndefined(error,"should be able to reserve a url")
         })