Name changes in InstaRead.sol

This commit is contained in:
Thrilok Kumar 2020-04-10 23:15:27 +05:30
parent 1623b71933
commit ebed01fbc6

View File

@ -93,20 +93,20 @@ contract AccountResolver is Helpers {
return listContract.accountAddr(uint64(id)); return listContract.accountAddr(uint64(id));
} }
function getOwnerIDs(address owner) public view returns(uint64[] memory){ function getAuthorityIDs(address authority) public view returns(uint64[] memory){
ListInterface.UserLink memory userLink = listContract.userLink(owner); ListInterface.UserLink memory userLink = listContract.userLink(authority);
uint64[] memory IDs = new uint64[](userLink.count); uint64[] memory IDs = new uint64[](userLink.count);
uint64 id = userLink.first; uint64 id = userLink.first;
for (uint i = 0; i < userLink.count; i++) { for (uint i = 0; i < userLink.count; i++) {
IDs[i] = id; IDs[i] = id;
ListInterface.UserList memory userList = listContract.userList(owner, id); ListInterface.UserList memory userList = listContract.userList(authority, id);
id = userList.next; id = userList.next;
} }
return IDs; return IDs;
} }
function getOwnerAccounts(address owner) public view returns(address[] memory){ function getAuthorityAccounts(address authority) public view returns(address[] memory){
uint64[] memory IDs = getOwnerIDs(owner); uint64[] memory IDs = getAuthorityIDs(authority);
address[] memory accounts = new address[](IDs.length); address[] memory accounts = new address[](IDs.length);
for (uint i = 0; i < IDs.length; i++) { for (uint i = 0; i < IDs.length; i++) {
accounts[i] = getAccount(IDs[i]); accounts[i] = getAccount(IDs[i]);
@ -114,20 +114,20 @@ contract AccountResolver is Helpers {
return accounts; return accounts;
} }
function getIDOwners(uint id) public view returns(address[] memory){ function getIDAuthorities(uint id) public view returns(address[] memory){
ListInterface.AccountLink memory accountLink = listContract.accountLink(uint64(id)); ListInterface.AccountLink memory accountLink = listContract.accountLink(uint64(id));
address[] memory owners = new address[](accountLink.count); address[] memory authorities = new address[](accountLink.count);
address owner = accountLink.first; address authority = accountLink.first;
for (uint i = 0; i < accountLink.count; i++) { for (uint i = 0; i < accountLink.count; i++) {
owners[i] = owner; authorities[i] = authority;
ListInterface.AccountList memory accountList = listContract.accountList(uint64(id), owner); ListInterface.AccountList memory accountList = listContract.accountList(uint64(id), authority);
owner = accountList.next; authority = accountList.next;
} }
return owners; return authorities;
} }
function getAccountOwners(address account) public view returns(address[] memory){ function getAccountAuthorities(address account) public view returns(address[] memory){
return getIDOwners(getID(account)); return getIDAuthorities(getID(account));
} }
function getAccountVersions(address[] memory accounts) public view returns(uint[] memory) { function getAccountVersions(address[] memory accounts) public view returns(uint[] memory) {
@ -138,16 +138,16 @@ contract AccountResolver is Helpers {
return versions; return versions;
} }
struct OwnerData { struct AuthorityData {
uint64[] IDs; uint64[] IDs;
address[] accounts; address[] accounts;
uint[] versions; uint[] versions;
} }
function getOwnerDetails(address owner) public view returns(OwnerData memory){ function getAuthorityDetails(address authority) public view returns(AuthorityData memory){
address[] memory accounts = getOwnerAccounts(owner); address[] memory accounts = getAuthorityAccounts(authority);
return OwnerData( return AuthorityData(
getOwnerIDs(owner), getAuthorityIDs(authority),
accounts, accounts,
getAccountVersions(accounts) getAccountVersions(accounts)
); );
@ -225,8 +225,8 @@ contract ConnectorsResolver is AccountResolver {
} }
contract Resolver is ConnectorsResolver { contract DSA_Resolver is ConnectorsResolver {
string public constant name = "v1"; string public constant name = "DSA_Resolver_v1";
uint public constant version = 1; uint public constant version = 1;
constructor(address _index) public{ constructor(address _index) public{