From e113a8e7afe16ac0f013fa88fe0736a86bf800c1 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 5 Feb 2018 15:16:29 +0100 Subject: Put all ED contracts in one folder --- .../src/current/tutorials/AcccountLevels/AccountLevels.sol | 11 ----------- .../src/current/tutorials/EtherDelta/AccountLevels.sol | 11 +++++++++++ .../contracts/src/current/tutorials/EtherDelta/EtherDelta.sol | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 packages/contracts/src/current/tutorials/AcccountLevels/AccountLevels.sol create mode 100644 packages/contracts/src/current/tutorials/EtherDelta/AccountLevels.sol (limited to 'packages/contracts') diff --git a/packages/contracts/src/current/tutorials/AcccountLevels/AccountLevels.sol b/packages/contracts/src/current/tutorials/AcccountLevels/AccountLevels.sol deleted file mode 100644 index 2214ed6b3..000000000 --- a/packages/contracts/src/current/tutorials/AcccountLevels/AccountLevels.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.4.19; - -contract AccountLevels { - //given a user, returns an account level - //0 = regular user (pays take fee and make fee) - //1 = market maker silver (pays take fee, no make fee, gets rebate) - //2 = market maker gold (pays take fee, no make fee, gets entire counterparty's take fee as rebate) - function accountLevel(address user) constant returns(uint) { - return 0; - } -} diff --git a/packages/contracts/src/current/tutorials/EtherDelta/AccountLevels.sol b/packages/contracts/src/current/tutorials/EtherDelta/AccountLevels.sol new file mode 100644 index 000000000..2214ed6b3 --- /dev/null +++ b/packages/contracts/src/current/tutorials/EtherDelta/AccountLevels.sol @@ -0,0 +1,11 @@ +pragma solidity ^0.4.19; + +contract AccountLevels { + //given a user, returns an account level + //0 = regular user (pays take fee and make fee) + //1 = market maker silver (pays take fee, no make fee, gets rebate) + //2 = market maker gold (pays take fee, no make fee, gets entire counterparty's take fee as rebate) + function accountLevel(address user) constant returns(uint) { + return 0; + } +} diff --git a/packages/contracts/src/current/tutorials/EtherDelta/EtherDelta.sol b/packages/contracts/src/current/tutorials/EtherDelta/EtherDelta.sol index 2b58a4a68..515e3342c 100644 --- a/packages/contracts/src/current/tutorials/EtherDelta/EtherDelta.sol +++ b/packages/contracts/src/current/tutorials/EtherDelta/EtherDelta.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.19; import { SafeMath } from "../../utils/SafeMath/SafeMath.sol"; -import { AccountLevels } from "../AccountLevels/AccountLevels.sol"; +import { AccountLevels } from "./AccountLevels.sol"; import { Token } from "../../tokens/Token/Token.sol"; contract EtherDelta is SafeMath { -- cgit