Skip to content

Commit 54b7dac

Browse files
hbdgrJoyGaming
authored andcommitted
Cleanup, delete OpenZeppelin contracts, use thier library instead
totalSupply -> totalSupply_ in JoyToken.sol according to: OpenZeppelin/openzeppelin-contracts#666
1 parent 3a72763 commit 54b7dac

File tree

13 files changed

+18
-251
lines changed

13 files changed

+18
-251
lines changed

contracts/deposit/PlatformDeposit.sol

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
pragma solidity ^0.4.11;
22

3-
import '../math/SafeMath.sol';
3+
import 'openzeppelin-solidity/contracts/ownership/Ownable.sol';
4+
import 'openzeppelin-solidity/contracts/math/SafeMath.sol';
5+
46
import '../token/JoyToken.sol';
57
import '../token/ERC223ReceivingContract.sol';
6-
import '../ownership/Ownable.sol';
78
import '../game/JoyGameAbstract.sol';
89

910
/**

contracts/game/JoyGameAbstract.sol

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pragma solidity ^0.4.11;
22

3-
import '../ownership/Ownable.sol';
4-
3+
import 'openzeppelin-solidity/contracts/ownership/Ownable.sol';
54

65
contract JoyGameAbstract is Ownable {
76

contracts/game/JoyGameDemo.sol

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
pragma solidity ^0.4.11;
22

3+
import 'openzeppelin-solidity/contracts/ownership/Ownable.sol';
4+
import 'openzeppelin-solidity/contracts/math/SafeMath.sol';
5+
36
import '../deposit/PlatformDeposit.sol';
4-
import '../math/SafeMath.sol';
5-
import '../ownership/Ownable.sol';
67
import './JoyGameAbstract.sol';
78

89

contracts/math/SafeMath.sol

Lines changed: 0 additions & 32 deletions
This file was deleted.

contracts/ownership/Ownable.sol

Lines changed: 0 additions & 45 deletions
This file was deleted.

contracts/subscribe/SubscriptionWithEther.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
pragma solidity ^0.4.16;
22

3+
import 'openzeppelin-solidity/contracts/ownership/Ownable.sol';
4+
35
import './Subscription.sol';
4-
import '../ownership/Ownable.sol';
56

67
/**
78
* Contract for purchasing subscriptions with ether on the owned platform

contracts/subscribe/SubscriptionWithJoyToken.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
pragma solidity ^0.4.16;
22

3+
import 'openzeppelin-solidity/contracts/ownership/Ownable.sol';
4+
35
import './Subscription.sol';
4-
import '../ownership/Ownable.sol';
56
import '../token/ERC223ReceivingContract.sol';
67
import '../token/JoyToken.sol';
78

contracts/token/BasicToken.sol

Lines changed: 0 additions & 41 deletions
This file was deleted.

contracts/token/ERC20.sol

Lines changed: 0 additions & 16 deletions
This file was deleted.

contracts/token/ERC20Basic.sol

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)