Merge branch 'master' of github.com:InstaDApp/sa-resolvers

This commit is contained in:
Thrilok Kumar 2020-04-12 00:39:53 +05:30
commit 03cea2a064

View File

@ -106,7 +106,7 @@ contract Helpers is DSMath {
address vaultAddress; address vaultAddress;
} }
struct IlkData { struct ColInfo {
uint borrowRate; uint borrowRate;
uint price; uint price;
uint liquidationRatio; uint liquidationRatio;
@ -231,18 +231,18 @@ contract VaultResolver is Helpers {
return vault; return vault;
} }
function getColInfo(string memory name) public view returns (IlkData[] memory) { function getColInfo(string[] memory name) public view returns (ColInfo[] memory) {
bytes32 ilks = stringToBytes32(name); ColInfo[] memory colInfo = new ColInfo[](name.length);
IlkData[] memory ilkData = new IlkData[](ilks.length);
for (uint i = 0; i < ilks.length; i++) { for (uint i = 0; i < name.length; i++) {
ilkData[i] = IlkData( bytes32 ilk = stringToBytes32(name[i]);
getFee(ilks[i]), colInfo[i] = ColInfo(
getColPrice(ilks[i]), getFee(ilk),
getColRatio(ilks[i]) getColPrice(ilk),
getColRatio(ilk)
); );
} }
return ilkData; return colInfo;
} }
} }