From 4d886d14da43058b4d33d19f71a76f95d62ee220 Mon Sep 17 00:00:00 2001
From: Sowmayjain <champ.sowmay@gmail.com>
Date: Tue, 12 Mar 2019 04:39:59 +0530
Subject: [PATCH] contract merged in address registry.

---
 contracts/AddressRegistry.sol | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/contracts/AddressRegistry.sol b/contracts/AddressRegistry.sol
index e61a3d1..eb100e8 100644
--- a/contracts/AddressRegistry.sol
+++ b/contracts/AddressRegistry.sol
@@ -3,7 +3,12 @@ pragma solidity ^0.5.0;
 
 contract AddressRegistry {
     event AddressSet(string name, address addr);
+    event DefaultLogicSet(address logicAddr);
+    event LogicSet(address logicAddr, bool isLogic);
+
     mapping(bytes32 => address) registry;
+    mapping(address => bool) public defaultLogicProxies;
+    mapping(address => bool) public logicProxies;
 
     constructor() public {
         registry[keccak256(abi.encodePacked("admin"))] = msg.sender;
@@ -32,16 +37,6 @@ contract AddressRegistry {
         _;
     }
 
-}
-
-
-contract LogicRegistry is AddressRegistry {
-    event DefaultLogicSet(address logicAddr);
-    event LogicSet(address logicAddr, bool isLogic);
-
-    mapping(address => bool) public defaultLogicProxies;
-    mapping(address => bool) public logicProxies;
-
     function getLogic(address logicAddr) public view returns (bool) {
         if (defaultLogicProxies[logicAddr]) {
             return true;
@@ -52,16 +47,16 @@ contract LogicRegistry is AddressRegistry {
         }
     }
 
-    function setLogic(address logicAddr, bool isLogic) public isAdmin {
-        require(msg.sender == getAddress("admin"), "Permission Denied");
-        logicProxies[logicAddr] = true;
-        emit LogicSet(logicAddr, isLogic);
-    }
-
     function setDefaultLogic(address logicAddr) public isAdmin {
         require(msg.sender == getAddress("admin"), "Permission Denied");
         defaultLogicProxies[logicAddr] = true;
         emit DefaultLogicSet(logicAddr);
     }
 
-}
+    function setLogic(address logicAddr, bool isLogic) public isAdmin {
+        require(msg.sender == getAddress("admin"), "Permission Denied");
+        logicProxies[logicAddr] = true;
+        emit LogicSet(logicAddr, isLogic);
+    }
+
+}
\ No newline at end of file