From d2c26192ca6d8de0ae5e922fdebfe8f36f26a8dd Mon Sep 17 00:00:00 2001
From: Thrilok Kumar <thrilok2000@gmail.com>
Date: Mon, 4 May 2020 02:48:00 +0530
Subject: [PATCH] Refactored mock contract

---
 contracts/common/{ERC20.sol => interfaces.sol} | 9 +++++++++
 contracts/common/stores.sol                    | 8 +-------
 contracts/connectors/mock.sol                  | 2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename contracts/common/{ERC20.sol => interfaces.sol} (54%)

diff --git a/contracts/common/ERC20.sol b/contracts/common/interfaces.sol
similarity index 54%
rename from contracts/common/ERC20.sol
rename to contracts/common/interfaces.sol
index 487cebf..3057289 100644
--- a/contracts/common/ERC20.sol
+++ b/contracts/common/interfaces.sol
@@ -7,4 +7,13 @@ interface ERC20 {
     function deposit() external payable;
     function withdraw(uint) external;
     function balanceOf(address) external view returns (uint);
+}
+
+interface MemoryInterface {
+    function getUint(uint id) external returns (uint num);
+    function setUint(uint id, uint val) external;
+}
+
+interface EventInterface {
+    function emitEvent(uint connectorType, uint connectorID, bytes32 eventCode, bytes calldata eventData) external;
 }
\ No newline at end of file
diff --git a/contracts/common/stores.sol b/contracts/common/stores.sol
index 0f674e5..7926bb7 100644
--- a/contracts/common/stores.sol
+++ b/contracts/common/stores.sol
@@ -1,13 +1,7 @@
 pragma solidity ^0.6.0;
 
-interface MemoryInterface {
-    function getUint(uint id) external returns (uint num);
-    function setUint(uint id, uint val) external;
-}
+import { MemoryInterface, EventInterface} from "./interfaces.sol";
 
-interface EventInterface {
-    function emitEvent(uint connectorType, uint connectorID, bytes32 eventCode, bytes calldata eventData) external;
-}
 
 contract Stores {
 
diff --git a/contracts/connectors/mock.sol b/contracts/connectors/mock.sol
index c3e8834..8c65447 100644
--- a/contracts/connectors/mock.sol
+++ b/contracts/connectors/mock.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.6.0;
 
 // import files from common directory
-import { ERC20 } from "../common/ERC20.sol";
+import { ERC20 , MemoryInterface, EventInterface} from "../common/interfaces.sol";
 import { Stores } from "../common/stores.sol";
 import { DSMath } from "../common/math.sol";