Skip to content

Commit b31b530

Browse files
muXxermuXxer
committed
Move core and plugins to components folder
1 parent bc5345a commit b31b530

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+35
-35
lines changed

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ jobs:
120120
tags: ${{ steps.meta.outputs.tags }},iotaledger/wasp:latest
121121
labels: ${{ steps.meta.outputs.labels }}
122122
build-args: |
123-
BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/core/app.Version=${{ steps.tagger.outputs.tag }}
123+
BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/components/app.Version=${{ steps.tagger.outputs.tag }}

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG GOLANG_IMAGE_TAG=1.20-bullseye
44
# Build stage
55
FROM golang:${GOLANG_IMAGE_TAG} AS build
66
ARG BUILD_TAGS=rocksdb
7-
ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/core/app.Version=v0.0.0-testing"
7+
ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/components/app.Version=v0.0.0-testing"
88

99
LABEL org.label-schema.description="Wasp"
1010
LABEL org.label-schema.name="iotaledger/wasp"

‎Dockerfile.noncached

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG GOLANG_IMAGE_TAG=1.20-bullseye
44
# Build stage
55
FROM golang:${GOLANG_IMAGE_TAG} AS build
66
ARG BUILD_TAGS=rocksdb
7-
ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/core/app.Version=v0.0.0-testing"
7+
ARG BUILD_LD_FLAGS="--X=github.com/iotaledger/wasp/components/app.Version=v0.0.0-testing"
88

99
LABEL org.label-schema.description="Wasp"
1010
LABEL org.label-schema.name="iotaledger/wasp"

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT_REF_TAG := $(shell git describe --tags)
22
BUILD_TAGS = rocksdb
3-
BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/core/app.Version=$(GIT_REF_TAG)"
3+
BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG)"
44
DOCKER_BUILD_ARGS = # E.g. make docker-build "DOCKER_BUILD_ARGS=--tag wasp:devel"
55

66
#

‎core/app/app.go ‎components/app/app.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ import (
66
"github.com/iotaledger/hive.go/app"
77
"github.com/iotaledger/hive.go/app/components/profiling"
88
"github.com/iotaledger/hive.go/app/components/shutdown"
9-
"github.com/iotaledger/wasp/core/chains"
10-
"github.com/iotaledger/wasp/core/database"
11-
"github.com/iotaledger/wasp/core/dkg"
12-
"github.com/iotaledger/wasp/core/logger"
13-
"github.com/iotaledger/wasp/core/nodeconn"
14-
"github.com/iotaledger/wasp/core/peering"
15-
"github.com/iotaledger/wasp/core/processors"
16-
"github.com/iotaledger/wasp/core/publisher"
17-
"github.com/iotaledger/wasp/core/registry"
18-
"github.com/iotaledger/wasp/core/users"
19-
"github.com/iotaledger/wasp/core/wasmtimevm"
9+
"github.com/iotaledger/wasp/components/chains"
10+
"github.com/iotaledger/wasp/components/database"
11+
"github.com/iotaledger/wasp/components/dkg"
12+
"github.com/iotaledger/wasp/components/logger"
13+
"github.com/iotaledger/wasp/components/nodeconn"
14+
"github.com/iotaledger/wasp/components/peering"
15+
"github.com/iotaledger/wasp/components/processors"
16+
"github.com/iotaledger/wasp/components/profilingrecorder"
17+
"github.com/iotaledger/wasp/components/prometheus"
18+
"github.com/iotaledger/wasp/components/publisher"
19+
"github.com/iotaledger/wasp/components/registry"
20+
"github.com/iotaledger/wasp/components/users"
21+
"github.com/iotaledger/wasp/components/wasmtimevm"
22+
"github.com/iotaledger/wasp/components/webapi"
2023
"github.com/iotaledger/wasp/packages/toolset"
21-
"github.com/iotaledger/wasp/plugins/profilingrecorder"
22-
"github.com/iotaledger/wasp/plugins/prometheus"
23-
"github.com/iotaledger/wasp/plugins/webapi"
2424
)
2525

2626
var (

‎core/chains/component.go ‎components/chains/component.go

File renamed without changes.

‎core/chains/params.go ‎components/chains/params.go

File renamed without changes.

‎core/database/clean_test.go ‎components/database/clean_test.go

File renamed without changes.

‎core/database/component.go ‎components/database/component.go

File renamed without changes.

‎core/database/params.go ‎components/database/params.go

File renamed without changes.

‎core/dkg/component.go ‎components/dkg/component.go

File renamed without changes.

‎core/logger/component.go ‎components/logger/component.go

File renamed without changes.

‎core/logger/evm.go ‎components/logger/evm.go

File renamed without changes.

‎core/nodeconn/component.go ‎components/nodeconn/component.go

File renamed without changes.

‎core/nodeconn/params.go ‎components/nodeconn/params.go

File renamed without changes.

‎core/peering/component.go ‎components/peering/component.go

File renamed without changes.

‎core/peering/params.go ‎components/peering/params.go

File renamed without changes.

‎core/processors/component.go ‎components/processors/component.go

File renamed without changes.

‎plugins/profilingrecorder/component.go ‎components/profilingrecorder/component.go

File renamed without changes.

‎plugins/profilingrecorder/params.go ‎components/profilingrecorder/params.go

File renamed without changes.

‎plugins/prometheus/component.go ‎components/prometheus/component.go

File renamed without changes.

‎plugins/prometheus/node.go ‎components/prometheus/node.go

File renamed without changes.

‎plugins/prometheus/params.go ‎components/prometheus/params.go

File renamed without changes.

‎plugins/prometheus/rest_api.go ‎components/prometheus/rest_api.go

File renamed without changes.

‎core/publisher/component.go ‎components/publisher/component.go

File renamed without changes.

‎core/registry/component.go ‎components/registry/component.go

File renamed without changes.

‎core/registry/params.go ‎components/registry/params.go

File renamed without changes.

‎core/users/component.go ‎components/users/component.go

File renamed without changes.

‎core/users/params.go ‎components/users/params.go

File renamed without changes.

‎core/wasmtimevm/component.go ‎components/wasmtimevm/component.go

File renamed without changes.

‎plugins/webapi/component.go ‎components/webapi/component.go

File renamed without changes.

‎plugins/webapi/params.go ‎components/webapi/params.go

File renamed without changes.

‎plugins/webapi/webapi_test.go ‎components/webapi/webapi_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/labstack/echo/v4"
1515
"github.com/stretchr/testify/require"
1616

17+
"github.com/iotaledger/wasp/components/webapi"
1718
"github.com/iotaledger/wasp/packages/authentication"
18-
"github.com/iotaledger/wasp/plugins/webapi"
1919
)
2020

2121
func TestInternalServerErrors(t *testing.T) {

‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/iotaledger/wasp/core/app"
4+
"github.com/iotaledger/wasp/components/app"
55
)
66

77
func main() {

‎scripts/gendoc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd tools/gendoc
99
GIT_REF_TAG="$(git describe --tags)"
1010

1111
BUILD_TAGS=rocksdb
12-
BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/core/app.Version=${GIT_REF_TAG}"
12+
BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/components/app.Version=${GIT_REF_TAG}"
1313

1414
go run -tags ${BUILD_TAGS} -ldflags ${BUILD_LD_FLAGS} main.go
1515

‎tools/api-gen/apigen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SCRIPT=$(readlink -f "$0")
44
SCRIPTPATH=$(dirname "$SCRIPT")
55

66
GIT_REF_TAG=$(git describe --tags)
7-
BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/core/app.Version=$GIT_REF_TAG"
7+
BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/components/app.Version=$GIT_REF_TAG"
88

99
# To generate with the current commit version:
1010
# go run -ldflags="$BUILD_LD_FLAGS" ./main.go "$@"

‎tools/api-gen/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"github.com/pangpanglabs/echoswagger/v2"
1010

1111
"github.com/iotaledger/hive.go/logger"
12-
"github.com/iotaledger/wasp/core/app"
12+
"github.com/iotaledger/wasp/components/app"
13+
"github.com/iotaledger/wasp/components/webapi"
1314
"github.com/iotaledger/wasp/packages/authentication"
1415
"github.com/iotaledger/wasp/packages/cryptolib"
1516
v2 "github.com/iotaledger/wasp/packages/webapi"
16-
"github.com/iotaledger/wasp/plugins/webapi"
1717
)
1818

1919
type NodeIdentityProviderMock struct{}

‎tools/evm-server/waypoint.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ app "wasp-evm-server" {
3838
context = "../.."
3939
build_args = {
4040
GOLANG_IMAGE_TAG = "1.20-bullseye"
41-
BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/core/app.Version=${gitreftag()}"
41+
BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=${gitreftag()}"
4242
BUILD_TARGET = "./tools/wasp-cli"
4343
FINAL_BINARY = "wasp-cli"
4444
}

‎tools/gendoc/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/iotaledger/hive.go/app"
99
"github.com/iotaledger/hive.go/apputils/config"
10-
waspApp "github.com/iotaledger/wasp/core/app"
10+
waspApp "github.com/iotaledger/wasp/components/app"
1111
)
1212

1313
func createMarkdownFile(app *app.App, markdownHeaderPath string, markdownFilePath string, ignoreFlags map[string]struct{}, replaceTopicNames map[string]string) {

‎tools/local-setup/build_container.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
rem export variables for the build process
22
set BUILD_TAGS=rocksdb
3-
for /f %%f in ('git describe --tags') do set BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/core/app.Version=%%f
3+
for /f %%f in ('git describe --tags') do set BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/components/app.Version=%%f
44

55
rem build the wasp container
66
docker compose build wasp

‎tools/local-setup/build_container.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GIT_REF_TAG="$(git describe --tags)"
55

66
# export variables for the build process
77
export BUILD_TAGS=rocksdb
8-
export BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/core/app.Version=${GIT_REF_TAG}"
8+
export BUILD_LD_FLAGS="-X=github.com/iotaledger/wasp/components/app.Version=${GIT_REF_TAG}"
99

1010
# build the wasp container
1111
docker compose build wasp

‎tools/local-setup/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ services:
7878
dockerfile: Dockerfile.noncached
7979
args:
8080
BUILD_TAGS: "${BUILD_TAGS:-rocksdb}"
81-
BUILD_LD_FLAGS: "${BUILD_LD_FLAGS:--X=github.com/iotaledger/wasp/core/app.Version=v0.0.0-testing}"
81+
BUILD_LD_FLAGS: "${BUILD_LD_FLAGS:--X=github.com/iotaledger/wasp/components/app.Version=v0.0.0-testing}"
8282
ulimits:
8383
nofile:
8484
soft: 16384

‎tools/wasp-cli/.goreleaser.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ builds:
99
- id: wasp-cli-linux-amd64
1010
binary: wasp-cli
1111
ldflags:
12-
- -s -w -X=github.com/iotaledger/wasp/core/app.Version={{ .Summary }}
12+
- -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }}
1313
main: main.go
1414
dir: ./tools/wasp-cli
1515
goos:
@@ -25,7 +25,7 @@ builds:
2525
- CC=aarch64-linux-gnu-gcc
2626
- CXX=aarch64-linux-gnu-g++
2727
ldflags:
28-
- -s -w -X=github.com/iotaledger/wasp/core/app.Version={{ .Summary }}
28+
- -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }}
2929
main: main.go
3030
dir: ./tools/wasp-cli
3131
goos:
@@ -41,7 +41,7 @@ builds:
4141
- CC=/usr/bin/x86_64-w64-mingw32-gcc-posix
4242
- CXX=/usr/bin/x86_64-w64-mingw32-g++-posix
4343
ldflags:
44-
- -s -w -X=github.com/iotaledger/wasp/core/app.Version={{ .Summary }}
44+
- -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }}
4545
main: main.go
4646
dir: ./tools/wasp-cli
4747
goos:

‎tools/wasp-cli/cli/cliclients/clients.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/iotaledger/wasp/clients/apiextensions"
88
"github.com/iotaledger/wasp/clients/chainclient"
99
"github.com/iotaledger/wasp/clients/scclient"
10-
"github.com/iotaledger/wasp/core/app"
10+
"github.com/iotaledger/wasp/components/app"
1111
"github.com/iotaledger/wasp/packages/isc"
1212
"github.com/iotaledger/wasp/packages/l1connection"
1313
"github.com/iotaledger/wasp/tools/wasp-cli/cli/config"

‎tools/wasp-cli/cli/init/checkversions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/spf13/cobra"
77
"github.com/spf13/viper"
88

9-
"github.com/iotaledger/wasp/core/app"
9+
"github.com/iotaledger/wasp/components/app"
1010
"github.com/iotaledger/wasp/tools/wasp-cli/cli/cliclients"
1111
"github.com/iotaledger/wasp/tools/wasp-cli/log"
1212
)

‎tools/wasp-cli/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
goversion "github.com/hashicorp/go-version"
1010
"github.com/spf13/cobra"
1111

12-
"github.com/iotaledger/wasp/core/app"
12+
"github.com/iotaledger/wasp/components/app"
1313
"github.com/iotaledger/wasp/tools/wasp-cli/authentication"
1414
"github.com/iotaledger/wasp/tools/wasp-cli/chain"
1515
"github.com/iotaledger/wasp/tools/wasp-cli/cli/config"

0 commit comments

Comments
 (0)