From e6b993bf54d936892f62245365bf2d20da0e0719 Mon Sep 17 00:00:00 2001
From: Sowmayjain <champ.sowmay@gmail.com>
Date: Sun, 7 Apr 2019 18:34:51 +0530
Subject: [PATCH] Optimized if-else statements.
---
contracts/InstaRegistry.sol | 21 +++++++++++++++------
contracts/UserWallet.sol | 3 +--
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/contracts/InstaRegistry.sol b/contracts/InstaRegistry.sol
index 45e8f47..eb9537d 100644
--- a/contracts/InstaRegistry.sol
+++ b/contracts/InstaRegistry.sol
@@ -62,9 +62,18 @@ contract LogicRegistry is AddressRegistry {
function logic(address _logicAddress) public view returns (bool) {
if (defaultLogicProxies[_logicAddress] || logicProxies[_logicAddress]) {
return true;
- } else {
- return false;
}
+ return false;
+ }
+
+ /// @dev
+ /// @param _logicAddress (address)
+ /// @return (bool)
+ function defaultLogic(address _logicAddress) public view returns (bool) {
+ if (defaultLogicProxies[_logicAddress]) {
+ return true;
+ }
+ return false;
}
/// @dev Sets the default logic proxy to true
@@ -114,12 +123,12 @@ contract WalletRegistry is LogicRegistry {
/// @dev update the proxy record whenever owner changed on any proxy
/// Throws if msg.sender is not a proxy contract created via this contract
/// @return proxy () UserWallet
- function build(address owner) public returns (UserWallet proxy) {
- require(proxies[owner] == UserWallet(0), "multiple-proxy-per-user-not-allowed");
+ function build(address _owner) public returns (UserWallet proxy) {
+ require(proxies[_owner] == UserWallet(0), "multiple-proxy-per-user-not-allowed");
proxy = new UserWallet();
proxies[address(this)] = proxy; // will be changed via record() in next line execution
- proxy.setOwner(owner);
- emit Created(msg.sender, owner, address(proxy));
+ proxy.setOwner(_owner);
+ emit Created(msg.sender, _owner, address(proxy));
}
/// @dev Transafers ownership
diff --git a/contracts/UserWallet.sol b/contracts/UserWallet.sol
index e620310..32d2cde 100644
--- a/contracts/UserWallet.sol
+++ b/contracts/UserWallet.sol
@@ -66,9 +66,8 @@ contract UserAuth is AddressRecord {
return true;
} else if (src == address(this)) {
return true;
- } else {
- return false;
}
+ return false;
}
}