version coherence test

TheRougeProject · Jul 26, 2018 · 609b002 · 609b002
1 parent aeba4ae
commit 609b002
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/contracts/RougeFactory.sol b/contracts/RougeFactory.sol
@@ -14,6 +14,8 @@ import "./RougeRegistry.sol";
 
 contract RougeFactory is RougeRegistry {
 
+    string public version = '0.8';
+
     // The Rouge Token contract address
     RGETokenInterface public rge;
     uint256 public tare;
@@ -41,7 +43,7 @@ contract RougeFactory is RougeRegistry {
     function createCampaign(address _issuer, uint32 _issuance, uint256 _tokens) public {
 
         // only rge contract can call createCampaign
-        // require(msg.sender == address(rge));
+        require(msg.sender == address(rge));
 
         SimpleRougeCampaign c = new SimpleRougeCampaign(_issuer, _issuance, rge, tare, this);
 

diff --git a/contracts/RougeRegistry.sol b/contracts/RougeRegistry.sol
@@ -5,8 +5,6 @@ import "./RougeRegistryInterface.sol";
 
 contract RougeRegistry is RougeRegistryInterface {
 
-    string public version = 'v0.2';
-
     address[] issuers;
     address[] all_campaigns;
 

diff --git a/contracts/SimpleRougeCampaign.sol b/contracts/SimpleRougeCampaign.sol
@@ -12,7 +12,7 @@ import "./RougeFactoryInterface.sol";
 
 contract SimpleRougeCampaign {
 
-    string public version = 'v0.8';
+    string public version = '0.8';
 
     // The Rouge Token contract address
     RGETokenInterface public rge;

diff --git a/test/RougeFactory.js b/test/RougeFactory.js
@@ -58,6 +58,11 @@ contract('RougeFactory', function(accounts) {
       }
     })
 
+    const factory_version = await factory.version.call();
+    const campaign = SimpleRougeCampaign.at(campaign_address);
+    const campaign_version = await campaign.version.call();
+    assert.equal(campaign_version, factory_version, "factory and campaign contract version are the same");
+
     const issuer_balance_after = await rge.balanceOf.call(issuer);
     assert.equal(issuer_balance_after.toNumber(), tokens - deposit, "issuer has sent tokens as a deposit to the factory");