Change name from nlpn to fluffy (#734)

2021-06-28 17:53:13 +02:00 · 2021-06-28 17:53:13 +02:00 · f8b3922eb5
parent 36247ed6f4
commit f8b3922eb5
10 changed files with 32 additions and 32 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -2,7 +2,7 @@ name: CI
 on:
  push:
    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.
  #pull_request:
  #  paths-ignore: ['doc/**', 'docs/**', '**/*.md', 'hive_integration/**']
--- a/.github/workflows/fluffy.yml
+++ b/.github/workflows/fluffy.yml
@ -1,11 +1,11 @@
-name: nlpn CI
+name: fluffy CI
 on:
  push:
-    paths: ['nlpn/**', '.github/workflows/nlpn.yml', 'vendor/**', 'Makefile',
-      'nimbus.nimble', '!nlpn/**/*.md']
+    paths: ['fluffy/**', '.github/workflows/fluffy.yml', 'vendor/**',
+      'Makefile', 'nimbus.nimble', '!fluffy/**/*.md']
  pull_request:
-    paths: ['nlpn/**', '.github/workflows/nlpn.yml', 'vendor/**', 'Makefile',
-      'nimbus.nimble', '!nlpn/**/*.md']
+    paths: ['fluffy/**', '.github/workflows/fluffy.yml', 'vendor/**',
+      'Makefile', 'nimbus.nimble', '!fluffy/**/*.md']

 jobs:
  build:
@ -163,30 +163,30 @@ jobs:
        run: |
          make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update

-      - name: Run nlpn tests (Windows)
+      - name: Run fluffy tests (Windows)
        if: runner.os == 'Windows'
        run: |
          gcc --version
          DEFAULT_MAKE_FLAGS="-j${ncpu}"
-          mingw32-make ${DEFAULT_MAKE_FLAGS} nlpn
-          build/nlpn.exe --help
+          mingw32-make ${DEFAULT_MAKE_FLAGS} fluffy
+          build/fluffy.exe --help
          # mingw32-make ${DEFAULT_MAKE_FLAGS} test

-      - name: Run nlpn tests (Linux)
+      - name: Run fluffy tests (Linux)
        if: runner.os == 'Linux'
        run: |
          export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
          DEFAULT_MAKE_FLAGS="-j${ncpu}"
-          env CC=gcc make ${DEFAULT_MAKE_FLAGS} nlpn
-          build/nlpn --help
+          env CC=gcc make ${DEFAULT_MAKE_FLAGS} fluffy
+          build/fluffy --help
          # CC is needed to select correct compiler 32/64 bit
          # 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'
        run: |
          DEFAULT_MAKE_FLAGS="-j${ncpu}"
-          make ${DEFAULT_MAKE_FLAGS} nlpn
-          build/nlpn --help
+          make ${DEFAULT_MAKE_FLAGS} fluffy
+          build/fluffy --help
          # "-static" option will not work for osx unless static system libraries are provided
          # make ${DEFAULT_MAKE_FLAGS} test test-reproducibility
--- a/8
+++ b/8
@ -29,7 +29,7 @@ TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
 	deps \
 	update \
 	nimbus \
-	nlpn \
+	fluffy \
 	test \
 	test-reproducibility \
 	clean \
@ -110,9 +110,9 @@ nimbus: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
 		$(ENV_SCRIPT) nim nimbus $(NIM_PARAMS) nimbus.nims

-nlpn: | build deps
+fluffy: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim nlpn $(NIM_PARAMS) nimbus.nims
+		$(ENV_SCRIPT) nim fluffy $(NIM_PARAMS) nimbus.nims

 # symlink
 nimbus.nims:
@ -138,7 +138,7 @@ test-reproducibility:

 # usual cleaning
 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)
 	+ $(MAKE) -C vendor/nim-libbacktrace clean $(HANDLE_OUTPUT)
 endif
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@
 [![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)
 ![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)
 [![Gitter: #status-im/nimbus](https://img.shields.io/badge/gitter-status--im%2Fnimbus-orange.svg)](https://gitter.im/status-im/nimbus)
--- a/fluffy/README.md
+++ b/fluffy/README.md
@ -1,6 +1,6 @@
 # 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)
 [![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)
@ -27,32 +27,32 @@ To keep up to date with changes and development progress, follow the
 ### Prerequisites
 - GNU Make, Bash and the usual POSIX utilities. Git 2.9.4 or newer.

-### Build nlpn client
+### Build fluffy client
 ```bash
 git clone git@github.com:status-im/nimbus-eth1.git
 cd nimbus-eth1
-make nlpn
+make fluffy

 # See available command line options
-./build/nlpn --help
+./build/fluffy --help

 # 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
 # From the nimbus-eth1 repository
 git pull
 # To bring the git submodules up to date
 make update

-make nlpn
+make fluffy
 ```

 ### 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
@ -78,10 +78,10 @@ The code follows the

 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

-* 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.
--- a/fluffy/conf.nim
+++ b/fluffy/conf.nim
--- a/fluffy/content.nim
+++ b/fluffy/content.nim
--- a/fluffy/fluffy.nim
+++ b/fluffy/fluffy.nim
--- a/fluffy/rpc/eth_api.nim
+++ b/fluffy/rpc/eth_api.nim
--- a/nimbus.nimble
+++ b/nimbus.nimble
@ -51,5 +51,5 @@ task test, "Run tests":
 task nimbus, "Build Nimbus":
  buildBinary "nimbus", "nimbus/", "-d:chronicles_log_level=TRACE"

-task nlpn, "Build nlpn":
-  buildBinary "nlpn", "nlpn/", "-d:chronicles_log_level=TRACE"
+task fluffy, "Build fluffy":
+  buildBinary "fluffy", "fluffy/", "-d:chronicles_log_level=TRACE"