Contracts: stet RegisteredToken attributes. Relates to #89

OpenST · Feb 2, 2018 · bcbd4f5 · bcbd4f5
1 parent 35f4d28
commit bcbd4f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/contracts/OpenSTUtility.sol b/contracts/OpenSTUtility.sol
@@ -44,9 +44,6 @@ contract OpenSTUtility is Hasher, OpsManaged, STPrimeConfig {
     struct RegisteredToken {
         UtilityTokenInterface token;
         address registrar;
-        string symbol;
-        string name;
-        uint256 conversionRate;
     }
 
     struct Mint {
@@ -170,10 +167,7 @@ contract OpenSTUtility is Hasher, OpsManaged, STPrimeConfig {
 
         registeredTokens[uuidSTPrime] = RegisteredToken({
             token:          UtilityTokenInterface(simpleTokenPrime),
-            registrar:      registrar,
-            symbol:         STPRIME_SYMBOL,
-            name:           STPRIME_NAME,
-            conversionRate: STPRIME_CONVERSION_RATE
+            registrar:      registrar
         });
 
         uuids.push(uuidSTPrime);
@@ -624,10 +618,7 @@ contract OpenSTUtility is Hasher, OpsManaged, STPrimeConfig {
 
         registeredTokens[registeredUuid] = RegisteredToken({
             token:          _brandedToken,
-            registrar:      registrar,
-            symbol:         _symbol,
-            name:           _name,
-            conversionRate: _conversionRate
+            registrar:      registrar
         });
 
         // register name to registrar

diff --git a/test/OpenSTUtility.js b/test/OpenSTUtility.js
@@ -204,7 +204,7 @@ contract('OpenSTUtility', function(accounts) {
 			assert.equal(await openSTUtility.registerBrandedToken.call(symbol, name, conversionRate, accounts[0], brandedToken, checkBtUuid, { from: registrar }), checkBtUuid);
             result = await openSTUtility.registerBrandedToken(symbol, name, conversionRate, accounts[0], brandedToken, checkBtUuid, { from: registrar });
 			assert.equal(await openSTUtility.getUuidsSize.call(), 2);
-			assert.equal((await openSTUtility.registeredTokens.call(checkBtUuid))[2], symbol);
+			assert.equal((await openSTUtility.registeredTokens.call(checkBtUuid))[0], brandedToken);
             await OpenSTUtility_utils.checkRegisteredBrandedTokenEvent(result.logs[0], registrar, brandedToken, checkBtUuid, symbol, name, conversionRate, accounts[0]);            
 		})
 	})