aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-02-05 22:12:01 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-03-02 04:21:08 +0800
commite42891ae5b1b535d4376fc31078f15d6c3c9cb77 (patch)
tree1053735f063a8633df697eb248508d758b096c1b
parentc90770472e19759d0bb2db49be3d8d9340f76bac (diff)
downloaddexon-sol-tools-e42891ae5b1b535d4376fc31078f15d6c3c9cb77.tar
dexon-sol-tools-e42891ae5b1b535d4376fc31078f15d6c3c9cb77.tar.gz
dexon-sol-tools-e42891ae5b1b535d4376fc31078f15d6c3c9cb77.tar.bz2
dexon-sol-tools-e42891ae5b1b535d4376fc31078f15d6c3c9cb77.tar.lz
dexon-sol-tools-e42891ae5b1b535d4376fc31078f15d6c3c9cb77.tar.xz
dexon-sol-tools-e42891ae5b1b535d4376fc31078f15d6c3c9cb77.tar.zst
dexon-sol-tools-e42891ae5b1b535d4376fc31078f15d6c3c9cb77.zip
Move tutorials contracts to src folder
-rw-r--r--packages/contracts/src/current/tutorials/AcccountLevels/AccountLevels.sol (renamed from packages/contracts/contracts/tutorials/AccountLevels.sol)0
-rw-r--r--packages/contracts/src/current/tutorials/Arbitrage/Arbitrage.sol (renamed from packages/contracts/contracts/tutorials/Arbitrage.sol)9
-rw-r--r--packages/contracts/src/current/tutorials/EtherDelta/EtherDelta.sol (renamed from packages/contracts/contracts/tutorials/EtherDelta.sol)6
3 files changed, 7 insertions, 8 deletions
diff --git a/packages/contracts/contracts/tutorials/AccountLevels.sol b/packages/contracts/src/current/tutorials/AcccountLevels/AccountLevels.sol
index 2214ed6b3..2214ed6b3 100644
--- a/packages/contracts/contracts/tutorials/AccountLevels.sol
+++ b/packages/contracts/src/current/tutorials/AcccountLevels/AccountLevels.sol
diff --git a/packages/contracts/contracts/tutorials/Arbitrage.sol b/packages/contracts/src/current/tutorials/Arbitrage/Arbitrage.sol
index 726696966..3ee8b5fba 100644
--- a/packages/contracts/contracts/tutorials/Arbitrage.sol
+++ b/packages/contracts/src/current/tutorials/Arbitrage/Arbitrage.sol
@@ -1,10 +1,9 @@
pragma solidity ^0.4.19;
-pragma experimental ABIEncoderV2;
-import "../Exchange.sol";
-import "../tokens/Token.sol";
-import "./EtherDelta.sol";
-import "../tokens/WETH9.sol";
+import { Exchange } from "../../protocol/Exchange/Exchange.sol";
+import { EtherDelta } from "../EtherDelta/EtherDelta.sol";
+import { Ownable } from "../../utils/Ownable/Ownable.sol";
+import { Token } from "../../tokens/Token/Token.sol";
contract Arbitrage is Ownable {
diff --git a/packages/contracts/contracts/tutorials/EtherDelta.sol b/packages/contracts/src/current/tutorials/EtherDelta/EtherDelta.sol
index 74b4c08e8..2b58a4a68 100644
--- a/packages/contracts/contracts/tutorials/EtherDelta.sol
+++ b/packages/contracts/src/current/tutorials/EtherDelta/EtherDelta.sol
@@ -1,8 +1,8 @@
pragma solidity ^0.4.19;
-import "../utils/SafeMath.sol";
-import "./AccountLevels.sol";
-import "../tokens/Token.sol";
+import { SafeMath } from "../../utils/SafeMath/SafeMath.sol";
+import { AccountLevels } from "../AccountLevels/AccountLevels.sol";
+import { Token } from "../../tokens/Token/Token.sol";
contract EtherDelta is SafeMath {
address public admin; //the admin address