Skip to content

Commit 71e9c94

Browse files
authored
Merge pull request #405 from PolymathNetwork/str-fix
getTickersOwner fix
2 parents 88fd591 + 1b93ed3 commit 71e9c94

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

contracts/SecurityTokenRegistry.sol

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,18 @@ contract SecurityTokenRegistry is ISecurityTokenRegistry, EternalStorage {
427427
uint counter = 0;
428428
// accessing the data structure userTotickers[_owner].length
429429
bytes32[] memory tickers = getArrayBytes32(Encoder.getKey("userToTickers", _owner));
430-
bytes32[] memory tempList = new bytes32[](tickers.length);
431430
for (uint i = 0; i < tickers.length; i++) {
432431
string memory ticker = Util.bytes32ToString(tickers[i]);
433432
/*solium-disable-next-line security/no-block-members*/
433+
if (getUint(Encoder.getKey("registeredTickers_expiryDate", ticker)) >= now || _tickerStatus(ticker)) {
434+
counter ++;
435+
}
436+
}
437+
bytes32[] memory tempList = new bytes32[](counter);
438+
counter = 0;
439+
for (i = 0; i < tickers.length; i++) {
440+
ticker = Util.bytes32ToString(tickers[i]);
441+
/*solium-disable-next-line security/no-block-members*/
434442
if (getUint(Encoder.getKey("registeredTickers_expiryDate", ticker)) >= now || _tickerStatus(ticker)) {
435443
tempList[counter] = tickers[i];
436444
counter ++;

test/n_security_token_registry.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,6 +993,7 @@ contract("SecurityTokenRegistry", accounts => {
993993

994994
it("Should get the tickers by owner", async () => {
995995
let tickersList = await I_STRProxied.getTickersByOwner.call(token_owner);
996+
console.log(tickersList);
996997
assert.equal(tickersList.length, 4);
997998
let tickersListArray = await I_STRProxied.getTickersByOwner.call(account_temp);
998999
console.log(tickersListArray);

0 commit comments

Comments
 (0)