Move core and plugins to components folder

iotaledger · Apr 17, 2023 · b31b530 · b31b530
1 parent bc5345a
commit b31b530
Show file tree

Hide file tree

Showing 46 changed files with 35 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → components/app/app.go b/core/app/app.go → 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 → components/chains/component.go b/core/chains/component.go → components/chains/component.go
diff --git a/core/chains/params.go → components/chains/params.go b/core/chains/params.go → components/chains/params.go
diff --git a/core/database/clean_test.go → components/database/clean_test.go b/core/database/clean_test.go → components/database/clean_test.go
diff --git a/core/database/component.go → components/database/component.go b/core/database/component.go → components/database/component.go
diff --git a/core/database/params.go → components/database/params.go b/core/database/params.go → components/database/params.go
diff --git a/core/dkg/component.go → components/dkg/component.go b/core/dkg/component.go → components/dkg/component.go
diff --git a/core/logger/component.go → components/logger/component.go b/core/logger/component.go → components/logger/component.go
diff --git a/core/logger/evm.go → components/logger/evm.go b/core/logger/evm.go → components/logger/evm.go
diff --git a/core/nodeconn/component.go → components/nodeconn/component.go b/core/nodeconn/component.go → components/nodeconn/component.go
diff --git a/core/nodeconn/params.go → components/nodeconn/params.go b/core/nodeconn/params.go → components/nodeconn/params.go
diff --git a/core/peering/component.go → components/peering/component.go b/core/peering/component.go → components/peering/component.go
diff --git a/core/peering/params.go → components/peering/params.go b/core/peering/params.go → components/peering/params.go
diff --git a/core/processors/component.go → components/processors/component.go b/core/processors/component.go → components/processors/component.go
diff --git a/plugins/profilingrecorder/component.go → components/profilingrecorder/component.go b/plugins/profilingrecorder/component.go → components/profilingrecorder/component.go
diff --git a/plugins/profilingrecorder/params.go → components/profilingrecorder/params.go b/plugins/profilingrecorder/params.go → components/profilingrecorder/params.go
diff --git a/plugins/prometheus/component.go → components/prometheus/component.go b/plugins/prometheus/component.go → components/prometheus/component.go
diff --git a/plugins/prometheus/node.go → components/prometheus/node.go b/plugins/prometheus/node.go → components/prometheus/node.go
diff --git a/plugins/prometheus/params.go → components/prometheus/params.go b/plugins/prometheus/params.go → components/prometheus/params.go
diff --git a/plugins/prometheus/rest_api.go → components/prometheus/rest_api.go b/plugins/prometheus/rest_api.go → components/prometheus/rest_api.go
diff --git a/core/publisher/component.go → components/publisher/component.go b/core/publisher/component.go → components/publisher/component.go
diff --git a/core/registry/component.go → components/registry/component.go b/core/registry/component.go → components/registry/component.go
diff --git a/core/registry/params.go → components/registry/params.go b/core/registry/params.go → components/registry/params.go
diff --git a/core/users/component.go → components/users/component.go b/core/users/component.go → components/users/component.go
diff --git a/core/users/params.go → components/users/params.go b/core/users/params.go → components/users/params.go
diff --git a/core/wasmtimevm/component.go → components/wasmtimevm/component.go b/core/wasmtimevm/component.go → components/wasmtimevm/component.go
diff --git a/plugins/webapi/component.go → components/webapi/component.go b/plugins/webapi/component.go → components/webapi/component.go
diff --git a/plugins/webapi/params.go → components/webapi/params.go b/plugins/webapi/params.go → components/webapi/params.go
diff --git a/plugins/webapi/webapi_test.go → components/webapi/webapi_test.go b/plugins/webapi/webapi_test.go → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"