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.

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

Remove one of the duplicate Solidity source directories #741

Merged
merged 2 commits into from
Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Documents changes that result in:

## Unreleased

- Removed raiden_contracts/contracts. Instead, please edit raiden_contracts/data/source directly.

## [0.14.0](https://github.com/raiden-network/raiden-contracts/releases/tag/v0.14.0) - 2019-03-11

- [#720](https://github.com/raiden-network/raiden-contracts/pull/720) Removed checks in MonitoringService.canMonitor() until the design is determined.
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ all: verify_contracts install

compile_contracts:
python setup.py compile_contracts
rm -rf raiden_contracts/data/source
cp -r raiden_contracts/contracts raiden_contracts/data/source

verify_contracts:
python setup.py verify_contracts
diff -r raiden_contracts/contracts raiden_contracts/data/source

install:
pip install -r requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion raiden_contracts/contract_source_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def checksum_contracts(self) -> None:


def contracts_source_path():
return contracts_source_path_with_stem('contracts')
return contracts_source_path_with_stem('data/source')


def contracts_source_path_with_stem(stem):
Expand Down
Empty file.
41 changes: 0 additions & 41 deletions raiden_contracts/contracts/lib/ECVerify.sol

This file was deleted.

55 changes: 0 additions & 55 deletions raiden_contracts/contracts/raiden/EndpointRegistry.sol

This file was deleted.

50 changes: 0 additions & 50 deletions raiden_contracts/contracts/raiden/SecretRegistry.sol

This file was deleted.

41 changes: 0 additions & 41 deletions raiden_contracts/contracts/raiden/Token.sol

This file was deleted.

Loading