Fix warnings

transmute-industries · Jul 11, 2018 · de6cb0f · de6cb0f
1 parent 8781188
commit de6cb0f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/contracts/RoundManager.sol b/contracts/RoundManager.sol
@@ -18,7 +18,7 @@ contract RoundManager {
     _;
   }
 
-  constructor() {
+  constructor() public {
     electionPeriodLength = 20;
     rateLockDeadline = 5;
   }

diff --git a/contracts/TransmuteDPOS.sol b/contracts/TransmuteDPOS.sol
@@ -53,23 +53,23 @@ contract TransmuteDPOS is TransmuteToken, RoundManager, ProviderPool {
   {
     require(_blockRewardCut <= 100);
     require(_feeShare <= 100);
-    Provider storage provider = providers[msg.sender];
-    Delegator storage delegator = delegators[msg.sender];
-    require(delegator.delegateAddress == msg.sender);
-    require(delegator.amountBonded > 0);
-    if (provider.status == ProviderStatus.Unregistered) {
+    Provider storage p = providers[msg.sender];
+    Delegator storage d = delegators[msg.sender];
+    require(d.delegateAddress == msg.sender);
+    require(d.amountBonded > 0);
+    if (p.status == ProviderStatus.Unregistered) {
       numberOfProviders = numberOfProviders.add(1);
-      addProvider(msg.sender, provider.totalAmountBonded);
+      addProvider(msg.sender, p.totalAmountBonded);
       emit ProviderAdded(msg.sender, _pricePerStorageMineral, _pricePerComputeMineral, _blockRewardCut, _feeShare);
     } else {
-      updateProvider(msg.sender, provider.totalAmountBonded);
+      updateProvider(msg.sender, p.totalAmountBonded);
       emit ProviderUpdated(msg.sender, _pricePerStorageMineral, _pricePerComputeMineral, _blockRewardCut, _feeShare);
     }
-    provider.status = ProviderStatus.Registered;
-    provider.pricePerStorageMineral = _pricePerStorageMineral;
-    provider.pricePerComputeMineral = _pricePerComputeMineral;
-    provider.blockRewardCut = _blockRewardCut;
-    provider.feeShare = _feeShare;
+    p.status = ProviderStatus.Registered;
+    p.pricePerStorageMineral = _pricePerStorageMineral;
+    p.pricePerComputeMineral = _pricePerComputeMineral;
+    p.blockRewardCut = _blockRewardCut;
+    p.feeShare = _feeShare;
   }
 
   function resignAsProvider() public {
@@ -80,14 +80,14 @@ contract TransmuteDPOS is TransmuteToken, RoundManager, ProviderPool {
   }
 
   function bond(address _providerAddress, uint _amount) external {
-    Provider storage provider = providers[_providerAddress];
+    Provider storage p = providers[_providerAddress];
     // A delegator is only allowed to bond to an Unregistered provider if the provider is himself
     // otherwise _providerAddress has to be associated with a Registered provider
-    require(_providerAddress == msg.sender || provider.status != ProviderStatus.Unregistered);
+    require(_providerAddress == msg.sender || p.status != ProviderStatus.Unregistered);
     // Check if delegator has not already bonded to some address
     require(delegators[msg.sender].delegateAddress == address(0));
     this.transferFrom(msg.sender, this, _amount);
     delegators[msg.sender] = Delegator(_providerAddress, _amount);
-    provider.totalAmountBonded = provider.totalAmountBonded.add(_amount);
+    p.totalAmountBonded = p.totalAmountBonded.add(_amount);
   }
 }
diff --git a/test/TestTransmuteDPOS.spec.js b/test/TestTransmuteDPOS.spec.js
@@ -115,7 +115,6 @@ contract('TransmuteDPOS', accounts => {
       });
     });
 
-    // TODO: Doc about providers, pool and active pool
     it('should add the provider to the pool if he is Unregistered and size < maxSize', async () => {
       // Check that provider isn't registered yet
       assert.equal(false, await tdpos.containsProvider(accounts[3]));