Change name from nlpn to fluffy (#734)
This commit is contained in:
parent
36247ed6f4
commit
f8b3922eb5
|
@ -2,7 +2,7 @@ name: CI
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
paths-ignore: ['doc/**', 'docs/**', '**/*.md', 'hive_integration/**',
|
paths-ignore: ['doc/**', 'docs/**', '**/*.md', 'hive_integration/**',
|
||||||
'nlpn/**', '.github/workflows/nlpn.yml']
|
'fluffy/**', '.github/workflows/fluffy.yml']
|
||||||
# Disable `pull_request`. Experimenting with using only `push` for PRs.
|
# Disable `pull_request`. Experimenting with using only `push` for PRs.
|
||||||
#pull_request:
|
#pull_request:
|
||||||
# paths-ignore: ['doc/**', 'docs/**', '**/*.md', 'hive_integration/**']
|
# paths-ignore: ['doc/**', 'docs/**', '**/*.md', 'hive_integration/**']
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
name: nlpn CI
|
name: fluffy CI
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
paths: ['nlpn/**', '.github/workflows/nlpn.yml', 'vendor/**', 'Makefile',
|
paths: ['fluffy/**', '.github/workflows/fluffy.yml', 'vendor/**',
|
||||||
'nimbus.nimble', '!nlpn/**/*.md']
|
'Makefile', 'nimbus.nimble', '!fluffy/**/*.md']
|
||||||
pull_request:
|
pull_request:
|
||||||
paths: ['nlpn/**', '.github/workflows/nlpn.yml', 'vendor/**', 'Makefile',
|
paths: ['fluffy/**', '.github/workflows/fluffy.yml', 'vendor/**',
|
||||||
'nimbus.nimble', '!nlpn/**/*.md']
|
'Makefile', 'nimbus.nimble', '!fluffy/**/*.md']
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
@ -163,30 +163,30 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update
|
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update
|
||||||
|
|
||||||
- name: Run nlpn tests (Windows)
|
- name: Run fluffy tests (Windows)
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
run: |
|
run: |
|
||||||
gcc --version
|
gcc --version
|
||||||
DEFAULT_MAKE_FLAGS="-j${ncpu}"
|
DEFAULT_MAKE_FLAGS="-j${ncpu}"
|
||||||
mingw32-make ${DEFAULT_MAKE_FLAGS} nlpn
|
mingw32-make ${DEFAULT_MAKE_FLAGS} fluffy
|
||||||
build/nlpn.exe --help
|
build/fluffy.exe --help
|
||||||
# mingw32-make ${DEFAULT_MAKE_FLAGS} test
|
# mingw32-make ${DEFAULT_MAKE_FLAGS} test
|
||||||
|
|
||||||
- name: Run nlpn tests (Linux)
|
- name: Run fluffy tests (Linux)
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux'
|
||||||
run: |
|
run: |
|
||||||
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
|
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
|
||||||
DEFAULT_MAKE_FLAGS="-j${ncpu}"
|
DEFAULT_MAKE_FLAGS="-j${ncpu}"
|
||||||
env CC=gcc make ${DEFAULT_MAKE_FLAGS} nlpn
|
env CC=gcc make ${DEFAULT_MAKE_FLAGS} fluffy
|
||||||
build/nlpn --help
|
build/fluffy --help
|
||||||
# CC is needed to select correct compiler 32/64 bit
|
# CC is needed to select correct compiler 32/64 bit
|
||||||
# env CC=gcc CXX=g++ make ${DEFAULT_MAKE_FLAGS} test test-reproducibility
|
# env CC=gcc CXX=g++ make ${DEFAULT_MAKE_FLAGS} test test-reproducibility
|
||||||
|
|
||||||
- name: Run nlpn tests (Macos)
|
- name: Run fluffy tests (Macos)
|
||||||
if: runner.os == 'Macos'
|
if: runner.os == 'Macos'
|
||||||
run: |
|
run: |
|
||||||
DEFAULT_MAKE_FLAGS="-j${ncpu}"
|
DEFAULT_MAKE_FLAGS="-j${ncpu}"
|
||||||
make ${DEFAULT_MAKE_FLAGS} nlpn
|
make ${DEFAULT_MAKE_FLAGS} fluffy
|
||||||
build/nlpn --help
|
build/fluffy --help
|
||||||
# "-static" option will not work for osx unless static system libraries are provided
|
# "-static" option will not work for osx unless static system libraries are provided
|
||||||
# make ${DEFAULT_MAKE_FLAGS} test test-reproducibility
|
# make ${DEFAULT_MAKE_FLAGS} test test-reproducibility
|
8
Makefile
8
Makefile
|
@ -29,7 +29,7 @@ TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
|
||||||
deps \
|
deps \
|
||||||
update \
|
update \
|
||||||
nimbus \
|
nimbus \
|
||||||
nlpn \
|
fluffy \
|
||||||
test \
|
test \
|
||||||
test-reproducibility \
|
test-reproducibility \
|
||||||
clean \
|
clean \
|
||||||
|
@ -110,9 +110,9 @@ nimbus: | build deps
|
||||||
echo -e $(BUILD_MSG) "build/$@" && \
|
echo -e $(BUILD_MSG) "build/$@" && \
|
||||||
$(ENV_SCRIPT) nim nimbus $(NIM_PARAMS) nimbus.nims
|
$(ENV_SCRIPT) nim nimbus $(NIM_PARAMS) nimbus.nims
|
||||||
|
|
||||||
nlpn: | build deps
|
fluffy: | build deps
|
||||||
echo -e $(BUILD_MSG) "build/$@" && \
|
echo -e $(BUILD_MSG) "build/$@" && \
|
||||||
$(ENV_SCRIPT) nim nlpn $(NIM_PARAMS) nimbus.nims
|
$(ENV_SCRIPT) nim fluffy $(NIM_PARAMS) nimbus.nims
|
||||||
|
|
||||||
# symlink
|
# symlink
|
||||||
nimbus.nims:
|
nimbus.nims:
|
||||||
|
@ -138,7 +138,7 @@ test-reproducibility:
|
||||||
|
|
||||||
# usual cleaning
|
# usual cleaning
|
||||||
clean: | clean-common
|
clean: | clean-common
|
||||||
rm -rf build/{nimbus,nlpn,$(TOOLS_CSV),all_tests,test_rpc}
|
rm -rf build/{nimbus,fluffy,$(TOOLS_CSV),all_tests,test_rpc}
|
||||||
ifneq ($(USE_LIBBACKTRACE), 0)
|
ifneq ($(USE_LIBBACKTRACE), 0)
|
||||||
+ $(MAKE) -C vendor/nim-libbacktrace clean $(HANDLE_OUTPUT)
|
+ $(MAKE) -C vendor/nim-libbacktrace clean $(HANDLE_OUTPUT)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
|
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
|
||||||
![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg)
|
![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg)
|
||||||
![GH action-nimbus-eth1](https://github.com/status-im/nimbus-eth1/workflows/CI/badge.svg)
|
![GH action-nimbus-eth1](https://github.com/status-im/nimbus-eth1/workflows/CI/badge.svg)
|
||||||
![GH action-nlpn](https://github.com/status-im/nimbus-eth1/workflows/nlpn%20CI/badge.svg)
|
![GH action-fluffy](https://github.com/status-im/nimbus-eth1/workflows/fluffy%20CI/badge.svg)
|
||||||
|
|
||||||
[![Discord: Nimbus](https://img.shields.io/badge/discord-nimbus-orange.svg)](https://discord.gg/XRxWahP)
|
[![Discord: Nimbus](https://img.shields.io/badge/discord-nimbus-orange.svg)](https://discord.gg/XRxWahP)
|
||||||
[![Gitter: #status-im/nimbus](https://img.shields.io/badge/gitter-status--im%2Fnimbus-orange.svg)](https://gitter.im/status-im/nimbus)
|
[![Gitter: #status-im/nimbus](https://img.shields.io/badge/gitter-status--im%2Fnimbus-orange.svg)](https://gitter.im/status-im/nimbus)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Nimbus Light Portal Network Client
|
# Nimbus Light Portal Network Client
|
||||||
|
|
||||||
[![nlpn CI](https://github.com/status-im/nimbus-eth1/actions/workflows/nlpn.yml/badge.svg)](https://github.com/status-im/nimbus-eth1/actions/workflows/nlpn.yml)
|
[![fluffy CI](https://github.com/status-im/nimbus-eth1/actions/workflows/fluffy.yml/badge.svg)](https://github.com/status-im/nimbus-eth1/actions/workflows/fluffy.yml)
|
||||||
![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg)
|
![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg)
|
||||||
[![License: Apache](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
|
[![License: Apache](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
|
||||||
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
|
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
|
||||||
|
@ -27,32 +27,32 @@ To keep up to date with changes and development progress, follow the
|
||||||
### Prerequisites
|
### Prerequisites
|
||||||
- GNU Make, Bash and the usual POSIX utilities. Git 2.9.4 or newer.
|
- GNU Make, Bash and the usual POSIX utilities. Git 2.9.4 or newer.
|
||||||
|
|
||||||
### Build nlpn client
|
### Build fluffy client
|
||||||
```bash
|
```bash
|
||||||
git clone git@github.com:status-im/nimbus-eth1.git
|
git clone git@github.com:status-im/nimbus-eth1.git
|
||||||
cd nimbus-eth1
|
cd nimbus-eth1
|
||||||
make nlpn
|
make fluffy
|
||||||
|
|
||||||
# See available command line options
|
# See available command line options
|
||||||
./build/nlpn --help
|
./build/fluffy --help
|
||||||
|
|
||||||
# Example command: Run the client and connect to a bootnode.
|
# Example command: Run the client and connect to a bootnode.
|
||||||
./build/nlpn --log-level:debug --bootnode:enr:<base64 encoding of ENR>
|
./build/fluffy --log-level:debug --bootnode:enr:<base64 encoding of ENR>
|
||||||
```
|
```
|
||||||
|
|
||||||
### Update and rebuild nlpn client
|
### Update and rebuild fluffy client
|
||||||
```bash
|
```bash
|
||||||
# From the nimbus-eth1 repository
|
# From the nimbus-eth1 repository
|
||||||
git pull
|
git pull
|
||||||
# To bring the git submodules up to date
|
# To bring the git submodules up to date
|
||||||
make update
|
make update
|
||||||
|
|
||||||
make nlpn
|
make fluffy
|
||||||
```
|
```
|
||||||
|
|
||||||
### Windows support
|
### Windows support
|
||||||
|
|
||||||
Follow the steps outlined [here](../README.md#windows) to build nlpn on Windows.
|
Follow the steps outlined [here](../README.md#windows) to build fluffy on Windows.
|
||||||
|
|
||||||
|
|
||||||
## For Developers
|
## For Developers
|
||||||
|
@ -78,10 +78,10 @@ The code follows the
|
||||||
|
|
||||||
Licensed and distributed under either of
|
Licensed and distributed under either of
|
||||||
|
|
||||||
* MIT license: [LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT
|
* MIT license: [LICENSE-MIT](../LICENSE-MIT) or http://opensource.org/licenses/MIT
|
||||||
|
|
||||||
or
|
or
|
||||||
|
|
||||||
* Apache License, Version 2.0, ([LICENSE-APACHEv2](LICENSE-APACHEv2) or http://www.apache.org/licenses/LICENSE-2.0)
|
* Apache License, Version 2.0, ([LICENSE-APACHEv2](../LICENSE-APACHEv2) or http://www.apache.org/licenses/LICENSE-2.0)
|
||||||
|
|
||||||
at your option. These files may not be copied, modified, or distributed except according to those terms.
|
at your option. These files may not be copied, modified, or distributed except according to those terms.
|
|
@ -51,5 +51,5 @@ task test, "Run tests":
|
||||||
task nimbus, "Build Nimbus":
|
task nimbus, "Build Nimbus":
|
||||||
buildBinary "nimbus", "nimbus/", "-d:chronicles_log_level=TRACE"
|
buildBinary "nimbus", "nimbus/", "-d:chronicles_log_level=TRACE"
|
||||||
|
|
||||||
task nlpn, "Build nlpn":
|
task fluffy, "Build fluffy":
|
||||||
buildBinary "nlpn", "nlpn/", "-d:chronicles_log_level=TRACE"
|
buildBinary "fluffy", "fluffy/", "-d:chronicles_log_level=TRACE"
|
||||||
|
|
Loading…
Reference in New Issue