Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update error messaging in voting.cpp #62

Merged
merged 1 commit into from
Apr 7, 2020
Merged

Update error messaging in voting.cpp #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions fio.contracts/contracts/fio.system/src/voting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ namespace eosiosystem {

auto namesbyname = _fionames.get_index<"byname"_n>();
auto fioname_iter = namesbyname.find(nameHash);
fio_404_assert(fioname_iter != namesbyname.end(), "FIO Address not found", ErrorFioNameNotRegistered);
fio_400_assert(fioname_iter != namesbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

//check that the name is not expired
uint32_t name_expiration = fioname_iter->expiration;
Expand All @@ -210,7 +211,8 @@ namespace eosiosystem {
auto domainsbyname = _domains.get_index<"byname"_n>();
auto domains_iter = domainsbyname.find(domainHash);

fio_404_assert(domains_iter != domainsbyname.end(), "FIO Domain not found", ErrorDomainNotFound);
fio_400_assert(domains_iter != domainsbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

uint32_t expiration = domains_iter->expiration;

Expand Down Expand Up @@ -282,7 +284,8 @@ namespace eosiosystem {
auto namesbyname = _fionames.get_index<"byname"_n>();
auto fioname_iter = namesbyname.find(nameHash);

fio_404_assert(fioname_iter != namesbyname.end(), "FIO Address not found", ErrorFioNameNotRegistered);
fio_400_assert(fioname_iter != namesbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

//check that the name is not expired
uint32_t name_expiration = fioname_iter->expiration;
Expand All @@ -296,7 +299,8 @@ namespace eosiosystem {
auto domainsbyname = _domains.get_index<"byname"_n>();
auto domains_iter = domainsbyname.find(domainHash);

fio_404_assert(domains_iter != domainsbyname.end(), "FIO Domain not found", ErrorDomainNotFound);
fio_400_assert(domains_iter != domainsbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

uint32_t expiration = domains_iter->expiration;
fio_400_assert(present_time <= expiration, "domain", fa.fiodomain, "FIO Domain expired",
Expand Down Expand Up @@ -496,7 +500,7 @@ namespace eosiosystem {

FioAddress fa;
getFioAddressStruct(fio_address, fa);
fio_400_assert(validateFioNameFormat(fa), "fio_address", fio_address, "FIO Address not found",
fio_400_assert(validateFioNameFormat(fa), "fio_address", fio_address, "Invalid FIO Address format",
ErrorDomainAlreadyRegistered);

uint128_t voterHash = string_to_uint128_hash(fio_address.c_str());
Expand All @@ -518,7 +522,8 @@ namespace eosiosystem {
auto domainsbyname = _domains.get_index<"byname"_n>();
auto voterdomain_iter = domainsbyname.find(voterDomainHash);

fio_404_assert(voterdomain_iter != domainsbyname.end(), "FIO Address not found", ErrorDomainNotFound);
fio_400_assert(voterdomain_iter != domainsbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);
fio_403_assert(voter_iter->owner_account == actor.value, ErrorSignature);

uint32_t voterdomain_expiration = voterdomain_iter->expiration;
Expand All @@ -532,7 +537,8 @@ namespace eosiosystem {
uint128_t domainHash = string_to_uint128_hash(fa.fiodomain.c_str());

auto fioname_iter = namesbyname.find(nameHash);
fio_404_assert(fioname_iter != namesbyname.end(), "FIO Address not found", ErrorFioNameNotRegistered);
fio_400_assert(fioname_iter != namesbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

uint32_t name_expiration = fioname_iter->expiration;

Expand All @@ -542,7 +548,8 @@ namespace eosiosystem {

auto domains_iter = domainsbyname.find(domainHash);

fio_404_assert(domains_iter != domainsbyname.end(), "FIO Domain not found", ErrorDomainNotFound);
fio_400_assert(domains_iter != domainsbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

uint32_t expiration = domains_iter->expiration;
fio_400_assert(present_time <= expiration, "domain", fa.fiodomain, "FIO Domain expired",
Expand Down Expand Up @@ -620,7 +627,9 @@ namespace eosiosystem {
getFioAddressStruct(proxy, fa);
getFioAddressStruct(fio_address, va);

fio_400_assert(validateFioNameFormat(fa), "fio_address", fio_address, "FIO Address not found",
fio_400_assert(validateFioNameFormat(va), "proxy", proxy, "Invalid FIO Address format",
ErrorDomainAlreadyRegistered);
fio_400_assert(validateFioNameFormat(fa), "fio_address", fio_address, "Invalid FIO Address format",
ErrorDomainAlreadyRegistered);

uint128_t voterHash = string_to_uint128_hash(fio_address.c_str());
Expand All @@ -641,8 +650,8 @@ namespace eosiosystem {

auto domainsbyname = _domains.get_index<"byname"_n>();
auto voterdomain_iter = domainsbyname.find(voterDomainHash);

fio_404_assert(voterdomain_iter != domainsbyname.end(), "FIO Address not found", ErrorDomainNotFound);
fio_400_assert(voterdomain_iter != domainsbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);
fio_403_assert(voter_iter->owner_account == actor.value, ErrorSignature);

uint32_t voterdomain_expiration = voterdomain_iter->expiration;
Expand All @@ -652,25 +661,26 @@ namespace eosiosystem {
uint128_t nameHash = string_to_uint128_hash(fa.fioaddress.c_str());
uint128_t domainHash = string_to_uint128_hash(fa.fiodomain.c_str());
auto fioname_iter = namesbyname.find(nameHash);
fio_404_assert(fioname_iter != namesbyname.end(), "FIO Address not found", ErrorFioNameNotRegistered);
fio_400_assert(fioname_iter != namesbyname.end(), "proxy", proxy,
"FIO Address not registered", ErrorFioNameNotReg);

//check that the name is not expired
uint32_t name_expiration = fioname_iter->expiration;

uint64_t account = fioname_iter->owner_account;
fio_400_assert(present_time <= name_expiration, "fio_address", proxy,
fio_400_assert(present_time <= name_expiration, "proxy", proxy,
"FIO Address expired", ErrorFioNameExpired);

auto domains_iter = domainsbyname.find(domainHash);

fio_404_assert(domains_iter != domainsbyname.end(), "FIO Domain not found", ErrorDomainNotFound);
fio_400_assert(domains_iter != domainsbyname.end(), "proxy", proxy,
"FIO Address not registered", ErrorFioNameNotReg);

uint32_t expiration = domains_iter->expiration;

//add 30 days to the domain expiration, this call will work until 30 days past expire.
expiration = get_time_plus_seconds(expiration,SECONDS30DAYS);

fio_400_assert(present_time <= expiration, "domain", fa.fiodomain, "FIO Domain expired",
fio_400_assert(present_time <= expiration, "proxy", proxy, "FIO Domain expired",
ErrorDomainExpired);

auto proxy_name = name{account};
Expand Down Expand Up @@ -1030,7 +1040,8 @@ namespace eosiosystem {
auto domainsbyname = _domains.get_index<"byname"_n>();
auto domains_iter = domainsbyname.find(domainHash);

fio_404_assert(domains_iter != domainsbyname.end(), "FIO Domain not found", ErrorDomainNotFound);
fio_400_assert(domains_iter != domainsbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

uint32_t expiration = domains_iter->expiration;
fio_400_assert(present_time <= expiration, "domain", fa.fiodomain, "FIO Domain expired",
Expand Down Expand Up @@ -1103,7 +1114,8 @@ namespace eosiosystem {
auto domainsbyname = _domains.get_index<"byname"_n>();
auto domains_iter = domainsbyname.find(domainHash);

fio_404_assert(domains_iter != domainsbyname.end(), "FIO Domain not found", ErrorDomainNotFound);
fio_400_assert(domains_iter != domainsbyname.end(), "fio_address", fio_address,
"FIO Address not registered", ErrorFioNameNotReg);

uint32_t expiration = domains_iter->expiration;

Expand Down