Merge pull request #14 from SpringRole/truffle-test-cases

added test cases using truffle suite

Author: vinay035

.gitignore

@@ -0,0 +1,27 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules

README.md

@@ -0,0 +1,11 @@
+
+# SpringRole Smart Contracts
+
+=================================================
+
+Steps to Run Tests
+
+    1. npm install -g ethereumjs-testrpc
+    2. npm install
+    3. testrpc -l 6721975
+    4. npm test

AirDrop.sol renamed to contracts/AirDrop.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.19;
+pragma solidity ^0.4.18;
 
 /**
  * @title Token
@@ -63,7 +63,7 @@ contract AirDrop is Ownable {
     Airdrop function which take up a array of address and amount and call the
     transfer function to send the token
    */
-  function doAirDrop(address[] _address, uint256 _amount) onlyOwner public returns (bool success) {
+  function doAirDrop(address[] _address, uint256 _amount) onlyOwner public returns (bool) {
     uint256 count = _address.length;
     for (uint256 i = 0; i < count; i++)
     {

contracts/Migrations.sol

@@ -0,0 +1,23 @@
+pragma solidity ^0.4.4;
+
+contract Migrations {
+  address public owner;
+  uint public last_completed_migration;
+
+  modifier restricted() {
+    if (msg.sender == owner) _;
+  }
+
+  function Migrations() {
+    owner = msg.sender;
+  }
+
+  function setCompleted(uint completed) restricted {
+    last_completed_migration = completed;
+  }
+
+  function upgrade(address new_address) restricted {
+    Migrations upgraded = Migrations(new_address);
+    upgraded.setCompleted(last_completed_migration);
+  }
+}

PreMint.sol renamed to contracts/SRTToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.19;
+pragma solidity ^0.4.18;
 
 /**
  * @title ERC20Basic
@@ -176,9 +176,11 @@ contract SRTToken is Ownable,StandardToken,WhiteListedContracts {
     return true;
   }
 
-  /*
-  mint function will allow to mint tokens and assign to owner
-  */
+  /**
+ * @dev Function to mint tokens
+ * @param _amount The amount of tokens to mint.
+ * @return A boolean that indicates if the operation was successful.
+ */
   function mint(uint256 _amount) onlyOwner public returns (bool) {
     require(maxSupply>(totalSupply.add(_amount)));
     totalSupply = totalSupply.add(_amount);

Vanity.sol renamed to contracts/VanityURL.sol

@@ -1,15 +1,7 @@
-pragma solidity ^0.4.19;
+pragma solidity ^0.4.18;
 
-/**
- * @title Token
- * @dev Simpler version of ERC20 interface
- */
-contract Token {
-  function transfer(address to, uint256 value) public returns (bool);
-  event Transfer(address indexed from, address indexed to, uint256 value);
-}
 
-contract SRTToken is Token{
+contract Token{
 
   function doTransfer(address _from, address _to, uint256 _value) public returns (bool);
 
@@ -113,7 +105,7 @@ contract Pausable is Ownable {
 contract VanityURL is Ownable,Pausable {
 
   // This declares a state variable that would store the contract address
-  SRTToken public tokenAddress;
+  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
@@ -129,7 +121,7 @@ contract VanityURL is Ownable,Pausable {
     constructor function to set token address & Pricing for reserving and token transfer address
    */
   function VanityURL(address _tokenAddress, uint256 _reservePricing, address _transferTokenTo){
-    tokenAddress = SRTToken(_tokenAddress);
+    tokenAddress = Token(_tokenAddress);
     reservePricing = _reservePricing;
     transferTokenTo = _transferTokenTo;
   }
@@ -140,7 +132,7 @@ contract VanityURL is Ownable,Pausable {
 
   /* function to update Token address */
   function updateTokenAddress (address _tokenAddress) onlyOwner public {
-    tokenAddress = SRTToken(_tokenAddress);
+    tokenAddress = Token(_tokenAddress);
   }
 
   /* function to update transferTokenTo */
@@ -154,8 +146,8 @@ contract VanityURL is Ownable,Pausable {
   }
 
 
-  /* 
-   function to remove reserved keyword 
+  /*
+   function to remove reserved keyword
   */
   function removeReservedKeyword (string _keyword) onlyOwner public {
     delete(reservedKeywords[_keyword]);
@@ -310,7 +302,7 @@ contract VanityURL is Ownable,Pausable {
   */
 
   function kill() onlyOwner {
-    suicide(owner);
+    selfdestruct(owner);
   }
 
   /*

migrations/1_initial_migration.js

@@ -0,0 +1,5 @@
+var Migrations = artifacts.require("./Migrations.sol");
+
+module.exports = function(deployer) {
+  deployer.deploy(Migrations);
+};

migrations/2_deploy_contracts.js

@@ -0,0 +1,11 @@
+var SRTToken = artifacts.require("./SRTToken.sol");
+var VanityURL = artifacts.require("./VanityURL.sol");
+var AirDrop = artifacts.require("./AirDrop.sol");
+
+module.exports = function(deployer,network,accounts) {
+    deployer.deploy(SRTToken,1000000).then(function() {
+        return deployer.deploy(AirDrop, SRTToken.address);
+    }).then(function() {
+        return deployer.deploy(VanityURL, SRTToken.address,1,accounts[2]);
+    });
+};