@@ -588,7 +588,7 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
588
588
} ) ;
589
589
assert . assert ( tickerDetails . status , 'Not deployed' ) ;
590
590
const isFrozen = await ( await this . securityTokenContract (
591
- await this . getSecurityTokenAddress ( params . ticker ) ,
591
+ await this . getSecurityTokenAddress ( { ticker : params . ticker } ) ,
592
592
) ) . transfersFrozen . callAsync ( ) ;
593
593
assert . assert ( isFrozen , 'Transfers not frozen' ) ;
594
594
return ( await this . contract ) . refreshSecurityToken . sendTransactionAsync (
@@ -724,7 +724,7 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
724
724
assert . assert ( params . registrationDate . getTime ( ) > new Date ( 0 ) . getTime ( ) , 'Bad registration date' ) ;
725
725
assert . isNonZeroETHAddressHex ( 'owner' , params . owner ) ;
726
726
if ( params . status ) {
727
- const address = await this . getSecurityTokenAddress ( params . ticker ) ;
727
+ const address = await this . getSecurityTokenAddress ( { ticker : params . ticker } ) ;
728
728
assert . isNonZeroETHAddressHex ( 'address' , address ) ;
729
729
}
730
730
return ( await this . contract ) . modifyExistingTicker . sendTransactionAsync (
@@ -799,7 +799,7 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
799
799
assert . assert ( functionsUtils . checksumAddressComparision ( address , tickerDetails . owner ) , 'Not authorised' ) ;
800
800
if ( tickerDetails . status ) {
801
801
const securityTokenOwner = await ( await this . securityTokenContract (
802
- await this . getSecurityTokenAddress ( params . ticker ) ,
802
+ await this . getSecurityTokenAddress ( { ticker : params . ticker } ) ,
803
803
) ) . owner . callAsync ( ) ;
804
804
assert . assert ( securityTokenOwner === params . newOwner , 'New owner does not match token owner' ) ;
805
805
}
@@ -855,30 +855,28 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
855
855
} ;
856
856
857
857
/**
858
- * Returns the security token address by ticker symbol
859
- * @param ticker is the ticker of the security token
858
+ * Returns the security token address by ticker symbol
860
859
* @return address string
861
860
*/
862
- public getSecurityTokenAddress = async ( ticker : string ) => {
863
- return ( await this . contract ) . getSecurityTokenAddress . callAsync ( ticker ) ;
864
- } ;
861
+ public getSecurityTokenAddress = async ( params : TickerParams ) => {
862
+ return ( await this . contract ) . getSecurityTokenAddress . callAsync ( params . ticker ) ;
863
+ } ;
865
864
866
865
/**
867
866
* Gets ticker availability
868
867
* @return boolean
869
868
*/
870
- public isTickerAvailable = async ( params : TickerParams ) => {
871
- const result = await this . getTickerDetailsInternal ( params . ticker ) ;
872
- return this . isTickerAvailableInternal ( result . registrationDate , result . expiryDate , result . status ) ;
873
- } ;
869
+ public tickerAvailable = async ( params : TickerParams ) => {
870
+ return ( await this . contract ) . tickerAvailable . callAsync ( params . ticker ) ;
871
+ }
874
872
875
873
/**
876
874
* Knows if the ticker was registered by the user
877
875
* @return boolean
878
876
*/
879
877
public isTickerRegisteredByCurrentIssuer = async ( params : TickerParams ) => {
880
878
const result = await this . getTickerDetailsInternal ( params . ticker ) ;
881
- if ( this . isTickerAvailableInternal ( result . registrationDate , result . expiryDate , result . status ) ) {
879
+ if ( await this . tickerAvailable ( { ticker : params . ticker } ) ) {
882
880
return false ;
883
881
}
884
882
return result . owner === ( await this . getDefaultFromAddress ( ) ) ;
@@ -906,7 +904,7 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
906
904
) ;
907
905
assert . isETHAddressHex ( 'owner' , params . owner ) ;
908
906
if ( params . status ) {
909
- const address = await this . getSecurityTokenAddress ( params . ticker ) ;
907
+ const address = await this . getSecurityTokenAddress ( { ticker : params . ticker } ) ;
910
908
assert . isNonZeroETHAddressHex ( 'address' , address ) ;
911
909
}
912
910
return ( await this . contract ) . modifyTicker . sendTransactionAsync (
@@ -1220,16 +1218,6 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
1220
1218
return logs ;
1221
1219
} ;
1222
1220
1223
- private isTickerAvailableInternal = ( registrationDate : Date , expiryDate : Date , isDeployed : boolean ) => {
1224
- if ( registrationDate . getTime ( ) === new Date ( 0 ) . getTime ( ) ) {
1225
- return true ;
1226
- }
1227
- if ( ! isDeployed && expiryDate . getTime ( ) > Date . now ( ) ) {
1228
- return true ;
1229
- }
1230
- return false ;
1231
- } ;
1232
-
1233
1221
private getTickerDetailsInternal = async ( ticker : string ) => {
1234
1222
const result = await ( await this . contract ) . getTickerDetails . callAsync ( ticker ) ;
1235
1223
const typedResult : TickerDetails = {
@@ -1267,7 +1255,7 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
1267
1255
assert . isETHAddressHex ( 'owner' , owner ) ;
1268
1256
assert . assert ( ticker . length > 0 && ticker . length <= 10 , 'Bad ticker, must be 1 to 10 characters' ) ;
1269
1257
assert . assert (
1270
- await this . isTickerAvailable ( {
1258
+ await this . tickerAvailable ( {
1271
1259
ticker,
1272
1260
} ) ,
1273
1261
'Ticker is not available' ,
@@ -1289,7 +1277,7 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
1289
1277
assert . isNonZeroETHAddressHex ( 'securityToken' , securityToken ) ;
1290
1278
assert . isNonZeroETHAddressHex (
1291
1279
'Security token not registered for ticker' ,
1292
- await this . getSecurityTokenAddress ( ticker ) ,
1280
+ await this . getSecurityTokenAddress ( { ticker } ) ,
1293
1281
) ;
1294
1282
} ;
1295
1283
}
0 commit comments