Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/inconsistent naming #31

Merged
merged 3 commits into from
May 4, 2020
Merged

Fix/inconsistent naming #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
843f0f8
fix inconsistent naming
arseneeth May 4, 2020
7c33f4c
Merge branch 'develop' into bug/inconsistent-naming
arseneeth May 4, 2020
588216c
fix build error
arseneeth May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/fee/Collector.sol → contracts/fee/FeeCalculator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.5.7;


contract Collector {
contract FeeCalculator {

}
2 changes: 1 addition & 1 deletion contracts/fee/Calculator.sol → contracts/fee/FeeCollector.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.5.7;


contract Calculator {
contract FeeCollector {

}
4 changes: 2 additions & 2 deletions contracts/fee/Manager.sol → contracts/fee/FeeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity ^0.5.7;

import './Calculator.sol';
import './Collector.sol';
import './FeeCalculator.sol';
import './FeeCollector.sol';
import 'openzeppelin-solidity/contracts/math/SafeMath.sol';

contract FeeManager {
Expand Down
2 changes: 1 addition & 1 deletion contracts/templates/ERC20Template.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.5.7;

import '../fee/Manager.sol';
import '../fee/FeeManager.sol';
import './token/ERC20Pausable.sol';

/**
Expand Down