From 5c23c916847eb076f1699b91fd60d8ce7f283316 Mon Sep 17 00:00:00 2001 From: slandymani Date: Fri, 19 Jul 2024 21:31:26 +0300 Subject: [PATCH] remove internal dir --- .circleci/config.yml | 26 +++++++++--------- .gitignore | 2 +- Makefile | 20 +++++++------- README.md | 6 ++-- {internal/api => api}/api_test.go | 0 {internal/api => api}/bindings.h | 0 {internal/api => api}/callbacks.go | 0 {internal/api => api}/callbacks_cgo.go | 0 {internal/api => api}/cgo.go | 0 {internal/api => api}/env.go | 0 {internal/api => api}/error.go | 0 {internal/api => api}/iterator.go | 0 {internal/api => api}/iterator_test.go | 2 +- {internal/api => api}/lib.go | 0 {internal/api => api}/lib_test.go | 0 {internal/api => api}/libwasmvm.aarch64.so | Bin {internal/api => api}/libwasmvm.dylib | Bin {internal/api => api}/libwasmvm.x86_64.so | Bin .../api => api}/link_glibclinux_aarch64.go | 0 .../api => api}/link_glibclinux_x86_64.go | 0 {internal/api => api}/link_mac.go | 0 {internal/api => api}/link_mac_static.go | 0 {internal/api => api}/link_muslc_aarch64.go | 0 {internal/api => api}/link_muslc_x86_64.go | 0 {internal/api => api}/link_system.go | 0 {internal/api => api}/link_windows.go | 0 {internal/api => api}/memory.go | 0 {internal/api => api}/memory_test.go | 0 {internal/api => api}/mock_failure.go | 0 {internal/api => api}/mocks.go | 2 +- {internal/api => api}/oracle_lib.go | 0 {internal/api => api}/span.go | 0 {internal/api => api}/testdb/README.md | 0 {internal/api => api}/testdb/memdb.go | 0 .../api => api}/testdb/memdb_iterator.go | 0 {internal/api => api}/testdb/types.go | 0 {internal/api => api}/version.go | 0 {internal/api => api}/version_test.go | 0 builders/README.md | 2 +- ibc_test.go | 2 +- lib_libwasmvm.go | 2 +- lib_libwasmvm_test.go | 2 +- oracle_lib.go | 2 +- oracle_lib_test.go | 2 +- version_cgo.go | 2 +- 45 files changed, 36 insertions(+), 36 deletions(-) rename {internal/api => api}/api_test.go (100%) rename {internal/api => api}/bindings.h (100%) rename {internal/api => api}/callbacks.go (100%) rename {internal/api => api}/callbacks_cgo.go (100%) rename {internal/api => api}/cgo.go (100%) rename {internal/api => api}/env.go (100%) rename {internal/api => api}/error.go (100%) rename {internal/api => api}/iterator.go (100%) rename {internal/api => api}/iterator_test.go (99%) rename {internal/api => api}/lib.go (100%) rename {internal/api => api}/lib_test.go (100%) rename {internal/api => api}/libwasmvm.aarch64.so (100%) rename {internal/api => api}/libwasmvm.dylib (100%) rename {internal/api => api}/libwasmvm.x86_64.so (100%) rename {internal/api => api}/link_glibclinux_aarch64.go (100%) rename {internal/api => api}/link_glibclinux_x86_64.go (100%) rename {internal/api => api}/link_mac.go (100%) rename {internal/api => api}/link_mac_static.go (100%) rename {internal/api => api}/link_muslc_aarch64.go (100%) rename {internal/api => api}/link_muslc_x86_64.go (100%) rename {internal/api => api}/link_system.go (100%) rename {internal/api => api}/link_windows.go (100%) rename {internal/api => api}/memory.go (100%) rename {internal/api => api}/memory_test.go (100%) rename {internal/api => api}/mock_failure.go (100%) rename {internal/api => api}/mocks.go (99%) rename {internal/api => api}/oracle_lib.go (100%) rename {internal/api => api}/span.go (100%) rename {internal/api => api}/testdb/README.md (100%) rename {internal/api => api}/testdb/memdb.go (100%) rename {internal/api => api}/testdb/memdb_iterator.go (100%) rename {internal/api => api}/testdb/types.go (100%) rename {internal/api => api}/version.go (100%) rename {internal/api => api}/version_test.go (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2bc0096a0..71c78a705 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,8 +38,8 @@ jobs: fi - run: # It is easy to update libwasmvm/bindings.h as part of the development but forget `make update-bindings` - name: Ensure internal/api/bindings.h is up to date - command: diff libwasmvm/bindings.h internal/api/bindings.h + name: Ensure api/bindings.h is up to date + command: diff libwasmvm/bindings.h api/bindings.h - run: name: Check Rust formatting working_directory: libwasmvm @@ -291,7 +291,7 @@ jobs: name: Create release build of libwasmvm command: make build-rust - persist_to_workspace: - root: ./internal/api + root: ./api paths: - libwasmvm.x86_64.so - save_cache: @@ -318,7 +318,7 @@ jobs: at: /tmp/builds - run: name: Copy .so build - command: cp /tmp/builds/libwasmvm.x86_64.so ./internal/api + command: cp /tmp/builds/libwasmvm.x86_64.so ./api - run: name: Build Go project command: make build-go @@ -340,7 +340,7 @@ jobs: - run: make test-alpine - run: name: Debug build results - command: ls -l ./internal/api + command: ls -l ./api deploy_to_git: machine: @@ -368,7 +368,7 @@ jobs: # command: make release-build-windows - run: name: Debug build results - command: ls -l ./internal/api + command: ls -l ./api - run: name: Configure git user # This is not a GitHub user and no permissions can be configured other than "push access", which @@ -380,7 +380,7 @@ jobs: name: Check-in and push new libraries command: | git status - git add ./internal/api + git add ./api git commit --allow-empty -m '[skip ci] Built release libraries' git push origin $CIRCLE_BRANCH @@ -403,7 +403,7 @@ jobs: command: make release-build-alpine - run: name: Debug build results - command: ls -l ./internal/api + command: ls -l ./api # Deploy to GitHub releases on tag builds. At some point we might want to extract # those steps into a separate job for better maintainability. - when: @@ -415,13 +415,13 @@ jobs: mkdir artifacts # Static (from build) - cp ./internal/api/libwasmvm_muslc.x86_64.a artifacts/ - cp ./internal/api/libwasmvm_muslc.aarch64.a artifacts/ + cp ./api/libwasmvm_muslc.x86_64.a artifacts/ + cp ./api/libwasmvm_muslc.aarch64.a artifacts/ # Shared (from git) - cp ./internal/api/libwasmvm.aarch64.so artifacts/ - cp ./internal/api/libwasmvm.x86_64.so artifacts/ - cp ./internal/api/libwasmvm.dylib artifacts/ + cp ./api/libwasmvm.aarch64.so artifacts/ + cp ./api/libwasmvm.x86_64.so artifacts/ + cp ./api/libwasmvm.dylib artifacts/ - run: name: Create checksums working_directory: artifacts diff --git a/.gitignore b/.gitignore index d756a00b3..631dbca5d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ .vscode # no static libraries (35MB+) -/internal/api/lib*.a +/api/lib*.a # artifacts from compile tests /build/ diff --git a/Makefile b/Makefile index 0f84c83aa..69564a2d5 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ build-rust: build-rust-release # In order to use "--features backtraces" here we need a Rust nightly toolchain, which we don't have by default build-rust-debug: (cd libwasmvm && cargo build) - cp libwasmvm/target/debug/$(SHARED_LIB_SRC) internal/api/$(SHARED_LIB_DST) + cp libwasmvm/target/debug/$(SHARED_LIB_SRC) api/$(SHARED_LIB_DST) make update-bindings # use release build to actually ship - smaller and much faster @@ -49,7 +49,7 @@ build-rust-debug: # enable stripping through cargo (if that is desired). build-rust-release: (cd libwasmvm && cargo build --release) - cp libwasmvm/target/release/$(SHARED_LIB_SRC) internal/api/$(SHARED_LIB_DST) + cp libwasmvm/target/release/$(SHARED_LIB_SRC) api/$(SHARED_LIB_DST) make update-bindings @ #this pulls out ELF symbols, 80% size reduction! @@ -77,8 +77,8 @@ release-build-alpine: rm -rf libwasmvm/target/x86_64-unknown-linux-musl/release # build the muslc *.a file docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-alpine - cp libwasmvm/artifacts/libwasmvm_muslc.x86_64.a internal/api - cp libwasmvm/artifacts/libwasmvm_muslc.aarch64.a internal/api + cp libwasmvm/artifacts/libwasmvm_muslc.x86_64.a api + cp libwasmvm/artifacts/libwasmvm_muslc.aarch64.a api make update-bindings # Creates a release build in a containerized build environment of the shared library for glibc Linux (.so) @@ -87,8 +87,8 @@ release-build-linux: rm -rf libwasmvm/target/x86_64-unknown-linux-gnu/release rm -rf libwasmvm/target/aarch64-unknown-linux-gnu/release docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-centos7 build_linux.sh - cp libwasmvm/artifacts/libwasmvm.x86_64.so internal/api - cp libwasmvm/artifacts/libwasmvm.aarch64.so internal/api + cp libwasmvm/artifacts/libwasmvm.x86_64.so api + cp libwasmvm/artifacts/libwasmvm.aarch64.so api make update-bindings # Creates a release build in a containerized build environment of the shared library for macOS (.dylib) @@ -97,7 +97,7 @@ release-build-macos: rm -rf libwasmvm/target/x86_64-apple-darwin/release rm -rf libwasmvm/target/aarch64-apple-darwin/release docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-cross build_macos.sh - cp libwasmvm/artifacts/libwasmvm.dylib internal/api + cp libwasmvm/artifacts/libwasmvm.dylib api make update-bindings # Creates a release build in a containerized build environment of the static library for macOS (.a) @@ -106,7 +106,7 @@ release-build-macos-static: rm -rf libwasmvm/target/x86_64-apple-darwin/release rm -rf libwasmvm/target/aarch64-apple-darwin/release docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-cross build_macos_static.sh - cp libwasmvm/artifacts/libwasmvmstatic_darwin.a internal/api/libwasmvmstatic_darwin.a + cp libwasmvm/artifacts/libwasmvmstatic_darwin.a api/libwasmvmstatic_darwin.a make update-bindings # Creates a release build in a containerized build environment of the shared library for Windows (.dll) @@ -114,13 +114,13 @@ release-build-windows: # Builders should not write their target folder into the host file system (https://github.com/CosmWasm/wasmvm/issues/437) rm -rf libwasmvm/target/x86_64-pc-windows-gnu/release docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-cross build_windows.sh - cp libwasmvm/target/x86_64-pc-windows-gnu/release/wasmvm.dll internal/api + cp libwasmvm/target/x86_64-pc-windows-gnu/release/wasmvm.dll api make update-bindings update-bindings: # After we build libwasmvm, we have to copy the generated bindings for Go code to use. # We cannot use symlinks as those are not reliably resolved by `go get` (https://github.com/CosmWasm/wasmvm/pull/235). - cp libwasmvm/bindings.h internal/api + cp libwasmvm/bindings.h api release-build: # Write like this because those must not run in parallel diff --git a/README.md b/README.md index 501324a8c..3a56b5303 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The Go code consistes of three packages: 1. The types (the `github.com/CosmWasm/wasmvm/types` import), using `package types` -2. The internal package `internal/api`, using `package api` +2. The internal package `api`, using `package api` 3. This repo (the `github.com/CosmWasm/wasmvm` import), using `package cosmwasm` The dependencies between them are as follows: @@ -72,11 +72,11 @@ go build ./types CGO_ENABLED=0 go build ./types ``` -#### Package internal/api +#### Package api This package contains the code binding the libwasmvm build to the Go code. All low level FFI handling code belongs there. This package can only be built using -cgo. Uing the `internal/` convention makes this package fully private. +cgo. #### Package github.com/CosmWasm/wasmvm diff --git a/internal/api/api_test.go b/api/api_test.go similarity index 100% rename from internal/api/api_test.go rename to api/api_test.go diff --git a/internal/api/bindings.h b/api/bindings.h similarity index 100% rename from internal/api/bindings.h rename to api/bindings.h diff --git a/internal/api/callbacks.go b/api/callbacks.go similarity index 100% rename from internal/api/callbacks.go rename to api/callbacks.go diff --git a/internal/api/callbacks_cgo.go b/api/callbacks_cgo.go similarity index 100% rename from internal/api/callbacks_cgo.go rename to api/callbacks_cgo.go diff --git a/internal/api/cgo.go b/api/cgo.go similarity index 100% rename from internal/api/cgo.go rename to api/cgo.go diff --git a/internal/api/env.go b/api/env.go similarity index 100% rename from internal/api/env.go rename to api/env.go diff --git a/internal/api/error.go b/api/error.go similarity index 100% rename from internal/api/error.go rename to api/error.go diff --git a/internal/api/iterator.go b/api/iterator.go similarity index 100% rename from internal/api/iterator.go rename to api/iterator.go diff --git a/internal/api/iterator_test.go b/api/iterator_test.go similarity index 99% rename from internal/api/iterator_test.go rename to api/iterator_test.go index 494732b08..85e619e37 100644 --- a/internal/api/iterator_test.go +++ b/api/iterator_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api/testdb" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api/testdb" "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ) diff --git a/internal/api/lib.go b/api/lib.go similarity index 100% rename from internal/api/lib.go rename to api/lib.go diff --git a/internal/api/lib_test.go b/api/lib_test.go similarity index 100% rename from internal/api/lib_test.go rename to api/lib_test.go diff --git a/internal/api/libwasmvm.aarch64.so b/api/libwasmvm.aarch64.so similarity index 100% rename from internal/api/libwasmvm.aarch64.so rename to api/libwasmvm.aarch64.so diff --git a/internal/api/libwasmvm.dylib b/api/libwasmvm.dylib similarity index 100% rename from internal/api/libwasmvm.dylib rename to api/libwasmvm.dylib diff --git a/internal/api/libwasmvm.x86_64.so b/api/libwasmvm.x86_64.so similarity index 100% rename from internal/api/libwasmvm.x86_64.so rename to api/libwasmvm.x86_64.so diff --git a/internal/api/link_glibclinux_aarch64.go b/api/link_glibclinux_aarch64.go similarity index 100% rename from internal/api/link_glibclinux_aarch64.go rename to api/link_glibclinux_aarch64.go diff --git a/internal/api/link_glibclinux_x86_64.go b/api/link_glibclinux_x86_64.go similarity index 100% rename from internal/api/link_glibclinux_x86_64.go rename to api/link_glibclinux_x86_64.go diff --git a/internal/api/link_mac.go b/api/link_mac.go similarity index 100% rename from internal/api/link_mac.go rename to api/link_mac.go diff --git a/internal/api/link_mac_static.go b/api/link_mac_static.go similarity index 100% rename from internal/api/link_mac_static.go rename to api/link_mac_static.go diff --git a/internal/api/link_muslc_aarch64.go b/api/link_muslc_aarch64.go similarity index 100% rename from internal/api/link_muslc_aarch64.go rename to api/link_muslc_aarch64.go diff --git a/internal/api/link_muslc_x86_64.go b/api/link_muslc_x86_64.go similarity index 100% rename from internal/api/link_muslc_x86_64.go rename to api/link_muslc_x86_64.go diff --git a/internal/api/link_system.go b/api/link_system.go similarity index 100% rename from internal/api/link_system.go rename to api/link_system.go diff --git a/internal/api/link_windows.go b/api/link_windows.go similarity index 100% rename from internal/api/link_windows.go rename to api/link_windows.go diff --git a/internal/api/memory.go b/api/memory.go similarity index 100% rename from internal/api/memory.go rename to api/memory.go diff --git a/internal/api/memory_test.go b/api/memory_test.go similarity index 100% rename from internal/api/memory_test.go rename to api/memory_test.go diff --git a/internal/api/mock_failure.go b/api/mock_failure.go similarity index 100% rename from internal/api/mock_failure.go rename to api/mock_failure.go diff --git a/internal/api/mocks.go b/api/mocks.go similarity index 99% rename from internal/api/mocks.go rename to api/mocks.go index 733c1a5e5..4228b5fa3 100644 --- a/internal/api/mocks.go +++ b/api/mocks.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api/testdb" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api/testdb" "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ) diff --git a/internal/api/oracle_lib.go b/api/oracle_lib.go similarity index 100% rename from internal/api/oracle_lib.go rename to api/oracle_lib.go diff --git a/internal/api/span.go b/api/span.go similarity index 100% rename from internal/api/span.go rename to api/span.go diff --git a/internal/api/testdb/README.md b/api/testdb/README.md similarity index 100% rename from internal/api/testdb/README.md rename to api/testdb/README.md diff --git a/internal/api/testdb/memdb.go b/api/testdb/memdb.go similarity index 100% rename from internal/api/testdb/memdb.go rename to api/testdb/memdb.go diff --git a/internal/api/testdb/memdb_iterator.go b/api/testdb/memdb_iterator.go similarity index 100% rename from internal/api/testdb/memdb_iterator.go rename to api/testdb/memdb_iterator.go diff --git a/internal/api/testdb/types.go b/api/testdb/types.go similarity index 100% rename from internal/api/testdb/types.go rename to api/testdb/types.go diff --git a/internal/api/version.go b/api/version.go similarity index 100% rename from internal/api/version.go rename to api/version.go diff --git a/internal/api/version_test.go b/api/version_test.go similarity index 100% rename from internal/api/version_test.go rename to api/version_test.go diff --git a/builders/README.md b/builders/README.md index 651b576f1..d245f626d 100644 --- a/builders/README.md +++ b/builders/README.md @@ -126,7 +126,7 @@ libs: ``` Then in the repo root, `make release-build` will use the above docker image and -copy the generated `{so,dylib}` files into `internal/api` directory to be +copy the generated `{so,dylib}` files into `api` directory to be linked. ## Future Work diff --git a/ibc_test.go b/ibc_test.go index 2518f6287..997285b93 100644 --- a/ibc_test.go +++ b/ibc_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api" "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ) diff --git a/lib_libwasmvm.go b/lib_libwasmvm.go index 3498ad4a2..1056e5728 100644 --- a/lib_libwasmvm.go +++ b/lib_libwasmvm.go @@ -9,7 +9,7 @@ import ( "encoding/json" "fmt" - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api" "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ) diff --git a/lib_libwasmvm_test.go b/lib_libwasmvm_test.go index 77f6468b7..da12f88eb 100644 --- a/lib_libwasmvm_test.go +++ b/lib_libwasmvm_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api" "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ) diff --git a/oracle_lib.go b/oracle_lib.go index a02de7274..790355d98 100644 --- a/oracle_lib.go +++ b/oracle_lib.go @@ -3,7 +3,7 @@ package cosmwasm import ( - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api" "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ) diff --git a/oracle_lib_test.go b/oracle_lib_test.go index 83056804a..f4ab4d71c 100644 --- a/oracle_lib_test.go +++ b/oracle_lib_test.go @@ -5,7 +5,7 @@ package cosmwasm import ( "testing" - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api" "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/require" ) diff --git a/version_cgo.go b/version_cgo.go index d2ec7850b..e0bbb5bc2 100644 --- a/version_cgo.go +++ b/version_cgo.go @@ -3,7 +3,7 @@ package cosmwasm import ( - "github.com/ODIN-PROTOCOL/wasmvm/v2/internal/api" + "github.com/ODIN-PROTOCOL/wasmvm/v2/api" ) func libwasmvmVersionImpl() (string, error) {