From b31b5305c8358ad345a60455b53a95dcd5825872 Mon Sep 17 00:00:00 2001 From: muXxer Date: Mon, 17 Apr 2023 19:00:44 +0200 Subject: [PATCH] Move `core` and `plugins` to `components` folder --- .github/workflows/release.yml | 2 +- Dockerfile | 2 +- Dockerfile.noncached | 2 +- Makefile | 2 +- {core => components}/app/app.go | 28 +++++++++---------- {core => components}/chains/component.go | 0 {core => components}/chains/params.go | 0 {core => components}/database/clean_test.go | 0 {core => components}/database/component.go | 0 {core => components}/database/params.go | 0 {core => components}/dkg/component.go | 0 {core => components}/logger/component.go | 0 {core => components}/logger/evm.go | 0 {core => components}/nodeconn/component.go | 0 {core => components}/nodeconn/params.go | 0 {core => components}/peering/component.go | 0 {core => components}/peering/params.go | 0 {core => components}/processors/component.go | 0 .../profilingrecorder/component.go | 0 .../profilingrecorder/params.go | 0 .../prometheus/component.go | 0 {plugins => components}/prometheus/node.go | 0 {plugins => components}/prometheus/params.go | 0 .../prometheus/rest_api.go | 0 {core => components}/publisher/component.go | 0 {core => components}/registry/component.go | 0 {core => components}/registry/params.go | 0 {core => components}/users/component.go | 0 {core => components}/users/params.go | 0 {core => components}/wasmtimevm/component.go | 0 {plugins => components}/webapi/component.go | 0 {plugins => components}/webapi/params.go | 0 {plugins => components}/webapi/webapi_test.go | 2 +- main.go | 2 +- scripts/gendoc.sh | 2 +- tools/api-gen/apigen.sh | 2 +- tools/api-gen/main.go | 4 +-- tools/evm-server/waypoint.hcl | 2 +- tools/gendoc/main.go | 2 +- tools/local-setup/build_container.cmd | 2 +- tools/local-setup/build_container.sh | 2 +- tools/local-setup/docker-compose.yml | 2 +- tools/wasp-cli/.goreleaser.yml | 6 ++-- tools/wasp-cli/cli/cliclients/clients.go | 2 +- tools/wasp-cli/cli/init/checkversions.go | 2 +- tools/wasp-cli/main.go | 2 +- 46 files changed, 35 insertions(+), 35 deletions(-) rename {core => components}/app/app.go (68%) rename {core => components}/chains/component.go (100%) rename {core => components}/chains/params.go (100%) rename {core => components}/database/clean_test.go (100%) rename {core => components}/database/component.go (100%) rename {core => components}/database/params.go (100%) rename {core => components}/dkg/component.go (100%) rename {core => components}/logger/component.go (100%) rename {core => components}/logger/evm.go (100%) rename {core => components}/nodeconn/component.go (100%) rename {core => components}/nodeconn/params.go (100%) rename {core => components}/peering/component.go (100%) rename {core => components}/peering/params.go (100%) rename {core => components}/processors/component.go (100%) rename {plugins => components}/profilingrecorder/component.go (100%) rename {plugins => components}/profilingrecorder/params.go (100%) rename {plugins => components}/prometheus/component.go (100%) rename {plugins => components}/prometheus/node.go (100%) rename {plugins => components}/prometheus/params.go (100%) rename {plugins => components}/prometheus/rest_api.go (100%) rename {core => components}/publisher/component.go (100%) rename {core => components}/registry/component.go (100%) rename {core => components}/registry/params.go (100%) rename {core => components}/users/component.go (100%) rename {core => components}/users/params.go (100%) rename {core => components}/wasmtimevm/component.go (100%) rename {plugins => components}/webapi/component.go (100%) rename {plugins => components}/webapi/params.go (100%) rename {plugins => components}/webapi/webapi_test.go (98%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4517028e4..0d60e9262a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -120,4 +120,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }},iotaledger/wasp:latest labels: ${{ steps.meta.outputs.labels }} build-args: | - BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/core/app.Version=${{ steps.tagger.outputs.tag }} + BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/components/app.Version=${{ steps.tagger.outputs.tag }} diff --git a/Dockerfile b/Dockerfile index fe4c28f31a..c2ad20a3ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG GOLANG_IMAGE_TAG=1.20-bullseye # Build stage FROM golang:${GOLANG_IMAGE_TAG} AS build ARG BUILD_TAGS=rocksdb -ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/core/app.Version=v0.0.0-testing" +ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/components/app.Version=v0.0.0-testing" LABEL org.label-schema.description="Wasp" LABEL org.label-schema.name="iotaledger/wasp" diff --git a/Dockerfile.noncached b/Dockerfile.noncached index 253db246d0..f25f884341 100644 --- a/Dockerfile.noncached +++ b/Dockerfile.noncached @@ -4,7 +4,7 @@ ARG GOLANG_IMAGE_TAG=1.20-bullseye # Build stage FROM golang:${GOLANG_IMAGE_TAG} AS build ARG BUILD_TAGS=rocksdb -ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/core/app.Version=v0.0.0-testing" +ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/components/app.Version=v0.0.0-testing" LABEL org.label-schema.description="Wasp" LABEL org.label-schema.name="iotaledger/wasp" diff --git a/Makefile b/Makefile index fad552a1f0..87b2b6b9f5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GIT_REF_TAG := $(shell git describe --tags) BUILD_TAGS = rocksdb -BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/core/app.Version=$(GIT_REF_TAG)" +BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG)" DOCKER_BUILD_ARGS = # E.g. make docker-build "DOCKER_BUILD_ARGS=--tag wasp:devel" # diff --git a/core/app/app.go b/components/app/app.go similarity index 68% rename from core/app/app.go rename to components/app/app.go index 6bf92cc348..361d431ac8 100644 --- a/core/app/app.go +++ b/components/app/app.go @@ -6,21 +6,21 @@ import ( "github.com/iotaledger/hive.go/app" "github.com/iotaledger/hive.go/app/components/profiling" "github.com/iotaledger/hive.go/app/components/shutdown" - "github.com/iotaledger/wasp/core/chains" - "github.com/iotaledger/wasp/core/database" - "github.com/iotaledger/wasp/core/dkg" - "github.com/iotaledger/wasp/core/logger" - "github.com/iotaledger/wasp/core/nodeconn" - "github.com/iotaledger/wasp/core/peering" - "github.com/iotaledger/wasp/core/processors" - "github.com/iotaledger/wasp/core/publisher" - "github.com/iotaledger/wasp/core/registry" - "github.com/iotaledger/wasp/core/users" - "github.com/iotaledger/wasp/core/wasmtimevm" + "github.com/iotaledger/wasp/components/chains" + "github.com/iotaledger/wasp/components/database" + "github.com/iotaledger/wasp/components/dkg" + "github.com/iotaledger/wasp/components/logger" + "github.com/iotaledger/wasp/components/nodeconn" + "github.com/iotaledger/wasp/components/peering" + "github.com/iotaledger/wasp/components/processors" + "github.com/iotaledger/wasp/components/profilingrecorder" + "github.com/iotaledger/wasp/components/prometheus" + "github.com/iotaledger/wasp/components/publisher" + "github.com/iotaledger/wasp/components/registry" + "github.com/iotaledger/wasp/components/users" + "github.com/iotaledger/wasp/components/wasmtimevm" + "github.com/iotaledger/wasp/components/webapi" "github.com/iotaledger/wasp/packages/toolset" - "github.com/iotaledger/wasp/plugins/profilingrecorder" - "github.com/iotaledger/wasp/plugins/prometheus" - "github.com/iotaledger/wasp/plugins/webapi" ) var ( diff --git a/core/chains/component.go b/components/chains/component.go similarity index 100% rename from core/chains/component.go rename to components/chains/component.go diff --git a/core/chains/params.go b/components/chains/params.go similarity index 100% rename from core/chains/params.go rename to components/chains/params.go diff --git a/core/database/clean_test.go b/components/database/clean_test.go similarity index 100% rename from core/database/clean_test.go rename to components/database/clean_test.go diff --git a/core/database/component.go b/components/database/component.go similarity index 100% rename from core/database/component.go rename to components/database/component.go diff --git a/core/database/params.go b/components/database/params.go similarity index 100% rename from core/database/params.go rename to components/database/params.go diff --git a/core/dkg/component.go b/components/dkg/component.go similarity index 100% rename from core/dkg/component.go rename to components/dkg/component.go diff --git a/core/logger/component.go b/components/logger/component.go similarity index 100% rename from core/logger/component.go rename to components/logger/component.go diff --git a/core/logger/evm.go b/components/logger/evm.go similarity index 100% rename from core/logger/evm.go rename to components/logger/evm.go diff --git a/core/nodeconn/component.go b/components/nodeconn/component.go similarity index 100% rename from core/nodeconn/component.go rename to components/nodeconn/component.go diff --git a/core/nodeconn/params.go b/components/nodeconn/params.go similarity index 100% rename from core/nodeconn/params.go rename to components/nodeconn/params.go diff --git a/core/peering/component.go b/components/peering/component.go similarity index 100% rename from core/peering/component.go rename to components/peering/component.go diff --git a/core/peering/params.go b/components/peering/params.go similarity index 100% rename from core/peering/params.go rename to components/peering/params.go diff --git a/core/processors/component.go b/components/processors/component.go similarity index 100% rename from core/processors/component.go rename to components/processors/component.go diff --git a/plugins/profilingrecorder/component.go b/components/profilingrecorder/component.go similarity index 100% rename from plugins/profilingrecorder/component.go rename to components/profilingrecorder/component.go diff --git a/plugins/profilingrecorder/params.go b/components/profilingrecorder/params.go similarity index 100% rename from plugins/profilingrecorder/params.go rename to components/profilingrecorder/params.go diff --git a/plugins/prometheus/component.go b/components/prometheus/component.go similarity index 100% rename from plugins/prometheus/component.go rename to components/prometheus/component.go diff --git a/plugins/prometheus/node.go b/components/prometheus/node.go similarity index 100% rename from plugins/prometheus/node.go rename to components/prometheus/node.go diff --git a/plugins/prometheus/params.go b/components/prometheus/params.go similarity index 100% rename from plugins/prometheus/params.go rename to components/prometheus/params.go diff --git a/plugins/prometheus/rest_api.go b/components/prometheus/rest_api.go similarity index 100% rename from plugins/prometheus/rest_api.go rename to components/prometheus/rest_api.go diff --git a/core/publisher/component.go b/components/publisher/component.go similarity index 100% rename from core/publisher/component.go rename to components/publisher/component.go diff --git a/core/registry/component.go b/components/registry/component.go similarity index 100% rename from core/registry/component.go rename to components/registry/component.go diff --git a/core/registry/params.go b/components/registry/params.go similarity index 100% rename from core/registry/params.go rename to components/registry/params.go diff --git a/core/users/component.go b/components/users/component.go similarity index 100% rename from core/users/component.go rename to components/users/component.go diff --git a/core/users/params.go b/components/users/params.go similarity index 100% rename from core/users/params.go rename to components/users/params.go diff --git a/core/wasmtimevm/component.go b/components/wasmtimevm/component.go similarity index 100% rename from core/wasmtimevm/component.go rename to components/wasmtimevm/component.go diff --git a/plugins/webapi/component.go b/components/webapi/component.go similarity index 100% rename from plugins/webapi/component.go rename to components/webapi/component.go diff --git a/plugins/webapi/params.go b/components/webapi/params.go similarity index 100% rename from plugins/webapi/params.go rename to components/webapi/params.go diff --git a/plugins/webapi/webapi_test.go b/components/webapi/webapi_test.go similarity index 98% rename from plugins/webapi/webapi_test.go rename to components/webapi/webapi_test.go index b97033a55c..2fbf082e57 100644 --- a/plugins/webapi/webapi_test.go +++ b/components/webapi/webapi_test.go @@ -14,8 +14,8 @@ import ( "github.com/labstack/echo/v4" "github.com/stretchr/testify/require" + "github.com/iotaledger/wasp/components/webapi" "github.com/iotaledger/wasp/packages/authentication" - "github.com/iotaledger/wasp/plugins/webapi" ) func TestInternalServerErrors(t *testing.T) { diff --git a/main.go b/main.go index 298ccaa1ee..51fc28d143 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/iotaledger/wasp/core/app" + "github.com/iotaledger/wasp/components/app" ) func main() { diff --git a/scripts/gendoc.sh b/scripts/gendoc.sh index 068223ff3c..4858982bed 100755 --- a/scripts/gendoc.sh +++ b/scripts/gendoc.sh @@ -9,7 +9,7 @@ cd tools/gendoc GIT_REF_TAG="$(git describe --tags)" BUILD_TAGS=rocksdb -BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/core/app.Version=${GIT_REF_TAG}" +BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/components/app.Version=${GIT_REF_TAG}" go run -tags ${BUILD_TAGS} -ldflags ${BUILD_LD_FLAGS} main.go diff --git a/tools/api-gen/apigen.sh b/tools/api-gen/apigen.sh index 947849601e..f53fb44f31 100755 --- a/tools/api-gen/apigen.sh +++ b/tools/api-gen/apigen.sh @@ -4,7 +4,7 @@ SCRIPT=$(readlink -f "$0") SCRIPTPATH=$(dirname "$SCRIPT") GIT_REF_TAG=$(git describe --tags) -BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/core/app.Version=$GIT_REF_TAG" +BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/components/app.Version=$GIT_REF_TAG" # To generate with the current commit version: # go run -ldflags="$BUILD_LD_FLAGS" ./main.go "$@" diff --git a/tools/api-gen/main.go b/tools/api-gen/main.go index 977b6594d5..0562aef1b3 100644 --- a/tools/api-gen/main.go +++ b/tools/api-gen/main.go @@ -9,11 +9,11 @@ import ( "github.com/pangpanglabs/echoswagger/v2" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/core/app" + "github.com/iotaledger/wasp/components/app" + "github.com/iotaledger/wasp/components/webapi" "github.com/iotaledger/wasp/packages/authentication" "github.com/iotaledger/wasp/packages/cryptolib" v2 "github.com/iotaledger/wasp/packages/webapi" - "github.com/iotaledger/wasp/plugins/webapi" ) type NodeIdentityProviderMock struct{} diff --git a/tools/evm-server/waypoint.hcl b/tools/evm-server/waypoint.hcl index 2de5c9b907..a05d9211cb 100644 --- a/tools/evm-server/waypoint.hcl +++ b/tools/evm-server/waypoint.hcl @@ -38,7 +38,7 @@ app "wasp-evm-server" { context = "../.." build_args = { GOLANG_IMAGE_TAG = "1.20-bullseye" - BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/core/app.Version=${gitreftag()}" + BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=${gitreftag()}" BUILD_TARGET = "./tools/wasp-cli" FINAL_BINARY = "wasp-cli" } diff --git a/tools/gendoc/main.go b/tools/gendoc/main.go index 8fc2bc06a1..4fb5e8680b 100644 --- a/tools/gendoc/main.go +++ b/tools/gendoc/main.go @@ -7,7 +7,7 @@ import ( "github.com/iotaledger/hive.go/app" "github.com/iotaledger/hive.go/apputils/config" - waspApp "github.com/iotaledger/wasp/core/app" + waspApp "github.com/iotaledger/wasp/components/app" ) func createMarkdownFile(app *app.App, markdownHeaderPath string, markdownFilePath string, ignoreFlags map[string]struct{}, replaceTopicNames map[string]string) { diff --git a/tools/local-setup/build_container.cmd b/tools/local-setup/build_container.cmd index 94c062b438..f40e5684ad 100644 --- a/tools/local-setup/build_container.cmd +++ b/tools/local-setup/build_container.cmd @@ -1,6 +1,6 @@ rem export variables for the build process set BUILD_TAGS=rocksdb -for /f %%f in ('git describe --tags') do set BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/core/app.Version=%%f +for /f %%f in ('git describe --tags') do set BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/components/app.Version=%%f rem build the wasp container docker compose build wasp \ No newline at end of file diff --git a/tools/local-setup/build_container.sh b/tools/local-setup/build_container.sh index aa78167939..75d141899b 100755 --- a/tools/local-setup/build_container.sh +++ b/tools/local-setup/build_container.sh @@ -5,7 +5,7 @@ GIT_REF_TAG="$(git describe --tags)" # export variables for the build process export BUILD_TAGS=rocksdb -export BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/core/app.Version=${GIT_REF_TAG}" +export BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/components/app.Version=${GIT_REF_TAG}" # build the wasp container docker compose build wasp diff --git a/tools/local-setup/docker-compose.yml b/tools/local-setup/docker-compose.yml index c67e68e9ee..15bd0de2d7 100644 --- a/tools/local-setup/docker-compose.yml +++ b/tools/local-setup/docker-compose.yml @@ -78,7 +78,7 @@ services: dockerfile: Dockerfile.noncached args: BUILD_TAGS: "${BUILD_TAGS:-rocksdb}" - BUILD_LD_FLAGS: "${BUILD_LD_FLAGS:--X=github.com/iotaledger/wasp/core/app.Version=v0.0.0-testing}" + BUILD_LD_FLAGS: "${BUILD_LD_FLAGS:--X=github.com/iotaledger/wasp/components/app.Version=v0.0.0-testing}" ulimits: nofile: soft: 16384 diff --git a/tools/wasp-cli/.goreleaser.yml b/tools/wasp-cli/.goreleaser.yml index 8670245b08..21817c1f14 100644 --- a/tools/wasp-cli/.goreleaser.yml +++ b/tools/wasp-cli/.goreleaser.yml @@ -9,7 +9,7 @@ builds: - id: wasp-cli-linux-amd64 binary: wasp-cli ldflags: - - -s -w -X=github.com/iotaledger/wasp/core/app.Version={{ .Summary }} + - -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }} main: main.go dir: ./tools/wasp-cli goos: @@ -25,7 +25,7 @@ builds: - CC=aarch64-linux-gnu-gcc - CXX=aarch64-linux-gnu-g++ ldflags: - - -s -w -X=github.com/iotaledger/wasp/core/app.Version={{ .Summary }} + - -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }} main: main.go dir: ./tools/wasp-cli goos: @@ -41,7 +41,7 @@ builds: - CC=/usr/bin/x86_64-w64-mingw32-gcc-posix - CXX=/usr/bin/x86_64-w64-mingw32-g++-posix ldflags: - - -s -w -X=github.com/iotaledger/wasp/core/app.Version={{ .Summary }} + - -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }} main: main.go dir: ./tools/wasp-cli goos: diff --git a/tools/wasp-cli/cli/cliclients/clients.go b/tools/wasp-cli/cli/cliclients/clients.go index 628e7be366..7742d36643 100644 --- a/tools/wasp-cli/cli/cliclients/clients.go +++ b/tools/wasp-cli/cli/cliclients/clients.go @@ -7,7 +7,7 @@ import ( "github.com/iotaledger/wasp/clients/apiextensions" "github.com/iotaledger/wasp/clients/chainclient" "github.com/iotaledger/wasp/clients/scclient" - "github.com/iotaledger/wasp/core/app" + "github.com/iotaledger/wasp/components/app" "github.com/iotaledger/wasp/packages/isc" "github.com/iotaledger/wasp/packages/l1connection" "github.com/iotaledger/wasp/tools/wasp-cli/cli/config" diff --git a/tools/wasp-cli/cli/init/checkversions.go b/tools/wasp-cli/cli/init/checkversions.go index d8c5086a9d..12cb3a3b45 100644 --- a/tools/wasp-cli/cli/init/checkversions.go +++ b/tools/wasp-cli/cli/init/checkversions.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/iotaledger/wasp/core/app" + "github.com/iotaledger/wasp/components/app" "github.com/iotaledger/wasp/tools/wasp-cli/cli/cliclients" "github.com/iotaledger/wasp/tools/wasp-cli/log" ) diff --git a/tools/wasp-cli/main.go b/tools/wasp-cli/main.go index 99baea398c..367f2ffb9a 100644 --- a/tools/wasp-cli/main.go +++ b/tools/wasp-cli/main.go @@ -9,7 +9,7 @@ import ( goversion "github.com/hashicorp/go-version" "github.com/spf13/cobra" - "github.com/iotaledger/wasp/core/app" + "github.com/iotaledger/wasp/components/app" "github.com/iotaledger/wasp/tools/wasp-cli/authentication" "github.com/iotaledger/wasp/tools/wasp-cli/chain" "github.com/iotaledger/wasp/tools/wasp-cli/cli/config"