Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Hunter: Use upstream leveldb 1.22 #5532

Merged
merged 4 commits into from
Jun 7, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- Added: [#5591](https://github.com/ethereum/aleth/pull/5591) Network logging bugfixes and improvements and add p2pcap log channel.
- Added: [#5588](https://github.com/ethereum/aleth/pull/5588) Testeth prints similar test suite name suggestions, when the name passed in `-t` argument is not found.
- Added: [#5593](https://github.com/ethereum/aleth/pull/5593) Dynamically updating host ENR.
- Changed: [#5532](https://github.com/ethereum/aleth/pull/5532) The leveldb is upgraded to 1.22. This is breaking change on Windows and the old databases are not compatible.
- Changed: [#5559](https://github.com/ethereum/aleth/pull/5559) Update peer validation error messages.
- Changed: [#5568](https://github.com/ethereum/aleth/pull/5568) Improve rlpx handshake log messages and create new rlpx log channel.
- Changed: [#5576](https://github.com/ethereum/aleth/pull/5576) Moved sstore_combinations and static_Call50000_sha256 tests to stTimeConsuming test suite. (testeth runs them only with `--all` flag)
Expand Down
9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,6 @@ and used if it meets the minimum version requirement.
> a fixed version of CMake and unpacks it to the given directory prefix.
> Example usage: `scripts/install_cmake.sh --prefix /usr/local`.

#### Install dependencies (Windows)

We provide prebuilt dependencies to build the project. Download them
with the [scripts\install_deps.bat](scripts/install_deps.bat) script.

```shell
scripts\install_deps.bat
```

#### Build

Configure the project build with the following command to create the
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ install:
- set PATH=C:\Python36-x64;C:\Python36-x64\Scripts;%PATH%
- pip install requests gitpython

- scripts/install_deps.bat
- set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps
before_build: |
if not exist build mkdir build
cd build
Expand Down
11 changes: 0 additions & 11 deletions cmake/scripts/install_deps.cmake

This file was deleted.

12 changes: 3 additions & 9 deletions libdevcore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIR} PRIVATE ..

target_link_libraries(devcore PUBLIC aleth-buildinfo Boost::filesystem Boost::system Boost::log Boost::thread Threads::Threads PRIVATE ethash::ethash)

if (MSVC)
find_package(LevelDB)
target_include_directories(devcore SYSTEM PUBLIC ${LEVELDB_INCLUDE_DIRS})
target_link_libraries(devcore PRIVATE ${LEVELDB_LIBRARIES})
else()
hunter_add_package(leveldb)
find_package(leveldb CONFIG REQUIRED)
target_link_libraries(devcore PRIVATE leveldb::leveldb)
endif()
hunter_add_package(leveldb)
find_package(leveldb CONFIG REQUIRED)
target_link_libraries(devcore PRIVATE leveldb::leveldb)

hunter_add_package(rocksdb)
find_package(RocksDB CONFIG REQUIRED)
Expand Down
59 changes: 0 additions & 59 deletions scripts/install_deps.bat

This file was deleted.