diff --git a/.golangci.yaml b/.github/golangci.yml similarity index 100% rename from .golangci.yaml rename to .github/golangci.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index e1e01f0658c..00000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build - -on: - pull_request: - paths: - - "**.go" - - "**.gno" - - "go.mod" - - "go.sum" - - ".github/workflows/build.yml" - push: - branches: - - master - -jobs: - go-build: - name: Go Build - strategy: - fail-fast: false - matrix: - go-version: [ "1.19.x", "1.20.x" ] - goarch: [ "amd64" ] - goos: [ "linux" ] - program: [ "genproto", "gnofaucet", "gnokey", "gnoland", "gnotxport", "goscan", "gnodev", "gnoweb" ] - runs-on: ubuntu-latest - timeout-minutes: 5 - steps: - - uses: actions/setup-go@v4 - with: - go-version: ${{ matrix.go-version }} - - uses: actions/checkout@v3 - - name: install - if: matrix.program != 'gnoweb' - run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go install ./cmd/${{ matrix.program }} - - name: install - # FIXME: consider moving gnoland/website -> ./cmd/gnoweb - if: matrix.program == 'gnoweb' - run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go install ./gnoland/website diff --git a/.github/workflows/db-tests.yml b/.github/workflows/db-tests.yml index 35f3ad33a95..f8808890a4c 100644 --- a/.github/workflows/db-tests.yml +++ b/.github/workflows/db-tests.yml @@ -1,19 +1,16 @@ -name: DB Tests +name: db-tests on: pull_request: paths: - - "pkgs/db" - - "go.mod" + - "t2/pkg/db/**.go" - "go.sum" - ".github/workflows/db-tests.yml" push: - branches: - - master + branches: [ $default-branch ] jobs: - test-databases: - name: basic database test + test: runs-on: ubuntu-latest timeout-minutes: 5 strategy: @@ -44,5 +41,5 @@ jobs: # test ./pkgs/db - uses: actions/checkout@v3 - - name: test ./pkgs/db - run: go test -tags ${{ matrix.tags }} ./pkgs/db/... + - name: test ./tm2/pkg/db + run: go test -tags ${{ matrix.tags }} ./tm2/pkg/db/... diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 27070e5c31e..1ee27e32993 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,4 +1,4 @@ -name: Docker +name: docker on: pull_request: paths: @@ -7,13 +7,11 @@ on: - "!docs/**" - "!**.md" push: - branches: - - master + branches: [ $default-branch ] jobs: build-push: runs-on: ubuntu-latest - name: "Build & Push Container" steps: - name: Checkout uses: actions/checkout@v3 @@ -33,13 +31,13 @@ jobs: run: | docker build --target=gnoland-slim -t ghcr.io/${owner}/${reponame}/gnoland-slim . docker build --target=gnokey-slim -t ghcr.io/${owner}/${reponame}/gnokey-slim . - docker build --target=gnodev-slim -t ghcr.io/${owner}/${reponame}/gnodev-slim . + docker build --target=gno-slim -t ghcr.io/${owner}/${reponame}/gno-slim . docker build --target=gnofaucet-slim -t ghcr.io/${owner}/${reponame}/gnofaucet-slim . docker build --target=gnoweb-slim -t ghcr.io/${owner}/${reponame}/gnoweb-slim . docker tag ghcr.io/${owner}/${reponame}/gnoland-slim:latest ghcr.io/${owner}/${reponame}/gnoland-slim:${GITHUB_SHA::8} docker tag ghcr.io/${owner}/${reponame}/gnokey-slim:latest ghcr.io/${owner}/${reponame}/gnokey-slim:${GITHUB_SHA::8} - docker tag ghcr.io/${owner}/${reponame}/gnodev-slim:latest ghcr.io/${owner}/${reponame}/gnodev-slim:${GITHUB_SHA::8} + docker tag ghcr.io/${owner}/${reponame}/gno-slim:latest ghcr.io/${owner}/${reponame}/gno-slim:${GITHUB_SHA::8} docker tag ghcr.io/${owner}/${reponame}/gnofaucet-slim:latest ghcr.io/${owner}/${reponame}/gnofaucet-slim:${GITHUB_SHA::8} docker tag ghcr.io/${owner}/${reponame}/gnoweb-slim:latest ghcr.io/${owner}/${reponame}/gnoweb-slim:${GITHUB_SHA::8} @@ -70,8 +68,8 @@ jobs: docker push ghcr.io/${owner}/${reponame}/gnokey-slim:latest docker push ghcr.io/${owner}/${reponame}/gnokey-slim:${GITHUB_SHA::8} - docker push ghcr.io/${owner}/${reponame}/gnodev-slim:latest - docker push ghcr.io/${owner}/${reponame}/gnodev-slim:${GITHUB_SHA::8} + docker push ghcr.io/${owner}/${reponame}/gno-slim:latest + docker push ghcr.io/${owner}/${reponame}/gno-slim:${GITHUB_SHA::8} docker push ghcr.io/${owner}/${reponame}/gnofaucet-slim:latest docker push ghcr.io/${owner}/${reponame}/gnofaucet-slim:${GITHUB_SHA::8} diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 002116dfe2c..360a983efb1 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -1,21 +1,19 @@ -name: Gno Examples +name: examples on: pull_request: paths: - - "**.go" - - "**.gno" - - "go.mod" - "go.sum" + - "gnovm/**.go" + - "gnovm/**.gno" + - "gnovm/**/go.sum" + - "examples/**.gno" - ".github/workflows/examples.yml" - - "Makefile" push: - branches: - - master + branches: [ $default-branch ] jobs: - go-test: - name: Gno Examples + gno2go: strategy: fail-fast: false matrix: @@ -27,9 +25,7 @@ jobs: with: go-version: ${{ matrix.go-version }} - uses: actions/checkout@v3 - - run: go install -v ./cmd/gnodev - # TODO: implement --allow-all-imports - #- run: gnodev precompile ./stdlibs --verbose --allow-all-imports - #- run: gnodev precompile ./tests --verbose --allow-all-imports - - run: go run ./cmd/gnodev precompile --verbose ./examples - - run: go run ./cmd/gnodev build --verbose ./examples + - run: go install -v ./gnovm/cmd/gno + - run: go run ./gnovm/cmd/gno precompile --verbose ./examples + - run: go run ./gnovm/cmd/gno build --verbose ./examples + # unittests: TODO: matrix with contracts diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml new file mode 100644 index 00000000000..bdcd8811675 --- /dev/null +++ b/.github/workflows/gnoland.yml @@ -0,0 +1,60 @@ +name: gno.land + +on: + pull_request: + paths: + - "go.sum" + - "gnovm/**.go" + - "gnovm/**.gno" + - "tm2/**.go" + - "gno.land/**" + - ".github/workflows/gnovm.yml" + push: + branches: [ $default-branch ] + +jobs: + build: + strategy: + fail-fast: false + matrix: + go-version: [ "1.19.x", "1.20.x" ] + goarch: [ "amd64" ] + goos: [ "linux" ] + program: + - gnoland + - gnokey + - gnoweb + - gnofaucet + runs-on: ubuntu-latest + timeout-minutes: 5 + steps: + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go-version }} + - uses: actions/checkout@v3 + - name: go install + working-directory: gno.land + run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go install ./cmd/${{ matrix.program }} + + test: + strategy: + fail-fast: false + matrix: + go-version: [ "1.19.x", "1.20.x" ] + args: + - _test.gnoland + - _test.gnokey + - _test.pkgs + #- _test.gnoweb # this test should be rewritten to run an inmemory localnode + runs-on: ubuntu-latest + timeout-minutes: 15 + steps: + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go-version }} + - uses: actions/checkout@v3 + - name: test + working-directory: gno.land + run: | + export GOPATH=$HOME/go + make ${{ matrix.args }} diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml new file mode 100644 index 00000000000..507fde85d5f --- /dev/null +++ b/.github/workflows/gnovm.yml @@ -0,0 +1,62 @@ +name: gnovm + +on: + pull_request: + paths: + - "go.sum" + - "gnovm/**.go" + - "gnovm/**.gno" + - "gnovm/**/go.sum" + - "gnovm/Makefile" + - "tm2/**.go" + - ".github/workflows/gnovm.yml" + push: + branches: [ $default-branch ] + +jobs: + build: + strategy: + fail-fast: false + matrix: + go-version: [ "1.19.x", "1.20.x" ] + goarch: [ "amd64" ] + goos: [ "linux" ] + program: [ "gno" ] + runs-on: ubuntu-latest + timeout-minutes: 5 + steps: + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go-version }} + - uses: actions/checkout@v3 + - name: go install + working-directory: gnovm + run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go install ./cmd/${{ matrix.program }} + + test: + strategy: + fail-fast: false + matrix: + go-version: [ "1.19.x", "1.20.x" ] + args: + - _test.cmd + - _test.pkg + - _test.gnolang.native + - _test.gnolang.stdlibs + - _test.gnolang.realm + - _test.gnolang.pkg0 + - _test.gnolang.pkg1 + - _test.gnolang.pkg2 + - _test.gnolang.other + runs-on: ubuntu-latest + timeout-minutes: 15 + steps: + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go-version }} + - uses: actions/checkout@v3 + - name: test + working-directory: gnovm + run: | + export GOPATH=$HOME/go + make ${{ matrix.args }} diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml index d2c4216123e..0700fb79dd3 100644 --- a/.github/workflows/lint-pr.yml +++ b/.github/workflows/lint-pr.yml @@ -1,4 +1,4 @@ -name: "Lint PR" +name: "lint-pr" on: pull_request_target: @@ -8,8 +8,7 @@ on: - synchronize jobs: - main: - name: Validate PR title + pr-title: runs-on: ubuntu-latest steps: - uses: amannn/action-semantic-pull-request@v5 diff --git a/.github/workflows/lint.yml b/.github/workflows/misc.yml similarity index 86% rename from .github/workflows/lint.yml rename to .github/workflows/misc.yml index eb5c2929930..bbc05a1fbe3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/misc.yml @@ -1,20 +1,18 @@ -name: Lint +name: misc on: push: - branches: - - master + branches: [ $default-branch ] pull_request: jobs: lint: - name: Linter Workflow runs-on: ubuntu-latest steps: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.19.x + go-version: 1.20.x - name: Checkout code uses: actions/checkout@v3 @@ -24,15 +22,14 @@ jobs: with: version: v1.51 args: - --config=./.golangci.yaml + --config=./.github/golangci.yml fmt: - name: Format checker runs-on: ubuntu-latest steps: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.19.x + go-version: 1.20.x - name: Install make run: sudo apt-get install -y make diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml new file mode 100644 index 00000000000..a84d9b14348 --- /dev/null +++ b/.github/workflows/tm2.yml @@ -0,0 +1,56 @@ +name: tm2 + +on: + pull_request: + paths: + - "go.sum" + - "tm2/Makefile" + - "tm2/**.go" + - ".github/workflows/tm2.yml" + push: + branches: + - [ $default-branch ] + +jobs: + build: + strategy: + fail-fast: false + matrix: + go-version: [ "1.19.x", "1.20.x" ] + goarch: [ "amd64" ] + goos: [ "linux" ] + program: [ "./cmd/tm2txsync", "./pkg/amino/cmd/aminoscan", "./pkg/amino/cmd/goscan", "./pkg/autofile/cmd", "./pkg/iavl/cmd/iaviewer" ] + runs-on: ubuntu-latest + timeout-minutes: 5 + steps: + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go-version }} + - uses: actions/checkout@v3 + - name: go install + working-directory: tm2 + run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go install ${{ matrix.program }} + + test: + strategy: + fail-fast: false + matrix: + go-version: [ "1.19.x", "1.20.x" ] + args: + - _test.flappy + - _test.pkg.amino + - _test.pkg.bft + - _test.pkg.others + - _test.cmds + runs-on: ubuntu-latest + timeout-minutes: 15 + steps: + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go-version }} + - uses: actions/checkout@v3 + - name: test + working-directory: tm2 + run: | + export GOPATH=$HOME/go + make ${{ matrix.args }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml deleted file mode 100644 index 462c4e7fde3..00000000000 --- a/.github/workflows/unit-tests.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Tests - -on: - pull_request: - paths: - - "**.go" - - "**.gno" - - "go.mod" - - "go.sum" - - ".github/workflows/unit-tests.yml" - - "Makefile" - push: - branches: - - master - -jobs: - go-test: - name: Go Test - strategy: - fail-fast: false - matrix: - go-version: [ "1.19.x", "1.20.x" ] - args: - - test.go1 - - test.go2 - - test.go3 - - test.go4 - - test.filesNative - - test.filesStdlibs - - test.packages0 - - test.packages1 - - test.packages2 - - test.examples - - test.flappy - - test.docker-integration - runs-on: ubuntu-latest - timeout-minutes: 15 - steps: - - uses: actions/setup-go@v4 - with: - go-version: ${{ matrix.go-version }} - - uses: actions/checkout@v3 - - name: test - run: | - export GOPATH=$HOME/go - make ${{ matrix.args }} diff --git a/.gitignore b/.gitignore index ff593128e20..bd384b58046 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,9 @@ cmd/foo.go unsorted.* .DS_Store data/* -proto/* testdir pkgs/sdk/vm/_testdata -cmd/gnodev/gnodev -build/* +build *.tx *.log.* *.log diff --git a/.gitpod.yml b/.gitpod.yml index 8324e4ac6c8..aeb4943ea04 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -9,16 +9,15 @@ tasks: (cd misc/devdeps && make install) && echo "download dependencies" && go mod download && - echo "prebuild gnodev" && - make install_gnodev - command: gnodev --help + go install ./gnovm/cmd/gno + command: gno --help - name: Gnoland Website - init: cd gnoland/website && go install . - command: go run . --bind=0.0.0.0:8888 + init: go install ./gno.land/cmd/gnoweb + command: gnoweb --bind=0.0.0.0:8888 - name: Gnoland Node - init: go install ./cmd/gnoland + init: go install ./gno.land/cmd/gnoland command: gnoland ports: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d8360a50ba9..e5f1c22411b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,8 +64,8 @@ It is recommended to work on a Unix environment, as most of the tooling is built for Windows / Linux / macOS). For Gno, there is no specific tooling that needs to be installed, that’s not already provided with the repo itself. -You can utilize the `gnodev` command to facilitate Gnolang support when writing Smart Contracts in Gno, by installing it -with `make install gnodev`. +You can utilize the `gno` command to facilitate Gnolang support when writing Smart Contracts in Gno, by installing it +with `make install_gno`. Additionally, you can also configure your editor to recognize `.gno` files as `.go` files, to get the benefit of syntax highlighting. @@ -79,14 +79,14 @@ Add to your `.vimrc` file: ```vim function! GnoFmt() - cexpr system('gofmt -e -w ' . expand('%')) "or replace with gofumpt - edit! + cexpr system('gofmt -e -w ' . expand('%')) "or replace with gofumpt + edit! endfunction command! GnoFmt call GnoFmt() augroup gno_autocmd - autocmd! - autocmd BufNewFile,BufRead *.gno set filetype=go - autocmd BufWritePost *.gno GnoFmt + autocmd! + autocmd BufNewFile,BufRead *.gno set filetype=go + autocmd BufWritePost *.gno GnoFmt augroup END ``` @@ -121,7 +121,8 @@ There are essentially 2 ways to execute the entire test suite: #### Running locally To run the entire test suite locally, run the following command: -`make test` + + make test This will execute the full test suite, that includes tests for `.gno` files, as well as project `.go` tests. @@ -132,25 +133,26 @@ using Docker. The workflow configurations contain different `go` versions, so it worried about compatibility. To run the entire test suite through workflow files, run the following command: -`act -v -j go-test` + + act -v -j go-test #### Testing GNO code -If you wish to test a `.gno` Realm or Package, you can utilize the `gnodev` tool. +If you wish to test a `.gno` Realm or Package, you can utilize the `gno` tool. 1. To install it, simply run: -`make install gnodev` + make install_gno 2. Now, you can point to the directory containing the `*_test.gno` files: -`gnodev test --verbose` + gno test --verbose -To learn more about how `gnodev` can help you when developing gno code, you can look into the available +To learn more about how `gno` can help you when developing gno code, you can look into the available subcommands by running: -`gnodev --help` + gno --help ### Repository Structure @@ -358,15 +360,3 @@ automatic label management. | info needed | Issue is lacking information needed for resolving | | investigating | Issue is still being investigated by the team | | question | Issue starts a discussion or raises a question | - -### Notable Contributions - -Notable contributions of fixes/features/refactors: - -- [#208](https://github.com/gnolang/gno/pull/208) - @anarcher, gnodev test with testing.T -- [#167](https://github.com/gnolang/gno/pull/167) - @loicttn, website: Add syntax highlighting + security practices -- [#136](https://github.com/gnolang/gno/pull/136) - @moul, foo20, a grc20 example smart contract -- [#126](https://github.com/gnolang/gno/pull/126) - @moul, feat: use the new Precompile in gnodev and in the addpkg/execution flow (2/2) -- [#119](https://github.com/gnolang/gno/pull/119) - @moul, add a Gno2Go precompiler (1/2) -- [#112](https://github.com/gnolang/gno/pull/112) - @moul, feat: add 'gnokey maketx --broadcast' option -- [#110](https://github.com/gnolang/gno/pull/110), [#109](https://github.com/gnolang/gno/pull/109), [#108](https://github.com/gnolang/gno/pull/108), [#106](https://github.com/gnolang/gno/pull/106), [#103](https://github.com/gnolang/gno/pull/103), [#102](https://github.com/gnolang/gno/pull/102), [#101](https://github.com/gnolang/gno/pull/101) - @moul, various chores. diff --git a/Dockerfile b/Dockerfile index b6e13dbf934..8b8beb4a0b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,18 +2,18 @@ FROM golang:1.20 AS build RUN mkdir -p /opt/gno/src /opt/build WORKDIR /opt/build -ADD go.mod go.sum /opt/build/ +ADD go.mod go.sum ./ RUN go mod download +ADD . ./ +RUN go build -o ./build/gnoland ./gno.land/cmd/gnoland +RUN go build -o ./build/gnokey ./gno.land/cmd/gnokey +RUN go build -o ./build/gnofaucet ./gno.land/cmd/gnofaucet +RUN go build -o ./build/gnoweb ./gno.land/cmd/gnoweb +RUN go build -o ./build/gno ./gnovm/cmd/gno +RUN go build -o ./build/tm2txsync ./tm2/cmd/tm2txsync +RUN ls -la ./build ADD . /opt/gno/src/ -ADD . /opt/build/ -RUN go build -o ./build/gnoland ./cmd/gnoland -RUN go build -o ./build/gnokey ./cmd/gnokey -RUN go build -o ./build/gnodev ./cmd/gnodev -RUN go build -o ./build/gnofaucet ./cmd/gnofaucet -RUN go build -o ./build/gnotxport ./cmd/gnotxport -RUN cd ./gnoland/website && go build -o ../../build/gnoweb . RUN rm -rf /opt/gno/src/.git -RUN ls -la /opt/build/build/ # runtime-base + runtime-tls FROM debian:stable-slim AS runtime-base @@ -32,22 +32,22 @@ FROM runtime-base AS gnokey-slim COPY --from=build /opt/build/build/gnokey /opt/gno/bin/ ENTRYPOINT ["gnokey"] -FROM runtime-base AS gnodev-slim -COPY --from=build /opt/build/build/gnodev /opt/gno/bin/ -ENTRYPOINT ["gnodev"] +FROM runtime-base AS gno-slim +COPY --from=build /opt/build/build/gno /opt/gno/bin/ +ENTRYPOINT ["gno"] FROM runtime-tls AS gnofaucet-slim COPY --from=build /opt/build/build/gnofaucet /opt/gno/bin/ ENTRYPOINT ["gnofaucet"] EXPOSE 5050 -FROM runtime-tls AS gnotxport-slim -COPY --from=build /opt/build/build/gnotxport /opt/gno/bin/ -ENTRYPOINT ["gnotxport"] +FROM runtime-tls AS tm2txsync-slim +COPY --from=build /opt/build/build/tm2txsync /opt/gno/bin/ +ENTRYPOINT ["tm2txsync"] FROM runtime-tls AS gnoweb-slim COPY --from=build /opt/build/build/gnoweb /opt/gno/bin/ -COPY --from=build /opt/gno/src/gnoland/website /opt/gno/src/gnoland/website +COPY --from=build /opt/gno/src/gno.land/cmd/gnoweb /opt/gno/src/gnoweb ENTRYPOINT ["gnoweb"] EXPOSE 8888 diff --git a/LICENSE.md b/LICENSE.md index df824bd8549..83419e577a6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -58,6 +58,6 @@ This license is subject to change at any time by the Project owner. Your continued access to or use of this Project or any works available through this Project shall be subject to the then-current version of this license. -This license applies to github.com/gnolang/gno/pkgs/gnolang and all code except -the other common libraries under github.com/gnolang/gno/pkgs/ which are +This license applies to github.com/gnolang/gno/gnovm and all code except +the other common libraries under github.com/gnolang/gno/tm2 which are published under the Apache2.0 license. diff --git a/Makefile b/Makefile index 83c613a7962..9ed5869d9c0 100644 --- a/Makefile +++ b/Makefile @@ -1,193 +1,36 @@ -# Short doc about the commands (please keep in sync with cmd/README for now): -# ------------------------ User commands ----------------------- -# gnokey Key manipulation, also general interaction with gnoland -# gnoland Runs the blockchain node -# gnotxport Importing/exporting transactions from local blockchain node storage -# website Serves gno website, along with user-defined content -# logos Intended to be used as a browser -# -# ---------------------- Developer commands ------------------- -# gnoscan Dumps imports from specified file’s AST -# genproto Helper for generating .proto implementations -# gnofaucet Serves GNOT faucet -# gnodev Handy tool for developing gno packages & realms +.PHONY: help +help: + @echo "Available make commands:" + @cat Makefile | grep '^[a-z][^:]*:' | cut -d: -f1 | sort | sed 's/^/ /' -# Dist suite -.PHONY: logos goscan gnoland gnokey gnofaucet logos reset gnoweb gnotxport -all: build - -build: gnoland gnokey gnodev goscan logos gnoweb gnotxport gnofaucet - -install: install_gnodev install_gnokey - -reset: - rm -rf testdir - make - -tools: - go build -o build/logjack ./pkgs/autofile/cmd - -gnoland: - @echo "Building gnoland" - go build -o build/gnoland ./cmd/gnoland - -gnokey: - @echo "Building gnokey" - go build -o build/gnokey ./cmd/gnokey - -gnodev: - @echo "Building gnodev" - go build -o build/gnodev ./cmd/gnodev +rundep=go run -modfile ../misc/devdeps/go.mod +# shortcuts to frequently used commands from sub-components. install_gnokey: - @echo "Installing gnokey" - go install ./cmd/gnokey - -install_gnodev: - @echo "Installing gnodev" - go install ./cmd/gnodev - -gnofaucet: - @echo "Building gnofaucet" - go build -o build/gnofaucet ./cmd/gnofaucet - -# goscan scans go code to determine its AST -goscan: - @echo "Building goscan" - go build -o build/goscan ./cmd/goscan - -gnoweb: - @echo "Building website" - - go build -o build/website ./gnoland/website - -gnotxport: - @echo "Building gnotxport" - go build -o build/gnotxport ./cmd/gnotxport - -logos: - @echo "building logos" - go build -o build/logos ./misc/logos/cmd/logos.go - -clean: - rm -rf build - -examples.precompile: install_gnodev - go run ./cmd/gnodev precompile --verbose ./examples - -examples.build: install_gnodev examples.precompile - go run ./cmd/gnodev build --verbose ./examples - -######################################## -# Formatting, linting. - -rundep=go run -modfile ./misc/devdeps/go.mod + $(MAKE) --no-print-directory -C ./gno.land install.gnokey + @echo "[+] 'gnokey' is installed. more info in ./gno.land/." +install_gno: + $(MAKE) --no-print-directory -C ./gnovm install + @echo "[+] 'gno' is installed. more info in ./gnovm/." + +.PHONY: test +test: + go test -count=1 -v ./misc/docker-integration + +.PHONY: test.components +test.components: + $(MAKE) --no-print-directory -C tm2 test + $(MAKE) --no-print-directory -C gnovm test + $(MAKE) --no-print-directory -C gno.land test + $(MAKE) --no-print-directory -C examples test .PHONY: fmt -GOFMT_FLAGS ?= -w -fmt_cmd=$(rundep) mvdan.cc/gofumpt $(GOFMT_FLAGS) fmt: - $(fmt_cmd) . - $(fmt_cmd) `find stdlibs examples stdlibs -name "*.gno"` + $(MAKE) --no-print-directory -C tm2 fmt + $(MAKE) --no-print-directory -C gnovm fmt + $(MAKE) --no-print-directory -C gno.land fmt + $(MAKE) --no-print-directory -C examples fmt .PHONY: lint lint: - golangci-lint run --config .golangci.yaml - -######################################## -# Test suite -.PHONY: test test.go test.go1 test.go2 test.go3 test.go4 test.gno test.filesNative test.filesStdlibs test.realm test.packages test.flappy test.packages0 test.packages1 test.packages2 test.docker-integration -test: test.gno test.go test.flappy - @echo "Full test suite finished." - -test.gno: test.filesNative test.filesStdlibs test.packages test.examples - go test tests/*.go -v -run "TestFileStr" - go test tests/*.go -v -run "TestSelectors" - -test.docker-integration: - go test -count=1 -v ./tests/docker-integration - -test.flappy: - # flappy tests should work "sometimes" (at least once) - TEST_STABILITY=flappy $(rundep) moul.io/testman test -test.v -timeout=20m -retry=10 -run ^TestFlappy \ - ./pkgs/bft/consensus ./pkgs/bft/blockchain ./pkgs/bft/mempool ./pkgs/p2p ./pkgs/bft/privval - -test.go: test.go1 test.go2 test.go3 test.go4 - -test.go1: - # test most of pkgs/* except amino and bft. - # -p 1 shows test failures as they come - # maybe another way to do this? - go test `go list ./pkgs/... | grep -v pkgs/amino/ | grep -v pkgs/bft/` -v -p 1 -timeout=30m - -test.go2: - # test amino. - go test ./pkgs/amino/... -v -p 1 -timeout=30m - -test.go3: - # test bft. - go test ./pkgs/bft/... -v -p 1 -timeout=30m - -test.go4: - go test ./cmd/gnodev ./cmd/gnoland -v -p 1 -timeout=30m - -test.filesNative: - go test tests/*.go -v -test.short -run "TestFilesNative/" --timeout 30m - -test.filesNative.sync: - go test tests/*.go -v -test.short -run "TestFilesNative/" --timeout 30m --update-golden-tests - -test.filesStdlibs: - go test tests/*.go -v -test.short -run 'TestFiles$$/' --timeout 30m - -test.filesStdlibs.sync: - go test tests/*.go -v -test.short -run 'TestFiles$$/' --timeout 30m --update-golden-tests - -test.realm: - go test tests/*.go -v -run "TestFiles/^zrealm" --timeout 30m - -test.packages: test.packages0 test.packages1 test.packages2 - -test.packages0: - go test tests/*.go -v -run "TestPackages/(bufio|crypto|encoding|errors|internal|io|math|sort|std|stdshim|strconv|strings|testing|unicode)" --timeout 30m - -test.packages1: - go test tests/*.go -v -run "TestPackages/regexp" --timeout 30m - -test.packages2: - go test tests/*.go -v -run "TestPackages/bytes" --timeout 30m - -test.examples: - go run ./cmd/gnodev test --verbose ./examples - -test.examples.sync: - go run ./cmd/gnodev test --verbose --update-golden-tests ./examples - -# Code gen -stringer_cmd=$(rundep) golang.org/x/tools/cmd/stringer -stringer: - $(stringer_cmd) -type=Kind ./pkgs/gnolang - $(stringer_cmd) -type=Op ./pkgs/gnolang - $(stringer_cmd) -type=TransCtrl ./pkgs/gnolang - $(stringer_cmd) -type=TransField ./pkgs/gnolang - $(stringer_cmd) -type=VPType ./pkgs/gnolang - $(stringer_cmd) -type=Word ./pkgs/gnolang - -genproto: - rm -rf proto/* - find pkgs | grep -v "^pkgs\/amino" | grep "\.proto" | xargs rm - find pkgs | grep -v "^pkgs\/amino" | grep "pbbindings" | xargs rm - find pkgs | grep -v "^pkgs\/amino" | grep "pb.go" | xargs rm - @rm gno.proto || true - @rm pbbindings.go || true - @rm gno.pb.go || true - go run cmd/genproto/genproto.go - -genproto2: - rm -rf proto/* - #find pkgs | grep -v "^pkgs\/amino" | grep "\.proto" | xargs rm - find pkgs | grep -v "^pkgs\/amino" | grep "pbbindings" | xargs rm - find pkgs | grep -v "^pkgs\/amino" | grep "pb.go" | xargs rm - #@rm gno.proto || true - @rm pbbindings.go || true - @rm gno.pb.go || true + golangci-lint run --config .github/golangci.yml diff --git a/README.md b/README.md index 0970aab95d3..6753e001aa6 100644 --- a/README.md +++ b/README.md @@ -8,28 +8,21 @@ Among these were Tendermint and Cosmos to engineer robust PoS and IBC. Then came Gno upon Cosmos and there spring forth Gnoland, simulated by the Gnomes of the Greater Resistance. -## Install `gnokey` +## Discover -`gnokey` is a tool for managing https://gno.land accounts and interact with instances. +* [examples](./examples) - smart-contract examples and guides for new Gno developers. +* [gnovm](./gnovm) - GnoVM and Gnolang. +* [gno.land](./gno.land) - Gno.land blockchain and tools. +* [tm2](./tm2) - Tendermint2. -> git clone git@github.com:gnolang/gno.git
-> cd ./gno
-> make install\_gnokey
+## Getting started -Also, see the [quickstart guide](https://test2.gno.land/r/boards:testboard/5). +Start your journey with Gno.land by: +- using the [`gnoweb`](./gno.land/cmd/gnoweb) interface on the [latest testnet (test3.gno.land)](https://test3.gno.land/), +- sending transactions with [`gnokey`](./gno.land/cmd/gnokey), +- writing smart-contracts with [`gno` (ex `gnodev`)](./gnovm/cmd/gnokey). -## Install `gnodev` - -`gnodev` is a tool for managing Gno source code. - -See [./cmd/gnodev](./cmd/gnodev#readme) for instructions. - -## Language Features - - * Like interpreted Go, but more ambitious. - * Completely deterministic, for complete accountability. - * Transactional persistence across data realms. - * Designed for concurrent blockchain smart contracts systems. +Also, see the [quickstart guide](https://test3.gno.land/r/demo/boards:testboard/5). ## Contact @@ -37,3 +30,21 @@ See [./cmd/gnodev](./cmd/gnodev#readme) for instructions. * Gnoland: https://gno.land/r/demo/boards:testboard * Telegram: https://t.me/gnoland * Twitter: https://twitter.com/_gnoland + +
Short doc about all the commands + + User commands: + + * [gnokey](./gno.land/cmd/gnokey) - key manipulation, also general interaction with gnoland + * [gnoland](./gno.land/cmd/gnoland) - runs the blockchain node + * [gnoweb](./gno.land/cmd/gnoweb) - serves gno website, along with user-defined content + * [logos](./misc/logos) - intended to be used as a browser + + Developer commands: + + * [gno](./gnovm/cmd/gno) - handy tool for developing gno packages & realms + * [tm2txsync](./tm2/cmd/tm2txsync) - importing/exporting transactions from local blockchain node storage + * [goscan](./misc/goscan) - dumps imports from specified file’s AST + * [genproto](./misc/genproto) - helper for generating .proto implementations + * [gnofaucet](./gno.land/cmd/gnofaucet) - serves GNOT faucet +
diff --git a/cmd/README b/cmd/README deleted file mode 100644 index c2179577376..00000000000 --- a/cmd/README +++ /dev/null @@ -1,16 +0,0 @@ -# Short doc about the commands (please keep in sync with Makefile for now): - -User commands: - -* gnokey - key manipulation, also general interaction with gnoland -* gnoland - runs the blockchain node -* gnotxport - importing/exporting transactions from local blockchain node storage -* website - serves gno website, along with user-defined content -* logos - intended to be used as a browser - -Developer commands: - -* gnoscan - dumps imports from specified file’s AST -* genproto - helper for generating .proto implementations -* gnofaucet - serves GNOT faucet -* gnodev - handy tool for developing gno packages & realms diff --git a/cmd/gnodev/README.md b/cmd/gnodev/README.md deleted file mode 100644 index 288def291d8..00000000000 --- a/cmd/gnodev/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# gnodev - -`gnodev` is a tool for managing Gno source code. - -## Usage - -`gnodev [arguments]` - -## Commands - -* `gnodev run` - run a Gno file -* `gnodev build` - build a gno package -* `gnodev precompile` - precompile .gno to .go -* `gnodev test` - test a gno package -* `gnodev repl` start a GnoVM REPL - -## Install - -`go install github.com/gnolang/gno/cmd/gnodev` - -Or - -> git clone git@github.com:gnolang/gno.git
-> cd ./gno
-> make install\_gnodev
- -## Getting started - -TODO diff --git a/gnoland/docs/peace.md b/docs/peace.md similarity index 100% rename from gnoland/docs/peace.md rename to docs/peace.md diff --git a/gnoland/tasks/001_describe_in_your_words.md b/docs/tasks/001_describe_in_your_words.md similarity index 100% rename from gnoland/tasks/001_describe_in_your_words.md rename to docs/tasks/001_describe_in_your_words.md diff --git a/examples/Makefile b/examples/Makefile new file mode 100644 index 00000000000..59643b66ead --- /dev/null +++ b/examples/Makefile @@ -0,0 +1,29 @@ +.PHONY: help +help: + @echo "Available make commands:" + @cat Makefile | grep '^[a-z][^:]*:' | cut -d: -f1 | sort | sed 's/^/ /' + +.PHONY: precompile +precompile: + go run ../gnovm/cmd/gno precompile --verbose . + +.PHONY: build +build: precompile + go run ../gnovm/cmd/gno build --verbose . + +.PHONY: test +test: + go run ../gnovm/cmd/gno test --verbose . + +.PHONY: test.sync +test.sync: + go run ../gnovm/cmd/gno test --verbose --update-golden-tests . + +.PHONY: clean +clean: + find . \( -name "*.gno.gen.go" -or -name ".*.gno.gen_test.go" \) -delete + +.PHONY: fmt +GOFMT_FLAGS ?= -w +fmt: + go run -modfile ../misc/devdeps/go.mod mvdan.cc/gofumpt $(GOFMT_FLAGS) `find . -name "*.gno"` diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 00000000000..9ed1832c786 --- /dev/null +++ b/examples/README.md @@ -0,0 +1,15 @@ +# Gnolang examples + +Folder contains Gnolang realms and libraries demos. +Share contracts here to improve engine testing, although it's not required. +Consider separate repository for contracts, but this may limit experience due to ongoing gnomod support work. +Main repository can't reference separate code, causing potential development issues. + +## Usage + +Our recommendation is to use the [gno](../gnolang/cmd/gno) utility to develop contracts locally before publishing them on-chain. +This approach offers a faster and streamlined workflow, along with additional debugging features. +Simply fork or create new contracts and refer to the Makefile. +Once everything looks good locally, you can then publish it on a localnet or testnet. + +See [`awesome-gno` tutorials](https://github.com/gnolang/awesome-gno#tutorials). diff --git a/gno.land/Makefile b/gno.land/Makefile new file mode 100644 index 00000000000..669a8dff064 --- /dev/null +++ b/gno.land/Makefile @@ -0,0 +1,49 @@ +.PHONY: help +help: + @echo "Available make commands:" + @cat Makefile | grep '^[a-z][^:]*:' | cut -d: -f1 | sort | sed 's/^/ /' + +rundep=go run -modfile ../misc/devdeps/go.mod + +.PHONY: build +build: build.gnoland build.gnokey build.gnoweb build.gnofaucet + +build.gnoland:; go build -o build/gnoland ./cmd/gnoland +build.gnoweb:; go build -o build/gnoweb ./cmd/gnoweb +build.gnofaucet:; go build -o build/gnofaucet ./cmd/gnofaucet +build.gnokey:; go build -o build/gnokey ./cmd/gnokey + +.PHONY: install +install: install.gnoland install.gnoweb install.gnofaucet install.gnokey + +install.gnoland:; go install ./cmd/gnoland +install.gnoweb:; go install ./cmd/gnoweb +install.gnofaucet:; go install ./cmd/gnofaucet +install.gnokey:; go install ./cmd/gnokey + +.PHONY: fclean +fclean: clean + rm -rf testdir + +.PHONY: clean +clean: + rm -rf build + +.PHONY: lint +lint: + golangci-lint run --config ../.github/golangci.yml ./... + +.PHONY: fmt +GOFMT_FLAGS ?= -w +fmt: + $(rundep) mvdan.cc/gofumpt $(GOFMT_FLAGS) . + +######################################## +# Test suite +.PHONY: test +test: _test.gnoland _test.gnoweb _test.gnokey _test.pkgs + +_test.gnoland:; go test -v ./cmd/gnoland +_test.gnoweb:; go test -v ./cmd/gnoweb +_test.gnokey:; go test -v ./cmd/gnokey +_test.pkgs:; go test -v ./pkg/... diff --git a/gno.land/README.md b/gno.land/README.md new file mode 100644 index 00000000000..0598aa98c52 --- /dev/null +++ b/gno.land/README.md @@ -0,0 +1,27 @@ +# Gno.land + +Gno.land is a layer-1 blockchain that integrates various cutting-edge technologies, including [Tendermint2](../tm2), [GnoVM](../gnovm), Proof-of-Contributions consensus mechanism, on-chain governance through a new DAO framework with support for sub-DAOs, and a unique licensing model that allows open-source code to be monetized by default. + +## Getting started + +Use [`gnokey`](./cmd/gnokey) to interact with Gno.land's testnets, localnet, and upcoming mainnet. + +For localnet setup, use [`gnoland`](./cmd/gnoland). + +To add a web interface and faucet to your localnet, use [`gnoweb`](./cmd/gnoweb) and [`gnofaucet`](./cmd/gnofaucet). + +## Interchain + +Gno.land aims to offer security, high-quality contract libraries, and scalability to other Gnolang chains, while also prioritizing interoperability with existing and emerging chains. + +Post mainnet launch, Gno.land aims to integrate IBCv1 to connect with existing Cosmos chains and implement ICS1 for security through the existing chains. +Afterwards, the platform plans to improve IBC by adding new capabilities for interchain smart-contracts. + +## Under the hood + +* [Tendermint2](../tm2): a secure and stable consensus engine +* [GnoVM](../gnovm): a Virtual-Machine that provides transparency and security +* Proof-of-Contributions: a new consensus mechanism secured by contributors +* On-chain governance: managed by a new DAO framework with support for sub-DAOs +* Licensing model: a unique approach that allows open-source code to be monetized by default +* Interoperability and shared security: IBCv1, IBCx, ICS1, ICSx diff --git a/cmd/gnofaucet/README.md b/gno.land/cmd/gnofaucet/README.md similarity index 88% rename from cmd/gnofaucet/README.md rename to gno.land/cmd/gnofaucet/README.md index ddee1db1bc4..162707ee6b7 100644 --- a/cmd/gnofaucet/README.md +++ b/gno.land/cmd/gnofaucet/README.md @@ -4,7 +4,7 @@ If you have imported the test1 key skip to Step2 - ./build/gnokey add --recover test1 + ./build/gnokey add --recover test1 At prompt, input and confirm your password to protect the imported private key. @@ -20,20 +20,19 @@ Make sure you have started gnoland ## Step3: - ./build/gnofaucet serve --chain-id dev test1 + ./build/gnofaucet serve --chain-id dev test1 By default, the faucet sends out 1,000,000ugnot (1gnot) per request. If this is your local faucet, you can be a bit generous to yourself with --send flag. With the following, the faucet will give you 500gnot per request. - ./build/gnofaucet serve --chain-id dev --send 5000000000ugnot test1 + ./build/gnofaucet serve --chain-id dev --send 5000000000ugnot test1 ## Step4: Make sure you have started website - ./build/website + ./build/gnoweb Request testing tokens from following URL, Have fun! http://localhost:8888/faucet - diff --git a/cmd/gnofaucet/main.go b/gno.land/cmd/gnofaucet/main.go similarity index 91% rename from cmd/gnofaucet/main.go rename to gno.land/cmd/gnofaucet/main.go index b4709391652..74e9c3ad4d9 100644 --- a/cmd/gnofaucet/main.go +++ b/gno.land/cmd/gnofaucet/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" ) func main() { diff --git a/cmd/gnofaucet/serve.go b/gno.land/cmd/gnofaucet/serve.go similarity index 95% rename from cmd/gnofaucet/serve.go rename to gno.land/cmd/gnofaucet/serve.go index 9f1ecd8dd42..3fe0966592c 100644 --- a/cmd/gnofaucet/serve.go +++ b/gno.land/cmd/gnofaucet/serve.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "github.com/gnolang/gno/gnoland" - "github.com/gnolang/gno/pkgs/amino" - rpcclient "github.com/gnolang/gno/pkgs/bft/rpc/client" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/crypto/keys/client" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/sdk/bank" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/gno.land/pkg/gnoland" + "github.com/gnolang/gno/tm2/pkg/amino" + rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/crypto/keys/client" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/sdk/bank" + "github.com/gnolang/gno/tm2/pkg/std" ) // url & struct for verify captcha diff --git a/cmd/gnofaucet/throttle.go b/gno.land/cmd/gnofaucet/throttle.go similarity index 96% rename from cmd/gnofaucet/throttle.go rename to gno.land/cmd/gnofaucet/throttle.go index 3d92787ca0f..36cfbdb9330 100644 --- a/cmd/gnofaucet/throttle.go +++ b/gno.land/cmd/gnofaucet/throttle.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/service" ) type SubnetThrottler struct { diff --git a/gno.land/cmd/gnokey/README.md b/gno.land/cmd/gnokey/README.md new file mode 100644 index 00000000000..9573ed4e9d9 --- /dev/null +++ b/gno.land/cmd/gnokey/README.md @@ -0,0 +1,11 @@ +# gnokey + +`gnokey` is a tool for managing https://gno.land accounts and interact with instances. + +## Install `gnokey` + + $> git clone git@github.com:gnolang/gno.git + $> cd ./gno + $> make install_gnokey + +Also, see the [quickstart guide](https://test2.gno.land/r/boards:testboard/5). diff --git a/cmd/gnokey/main.go b/gno.land/cmd/gnokey/main.go similarity index 81% rename from cmd/gnokey/main.go rename to gno.land/cmd/gnokey/main.go index 0d77f3f30fe..f678cd8e559 100644 --- a/cmd/gnokey/main.go +++ b/gno.land/cmd/gnokey/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/crypto/keys/client" + "github.com/gnolang/gno/tm2/pkg/crypto/keys/client" ) func main() { diff --git a/gno.land/cmd/gnoland/README.md b/gno.land/cmd/gnoland/README.md new file mode 100644 index 00000000000..fdf99bb5c72 --- /dev/null +++ b/gno.land/cmd/gnoland/README.md @@ -0,0 +1,9 @@ +# `gnoland` + +## Install `gnoland` + + $> git clone git@github.com:gnolang/gno.git + $> cd ./gno/gno.land + $> make install.gnoland + +Afterward, you can interact with [`gnokey`](../gnokey) or launch a [`gnoweb`](../gnoweb) interface. diff --git a/cmd/gnoland/main.go b/gno.land/cmd/gnoland/main.go similarity index 88% rename from cmd/gnoland/main.go rename to gno.land/cmd/gnoland/main.go index cd86e3ee642..9a2c11146e8 100644 --- a/cmd/gnoland/main.go +++ b/gno.land/cmd/gnoland/main.go @@ -9,20 +9,20 @@ import ( "strings" "time" - "github.com/gnolang/gno/gnoland" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/config" - "github.com/gnolang/gno/pkgs/bft/node" - "github.com/gnolang/gno/pkgs/bft/privval" - bft "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" - vmm "github.com/gnolang/gno/pkgs/sdk/vm" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/gno.land/pkg/gnoland" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/config" + "github.com/gnolang/gno/tm2/pkg/bft/node" + "github.com/gnolang/gno/tm2/pkg/bft/privval" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" + vmm "github.com/gnolang/gno/tm2/pkg/sdk/vm" + "github.com/gnolang/gno/tm2/pkg/std" ) type gnolandCfg struct { @@ -74,14 +74,14 @@ func (c *gnolandCfg) RegisterFlags(fs *flag.FlagSet) { fs.StringVar( &c.genesisBalancesFile, "genesis-balances-file", - "./gnoland/genesis/genesis_balances.txt", + "./genesis/genesis_balances.txt", "initial distribution file", ) fs.StringVar( &c.genesisTxsFile, "genesis-txs-file", - "./gnoland/genesis/genesis_txs.txt", + "./genesis/genesis_txs.txt", "initial txs to replay", ) @@ -229,7 +229,9 @@ func makeGenesisDoc( "r/demo/deep/very/deep", } { // open files in directory as MemPackage. - memPkg := gno.ReadMemPackage(filepath.Join(".", "examples", "gno.land", path), "gno.land/"+path) + fsPath := filepath.Join("..", "examples", "gno.land", path) + importPath := "gno.land/" + path + memPkg := gno.ReadMemPackage(fsPath, importPath) var tx std.Tx tx.Msgs = []std.Msg{ vmm.MsgAddPackage{ diff --git a/cmd/gnoland/main_test.go b/gno.land/cmd/gnoland/main_test.go similarity index 75% rename from cmd/gnoland/main_test.go rename to gno.land/cmd/gnoland/main_test.go index 19d170252fb..fa53dd3602e 100644 --- a/cmd/gnoland/main_test.go +++ b/gno.land/cmd/gnoland/main_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/require" ) @@ -16,8 +16,8 @@ func TestInitialize(t *testing.T) { cases := []struct { args []string }{ - // {[]string{"--skip-start", "--skip-failing-gensis-txs"}}, - {[]string{"--skip-start"}}, + {[]string{"--skip-start", "--skip-failing-genesis-txs"}}, + // {[]string{"--skip-start"}}, // FIXME: test seems flappy as soon as we have multiple cases. } os.Chdir(filepath.Join("..", "..")) // go to repo's root dir @@ -36,16 +36,14 @@ func TestInitialize(t *testing.T) { }, ) - err := cmd.ParseAndRun( - context.Background(), - []string{"--skip-failing-genesis-txs", "--skip-start"}, - ) + t.Logf(`Running "gnoland %s"`, strings.Join(tc.args, " ")) + err := cmd.ParseAndRun(context.Background(), tc.args) + require.NoError(t, err) stdouterr, bufErr := closer() require.NoError(t, bufErr) require.NoError(t, err) - _ = stdouterr require.Contains(t, stdouterr, "Node created.", "failed to create node") require.Contains(t, stdouterr, "'--skip-start' is set. Exiting.", "not exited with skip-start") require.NotContains(t, stdouterr, "panic:") diff --git a/gnoland/docs/security.md b/gno.land/cmd/gnoweb/CONTRIBUTING.md similarity index 100% rename from gnoland/docs/security.md rename to gno.land/cmd/gnoweb/CONTRIBUTING.md diff --git a/gno.land/cmd/gnoweb/README.md b/gno.land/cmd/gnoweb/README.md new file mode 100644 index 00000000000..941d5e4f67e --- /dev/null +++ b/gno.land/cmd/gnoweb/README.md @@ -0,0 +1,13 @@ +# gnoweb + +The gno.land web interface. + +Live demo: https://test3.gno.land/ + +## Install `gnoweb` + +Install and run a local [`gnoland`](../gnoland) instance first. + + $> git clone git@github.com:gnolang/gno.git + $> cd ./gno/gno.land + $> make install.gnoweb diff --git a/gnoland/website/main.go b/gno.land/cmd/gnoweb/main.go similarity index 92% rename from gnoland/website/main.go rename to gno.land/cmd/gnoweb/main.go index b549c18cf3b..295e4cdd2db 100644 --- a/gnoland/website/main.go +++ b/gno.land/cmd/gnoweb/main.go @@ -15,17 +15,17 @@ import ( "strings" "time" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/std" "github.com/gorilla/mux" "github.com/gotuna/gotuna" - "github.com/gnolang/gno/gnoland/website/static" // for static files - "github.com/gnolang/gno/pkgs/sdk/vm" // for error types - // "github.com/gnolang/gno/pkgs/sdk" // for baseapp (info, status) + "github.com/gnolang/gno/gno.land/cmd/gnoweb/static" // for static files + "github.com/gnolang/gno/tm2/pkg/sdk/vm" // for error types + // "github.com/gnolang/gno/tm2/pkg/sdk" // for baseapp (info, status) ) const ( @@ -33,15 +33,14 @@ const ( ) var flags struct { - bindAddr string - remoteAddr string - captchaSite string - faucetURL string - viewsDir string - pagesDir string - helpChainID string - helpRemote string - homeContentFile string + bindAddr string + remoteAddr string + captchaSite string + faucetURL string + viewsDir string + pagesDir string + helpChainID string + helpRemote string } var startedAt time.Time @@ -51,9 +50,8 @@ func init() { flag.StringVar(&flags.bindAddr, "bind", "127.0.0.1:8888", "server listening address") flag.StringVar(&flags.captchaSite, "captcha-site", "", "recaptcha site key (if empty, captcha are disabled)") flag.StringVar(&flags.faucetURL, "faucet-url", "http://localhost:5050", "faucet server URL") - flag.StringVar(&flags.viewsDir, "views-dir", "./gnoland/website/views", "views directory location") - flag.StringVar(&flags.pagesDir, "pages-dir", "./gnoland/website/pages", "pages directory location") - flag.StringVar(&flags.homeContentFile, "home-content", "./gnoland/website/HOME.md", "home content filepath") + flag.StringVar(&flags.viewsDir, "views-dir", "./cmd/gnoweb/views", "views directory location") + flag.StringVar(&flags.pagesDir, "pages-dir", "./cmd/gnoweb/pages", "pages directory location") flag.StringVar(&flags.helpChainID, "help-chainid", "dev", "help page's chainid") flag.StringVar(&flags.helpRemote, "help-remote", "127.0.0.1:26657", "help page's remote addr") startedAt = time.Now() diff --git a/gnoland/website/main_test.go b/gno.land/cmd/gnoweb/main_test.go similarity index 94% rename from gnoland/website/main_test.go rename to gno.land/cmd/gnoweb/main_test.go index 50bf4af1483..579e1bcd06b 100644 --- a/gnoland/website/main_test.go +++ b/gno.land/cmd/gnoweb/main_test.go @@ -34,13 +34,14 @@ func TestRoutes(t *testing.T) { {"/r/demo/deep/very/deep/render.gno", ok, "func Render("}, } if wd, err := os.Getwd(); err == nil { - if strings.HasSuffix(wd, "gnoland/website") { + if strings.HasSuffix(wd, "cmd/gnoweb") { os.Chdir("../..") } } else { panic("os.Getwd() -> err: " + err.Error()) } app := makeApp() + for _, r := range routes { t.Run(fmt.Sprintf("test route %s", r.route), func(t *testing.T) { request := httptest.NewRequest(http.MethodGet, r.route, nil) @@ -48,6 +49,7 @@ func TestRoutes(t *testing.T) { app.Router.ServeHTTP(response, request) assert.Equal(t, r.status, response.Code) assert.Equal(t, strings.Contains(response.Body.String(), r.substring), true) + println(response.Body.String()) }) } } diff --git a/gnoland/website/pages/ABOUT.md b/gno.land/cmd/gnoweb/pages/ABOUT.md similarity index 100% rename from gnoland/website/pages/ABOUT.md rename to gno.land/cmd/gnoweb/pages/ABOUT.md diff --git a/gnoland/website/pages/GOR.md b/gno.land/cmd/gnoweb/pages/GOR.md similarity index 100% rename from gnoland/website/pages/GOR.md rename to gno.land/cmd/gnoweb/pages/GOR.md diff --git a/gnoland/website/pages/HOME.md b/gno.land/cmd/gnoweb/pages/HOME.md similarity index 95% rename from gnoland/website/pages/HOME.md rename to gno.land/cmd/gnoweb/pages/HOME.md index 3230e924d12..0f3bfaec685 100644 --- a/gnoland/website/pages/HOME.md +++ b/gno.land/cmd/gnoweb/pages/HOME.md @@ -2,7 +2,7 @@ - [About Gno.land](/about) - [Blogs](/r/gnoland/blog) -- [Install `gnokey`](https://github.com/gnolang/gno/) +- [Install `gnokey`](https://github.com/gnolang/gno/tree/master/gno.land/cmd/gnokey) - [Acquire testnet tokens](/faucet) - [Game of Realms](/game-of-realms) - An open worldwide competition for developers to build the best Gnolang smart-contracts. diff --git a/gnoland/website/static/css/app.css b/gno.land/cmd/gnoweb/static/css/app.css similarity index 100% rename from gnoland/website/static/css/app.css rename to gno.land/cmd/gnoweb/static/css/app.css diff --git a/gnoland/website/static/css/normalize.css b/gno.land/cmd/gnoweb/static/css/normalize.css similarity index 100% rename from gnoland/website/static/css/normalize.css rename to gno.land/cmd/gnoweb/static/css/normalize.css diff --git a/gnoland/website/static/font/RobotoMono-Bold.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-Bold.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-Bold.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-Bold.woff diff --git a/gnoland/website/static/font/RobotoMono-BoldItalic.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-BoldItalic.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-BoldItalic.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-BoldItalic.woff diff --git a/gnoland/website/static/font/RobotoMono-Italic.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-Italic.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-Italic.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-Italic.woff diff --git a/gnoland/website/static/font/RobotoMono-Light.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-Light.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-Light.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-Light.woff diff --git a/gnoland/website/static/font/RobotoMono-LightItalic.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-LightItalic.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-LightItalic.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-LightItalic.woff diff --git a/gnoland/website/static/font/RobotoMono-Medium.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-Medium.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-Medium.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-Medium.woff diff --git a/gnoland/website/static/font/RobotoMono-MediumItalic.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-MediumItalic.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-MediumItalic.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-MediumItalic.woff diff --git a/gnoland/website/static/font/RobotoMono-Regular.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-Regular.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-Regular.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-Regular.woff diff --git a/gnoland/website/static/font/RobotoMono-Thin.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-Thin.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-Thin.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-Thin.woff diff --git a/gnoland/website/static/font/RobotoMono-ThinItalic.woff b/gno.land/cmd/gnoweb/static/font/RobotoMono-ThinItalic.woff similarity index 100% rename from gnoland/website/static/font/RobotoMono-ThinItalic.woff rename to gno.land/cmd/gnoweb/static/font/RobotoMono-ThinItalic.woff diff --git a/gnoland/website/static/font/font.css b/gno.land/cmd/gnoweb/static/font/font.css similarity index 100% rename from gnoland/website/static/font/font.css rename to gno.land/cmd/gnoweb/static/font/font.css diff --git a/gnoland/website/static/img/favicon.ico b/gno.land/cmd/gnoweb/static/img/favicon.ico similarity index 100% rename from gnoland/website/static/img/favicon.ico rename to gno.land/cmd/gnoweb/static/img/favicon.ico diff --git a/gnoland/website/static/img/github-mark-32px.png b/gno.land/cmd/gnoweb/static/img/github-mark-32px.png similarity index 100% rename from gnoland/website/static/img/github-mark-32px.png rename to gno.land/cmd/gnoweb/static/img/github-mark-32px.png diff --git a/gnoland/website/static/img/github-mark-64px.png b/gno.land/cmd/gnoweb/static/img/github-mark-64px.png similarity index 100% rename from gnoland/website/static/img/github-mark-64px.png rename to gno.land/cmd/gnoweb/static/img/github-mark-64px.png diff --git a/gnoland/website/static/img/list-alt.png b/gno.land/cmd/gnoweb/static/img/list-alt.png similarity index 100% rename from gnoland/website/static/img/list-alt.png rename to gno.land/cmd/gnoweb/static/img/list-alt.png diff --git a/gnoland/website/static/img/list.png b/gno.land/cmd/gnoweb/static/img/list.png similarity index 100% rename from gnoland/website/static/img/list.png rename to gno.land/cmd/gnoweb/static/img/list.png diff --git a/gnoland/website/static/img/logo-square.png b/gno.land/cmd/gnoweb/static/img/logo-square.png similarity index 100% rename from gnoland/website/static/img/logo-square.png rename to gno.land/cmd/gnoweb/static/img/logo-square.png diff --git a/gnoland/website/static/img/logo-square.svg b/gno.land/cmd/gnoweb/static/img/logo-square.svg similarity index 100% rename from gnoland/website/static/img/logo-square.svg rename to gno.land/cmd/gnoweb/static/img/logo-square.svg diff --git a/gnoland/website/static/img/logo-v1.png b/gno.land/cmd/gnoweb/static/img/logo-v1.png similarity index 100% rename from gnoland/website/static/img/logo-v1.png rename to gno.land/cmd/gnoweb/static/img/logo-v1.png diff --git a/gnoland/website/static/img/logo.png b/gno.land/cmd/gnoweb/static/img/logo.png similarity index 100% rename from gnoland/website/static/img/logo.png rename to gno.land/cmd/gnoweb/static/img/logo.png diff --git a/gnoland/website/static/img/logo.svg b/gno.land/cmd/gnoweb/static/img/logo.svg similarity index 100% rename from gnoland/website/static/img/logo.svg rename to gno.land/cmd/gnoweb/static/img/logo.svg diff --git a/gnoland/website/static/invites.txt b/gno.land/cmd/gnoweb/static/invites.txt similarity index 100% rename from gnoland/website/static/invites.txt rename to gno.land/cmd/gnoweb/static/invites.txt diff --git a/gnoland/website/static/js/highlight.min.js b/gno.land/cmd/gnoweb/static/js/highlight.min.js similarity index 100% rename from gnoland/website/static/js/highlight.min.js rename to gno.land/cmd/gnoweb/static/js/highlight.min.js diff --git a/gnoland/website/static/js/marked.min.js b/gno.land/cmd/gnoweb/static/js/marked.min.js similarity index 100% rename from gnoland/website/static/js/marked.min.js rename to gno.land/cmd/gnoweb/static/js/marked.min.js diff --git a/gnoland/website/static/js/purify.min.js b/gno.land/cmd/gnoweb/static/js/purify.min.js similarity index 100% rename from gnoland/website/static/js/purify.min.js rename to gno.land/cmd/gnoweb/static/js/purify.min.js diff --git a/gnoland/website/static/js/realm_help.js b/gno.land/cmd/gnoweb/static/js/realm_help.js similarity index 100% rename from gnoland/website/static/js/realm_help.js rename to gno.land/cmd/gnoweb/static/js/realm_help.js diff --git a/gnoland/website/static/js/renderer.js b/gno.land/cmd/gnoweb/static/js/renderer.js similarity index 100% rename from gnoland/website/static/js/renderer.js rename to gno.land/cmd/gnoweb/static/js/renderer.js diff --git a/gnoland/website/static/js/umbrella.js b/gno.land/cmd/gnoweb/static/js/umbrella.js similarity index 100% rename from gnoland/website/static/js/umbrella.js rename to gno.land/cmd/gnoweb/static/js/umbrella.js diff --git a/gnoland/website/static/js/umbrella.min.js b/gno.land/cmd/gnoweb/static/js/umbrella.min.js similarity index 100% rename from gnoland/website/static/js/umbrella.min.js rename to gno.land/cmd/gnoweb/static/js/umbrella.min.js diff --git a/gnoland/website/static/static.go b/gno.land/cmd/gnoweb/static/static.go similarity index 100% rename from gnoland/website/static/static.go rename to gno.land/cmd/gnoweb/static/static.go diff --git a/gnoland/website/views/404.html b/gno.land/cmd/gnoweb/views/404.html similarity index 100% rename from gnoland/website/views/404.html rename to gno.land/cmd/gnoweb/views/404.html diff --git a/gnoland/website/views/faucet.html b/gno.land/cmd/gnoweb/views/faucet.html similarity index 100% rename from gnoland/website/views/faucet.html rename to gno.land/cmd/gnoweb/views/faucet.html diff --git a/gnoland/website/views/funcs.html b/gno.land/cmd/gnoweb/views/funcs.html similarity index 100% rename from gnoland/website/views/funcs.html rename to gno.land/cmd/gnoweb/views/funcs.html diff --git a/gnoland/website/views/generic.html b/gno.land/cmd/gnoweb/views/generic.html similarity index 100% rename from gnoland/website/views/generic.html rename to gno.land/cmd/gnoweb/views/generic.html diff --git a/gnoland/website/views/home.html b/gno.land/cmd/gnoweb/views/home.html similarity index 100% rename from gnoland/website/views/home.html rename to gno.land/cmd/gnoweb/views/home.html diff --git a/gnoland/website/views/package_dir.html b/gno.land/cmd/gnoweb/views/package_dir.html similarity index 100% rename from gnoland/website/views/package_dir.html rename to gno.land/cmd/gnoweb/views/package_dir.html diff --git a/gnoland/website/views/package_file.html b/gno.land/cmd/gnoweb/views/package_file.html similarity index 100% rename from gnoland/website/views/package_file.html rename to gno.land/cmd/gnoweb/views/package_file.html diff --git a/gnoland/website/views/realm_help.html b/gno.land/cmd/gnoweb/views/realm_help.html similarity index 100% rename from gnoland/website/views/realm_help.html rename to gno.land/cmd/gnoweb/views/realm_help.html diff --git a/gnoland/website/views/realm_render.html b/gno.land/cmd/gnoweb/views/realm_render.html similarity index 100% rename from gnoland/website/views/realm_render.html rename to gno.land/cmd/gnoweb/views/realm_render.html diff --git a/gnoland/genesis/.gitignore b/gno.land/genesis/.gitignore similarity index 100% rename from gnoland/genesis/.gitignore rename to gno.land/genesis/.gitignore diff --git a/gno.land/genesis/README.md b/gno.land/genesis/README.md new file mode 100644 index 00000000000..55fdb3d0dfd --- /dev/null +++ b/gno.land/genesis/README.md @@ -0,0 +1,3 @@ +# Gno.land genesis + +**WIP: see https://github.com/gnolang/independence-day** diff --git a/gnoland/genesis/cleanup.sh b/gno.land/genesis/cleanup.sh similarity index 100% rename from gnoland/genesis/cleanup.sh rename to gno.land/genesis/cleanup.sh diff --git a/gnoland/genesis/genesis_balances.txt b/gno.land/genesis/genesis_balances.txt similarity index 100% rename from gnoland/genesis/genesis_balances.txt rename to gno.land/genesis/genesis_balances.txt diff --git a/gnoland/genesis/genesis_txs.txt b/gno.land/genesis/genesis_txs.txt similarity index 100% rename from gnoland/genesis/genesis_txs.txt rename to gno.land/genesis/genesis_txs.txt diff --git a/gnoland/app.go b/gno.land/pkg/gnoland/app.go similarity index 85% rename from gnoland/app.go rename to gno.land/pkg/gnoland/app.go index b57bfd3a36a..87114f33a88 100644 --- a/gnoland/app.go +++ b/gno.land/pkg/gnoland/app.go @@ -5,19 +5,19 @@ import ( "path/filepath" "strings" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/sdk/auth" - "github.com/gnolang/gno/pkgs/sdk/bank" - "github.com/gnolang/gno/pkgs/sdk/vm" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/iavl" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk/auth" + "github.com/gnolang/gno/tm2/pkg/sdk/bank" + "github.com/gnolang/gno/tm2/pkg/sdk/vm" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/iavl" ) // NewApp creates the GnoLand application. @@ -40,7 +40,8 @@ func NewApp(rootDir string, skipFailingGenesisTxs bool, logger log.Logger) (abci // Construct keepers. acctKpr := auth.NewAccountKeeper(mainKey, ProtoGnoAccount) bankKpr := bank.NewBankKeeper(acctKpr) - vmKpr := vm.NewVMKeeper(baseKey, mainKey, acctKpr, bankKpr, "./stdlibs") + stdlibsDir := filepath.Join("..", "gnovm", "stdlibs") + vmKpr := vm.NewVMKeeper(baseKey, mainKey, acctKpr, bankKpr, stdlibsDir) // Set InitChainer baseApp.SetInitChainer(InitChainer(baseApp, acctKpr, bankKpr, skipFailingGenesisTxs)) diff --git a/gnoland/package.go b/gno.land/pkg/gnoland/package.go similarity index 71% rename from gnoland/package.go rename to gno.land/pkg/gnoland/package.go index ba1d99825f6..fd1afbde136 100644 --- a/gnoland/package.go +++ b/gno.land/pkg/gnoland/package.go @@ -1,11 +1,11 @@ package gnoland import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/gnoland", + "github.com/gnolang/gno/gno.land/pkg/gnoland", "gno", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/gnoland/types.go b/gno.land/pkg/gnoland/types.go similarity index 86% rename from gnoland/types.go rename to gno.land/pkg/gnoland/types.go index e2a4ec7117d..1c762366ae9 100644 --- a/gnoland/types.go +++ b/gno.land/pkg/gnoland/types.go @@ -1,7 +1,7 @@ package gnoland import ( - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/std" ) type GnoAccount struct { diff --git a/gnoland/website/HOME.md b/gnoland/website/HOME.md deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/pkgs/LICENSE.md b/gnovm/LICENSE.md similarity index 100% rename from pkgs/LICENSE.md rename to gnovm/LICENSE.md diff --git a/gnovm/Makefile b/gnovm/Makefile new file mode 100644 index 00000000000..2dd88fc4d92 --- /dev/null +++ b/gnovm/Makefile @@ -0,0 +1,70 @@ +.PHONY: help +help: + @echo "Available make commands:" + @cat Makefile | grep '^[a-z][^:]*:' | cut -d: -f1 | sort | sed 's/^/ /' + +rundep=go run -modfile ../misc/devdeps/go.mod + +.PHONY: build +build: + go build -o build/gno ./cmd/gno + +.PHONY: install +install: + go install ./cmd/gno + +.PHONY: clean +clean: + rm -rf build + +######################################## +# Dev tools +.PHONY: lint +lint: + golangci-lint run --config ../.github/golangci.yml ./... + +.PHONY: fmt +GOFMT_FLAGS ?= -w +fmt: + $(rundep) mvdan.cc/gofumpt $(GOFMT_FLAGS) . + $(rundep) mvdan.cc/gofumpt $(GOFMT_FLAGS) `find stdlibs -name "*.gno"` + +######################################## +# Test suite +.PHONY: test +test: _test.cmd _test.pkg _test.gnolang + +.PHONY: _test.cmd +_test.cmd: + go test ./cmd/... -v -p 1 -timeout=30m + +.PHONY: _test.pkg +_test.pkg: + go test ./pkg/... -v -p 1 -timeout=30m + +.PHONY: _test.gnolang +_test.gnolang: _test.gnolang.native _test.gnolang.stdlibs _test.gnolang.realm _test.gnolang.pkg0 _test.gnolang.pkg1 _test.gnolang.pkg2 _test.gnolang.other +_test.gnolang.other:; go test tests/*.go -v -run "(TestFileStr|TestSelectors)" +_test.gnolang.realm:; go test tests/*.go -v -run "TestFiles/^zrealm" --timeout 30m +_test.gnolang.pkg0:; go test tests/*.go -v -run "TestPackages/(bufio|crypto|encoding|errors|internal|io|math|sort|std|stdshim|strconv|strings|testing|unicode)" --timeout 30m +_test.gnolang.pkg1:; go test tests/*.go -v -run "TestPackages/regexp" --timeout 30m +_test.gnolang.pkg2:; go test tests/*.go -v -run "TestPackages/bytes" --timeout 30m +_test.gnolang.native:; go test tests/*.go -v -test.short -run "TestFilesNative/" --timeout 30m +_test.gnolang.stdlibs:; go test tests/*.go -v -test.short -run 'TestFiles$$/' --timeout 30m +_test.gnolang.native.sync:; go test tests/*.go -v -test.short -run "TestFilesNative/" --timeout 30m --update-golden-tests +_test.gnolang.stdlibs.sync:; go test tests/*.go -v -test.short -run 'TestFiles$$/' --timeout 30m --update-golden-tests + +######################################## +# Code gen +stringer_cmd=$(rundep) golang.org/x/tools/cmd/stringer +.PHONY: _dev.stringer +_dev.stringer: + $(stringer_cmd) -type=Kind ./pkg/gnolang + $(stringer_cmd) -type=Op ./pkg/gnolang + $(stringer_cmd) -type=TransCtrl ./pkg/gnolang + $(stringer_cmd) -type=TransField ./pkg/gnolang + $(stringer_cmd) -type=VPType ./pkg/gnolang + $(stringer_cmd) -type=Word ./pkg/gnolang + +# genproto: +# see top-level Makefile. diff --git a/gnovm/README.md b/gnovm/README.md new file mode 100644 index 00000000000..91419746cfa --- /dev/null +++ b/gnovm/README.md @@ -0,0 +1,23 @@ +# GnoVM -- Gnolang Virtual Machine + +GnoVM is a virtual machine that interprets Gnolang, a custom version of Golang optimized for blockchains, featuring automatic state management, full determinism, and idiomatic Go. +It works with Tendermint2 and enables smarter, more modular, and transparent appchains with embedded smart-contracts. +It can be used in TendermintCore, forks, and non-Cosmos blockchains. + +Read the ["Intro to Gnoland"](https://test3.gno.land/r/gnoland/blog:p/intro) blogpost. + +This folder focuses on the VM, language, stdlibs, tests, and tools, independent of the blockchain. +This enables non-web3 developers to contribute without requiring an understanding of the broader context. + +## Language Features + +* Like interpreted Go, but more ambitious. +* Completely deterministic, for complete accountability. +* Transactional persistence across data realms. +* Designed for concurrent blockchain smart contracts systems. + +## Getting started + +Install [`gno`](./cmd/gno) and refer to the [`examples`](../examples) folder to start developing contracts. + +Check the [Makefile](./Makefile) to enhance GnoVM, Gnolang, and stdlibs. diff --git a/gnovm/cmd/gno/README.md b/gnovm/cmd/gno/README.md new file mode 100644 index 00000000000..97285684785 --- /dev/null +++ b/gnovm/cmd/gno/README.md @@ -0,0 +1,30 @@ +# gno + +`gno` (formerly `gnodev`) is a tool for managing Gno source code. + +## Usage + +`gno [arguments]` + +## Commands + +* `gno run` - run a Gno file +* `gno build` - build a gno package +* `gno precompile` - precompile .gno to .go +* `gno test` - test a gno package +* `gno mod` - manages dependencies +* `gno repl` start a GnoVM REPL + +## Install + + go install github.com/gnolang/gno/gnovm/cmd/gno + +Or + + > git clone git@github.com:gnolang/gno.git + > cd ./gno + > make install_gno + +## Getting started + +TODO diff --git a/cmd/gnodev/build.go b/gnovm/cmd/gno/build.go similarity index 94% rename from cmd/gnodev/build.go rename to gnovm/cmd/gno/build.go index ae0423ad4d5..b80711586e4 100644 --- a/cmd/gnodev/build.go +++ b/gnovm/cmd/gno/build.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/commands" - gno "github.com/gnolang/gno/pkgs/gnolang" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/tm2/pkg/commands" ) type buildCfg struct { diff --git a/cmd/gnodev/build_test.go b/gnovm/cmd/gno/build_test.go similarity index 100% rename from cmd/gnodev/build_test.go rename to gnovm/cmd/gno/build_test.go diff --git a/cmd/gnodev/main.go b/gnovm/cmd/gno/main.go similarity index 95% rename from cmd/gnodev/main.go rename to gnovm/cmd/gno/main.go index cbfc44cfa4d..8fa33a91d83 100644 --- a/cmd/gnodev/main.go +++ b/gnovm/cmd/gno/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" ) func main() { diff --git a/cmd/gnodev/main_test.go b/gnovm/cmd/gno/main_test.go similarity index 98% rename from cmd/gnodev/main_test.go rename to gnovm/cmd/gno/main_test.go index 14cdb174a16..2d87ebf143a 100644 --- a/cmd/gnodev/main_test.go +++ b/gnovm/cmd/gno/main_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" "github.com/stretchr/testify/require" ) diff --git a/cmd/gnodev/mod.go b/gnovm/cmd/gno/mod.go similarity index 94% rename from cmd/gnodev/mod.go rename to gnovm/cmd/gno/mod.go index 682442ef1fc..aada103104a 100644 --- a/cmd/gnodev/mod.go +++ b/gnovm/cmd/gno/mod.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/gnolang/gnomod" + "github.com/gnolang/gno/gnovm/pkg/gnomod" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/errors" ) type modDownloadCfg struct { diff --git a/cmd/gnodev/mod_test.go b/gnovm/cmd/gno/mod_test.go similarity index 100% rename from cmd/gnodev/mod_test.go rename to gnovm/cmd/gno/mod_test.go diff --git a/cmd/gnodev/precompile.go b/gnovm/cmd/gno/precompile.go similarity index 97% rename from cmd/gnodev/precompile.go rename to gnovm/cmd/gno/precompile.go index 12a4458c0eb..7e895109706 100644 --- a/cmd/gnodev/precompile.go +++ b/gnovm/cmd/gno/precompile.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/gnolang/gno/pkgs/commands" - gno "github.com/gnolang/gno/pkgs/gnolang" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/tm2/pkg/commands" ) type importPath string diff --git a/cmd/gnodev/precompile_test.go b/gnovm/cmd/gno/precompile_test.go similarity index 100% rename from cmd/gnodev/precompile_test.go rename to gnovm/cmd/gno/precompile_test.go diff --git a/cmd/gnodev/repl.go b/gnovm/cmd/gno/repl.go similarity index 94% rename from cmd/gnodev/repl.go rename to gnovm/cmd/gno/repl.go index 5d1b3eae35b..c0debc332f1 100644 --- a/cmd/gnodev/repl.go +++ b/gnovm/cmd/gno/repl.go @@ -8,11 +8,10 @@ import ( "io" "os" - "github.com/gnolang/gno/pkgs/commands" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/gnovm/tests" + "github.com/gnolang/gno/tm2/pkg/commands" "golang.org/x/term" - - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/tests" ) type replCfg struct { diff --git a/cmd/gnodev/repl_test.go b/gnovm/cmd/gno/repl_test.go similarity index 100% rename from cmd/gnodev/repl_test.go rename to gnovm/cmd/gno/repl_test.go diff --git a/cmd/gnodev/run.go b/gnovm/cmd/gno/run.go similarity index 91% rename from cmd/gnodev/run.go rename to gnovm/cmd/gno/run.go index d786eed0de0..f0c4a1fb290 100644 --- a/cmd/gnodev/run.go +++ b/gnovm/cmd/gno/run.go @@ -4,9 +4,9 @@ import ( "context" "flag" - "github.com/gnolang/gno/pkgs/commands" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/tests" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/gnovm/tests" + "github.com/gnolang/gno/tm2/pkg/commands" ) type runCfg struct { diff --git a/cmd/gnodev/run_test.go b/gnovm/cmd/gno/run_test.go similarity index 100% rename from cmd/gnodev/run_test.go rename to gnovm/cmd/gno/run_test.go diff --git a/cmd/gnodev/test.go b/gnovm/cmd/gno/test.go similarity index 97% rename from cmd/gnodev/test.go rename to gnovm/cmd/gno/test.go index f756c83adfe..d5da5c10347 100644 --- a/cmd/gnodev/test.go +++ b/gnovm/cmd/gno/test.go @@ -14,12 +14,12 @@ import ( "text/template" "time" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/errors" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/testutils" - "github.com/gnolang/gno/tests" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/gnovm/tests" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/testutils" "go.uber.org/multierr" ) diff --git a/cmd/gnodev/test_test.go b/gnovm/cmd/gno/test_test.go similarity index 78% rename from cmd/gnodev/test_test.go rename to gnovm/cmd/gno/test_test.go index 797ce23b6ae..7140eeeac00 100644 --- a/cmd/gnodev/test_test.go +++ b/gnovm/cmd/gno/test_test.go @@ -9,8 +9,8 @@ func TestTest(t *testing.T) { errShouldBe: "flag: help requested", }, { - args: []string{"test", "../../examples/gno.land/p/demo/rand"}, - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/rand \t", + args: []string{"test", "../../../examples/gno.land/p/demo/rand"}, + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/rand \t", }, { args: []string{"test", "../../tests/integ/no-such-dir"}, @@ -94,62 +94,62 @@ func TestTest(t *testing.T) { recoverShouldBe: "fail on ../../tests/integ/failing2/failing_filetest.gno: got unexpected error: beep boop", }, { - args: []string{"test", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", ".*", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--run", ".*", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", "NoExists", "../../examples/gno.land/p/demo/ufmt"}, - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + args: []string{"test", "--verbose", "--run", "NoExists", "../../../examples/gno.land/p/demo/ufmt"}, + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", ".*/hello", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--run", ".*/hello", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", ".*/hi", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--run", ".*/hi", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", ".*/NoExists", "../../examples/gno.land/p/demo/ufmt"}, - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + args: []string{"test", "--verbose", "--run", ".*/NoExists", "../../../examples/gno.land/p/demo/ufmt"}, + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", ".*/hello/NoExists", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--run", ".*/hello/NoExists", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", "Sprintf/", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--run", "Sprintf/", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", "Sprintf/.*", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--run", "Sprintf/.*", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--run", "Sprintf/hello", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--run", "Sprintf/hello", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, { - args: []string{"test", "--verbose", "--timeout", "1000000s", "../../examples/gno.land/p/demo/ufmt"}, + args: []string{"test", "--verbose", "--timeout", "1000000s", "../../../examples/gno.land/p/demo/ufmt"}, stdoutShouldContain: "RUN TestSprintf", - stderrShouldContain: "ok ./../../examples/gno.land/p/demo/ufmt", + stderrShouldContain: "ok ./../../../examples/gno.land/p/demo/ufmt", }, // TODO: when 'gnodev test' will by default imply running precompile, we should use the following tests. @@ -163,7 +163,7 @@ func TestTest(t *testing.T) { // {args: []string{"test", "../../tests/integ/failing1", "--verbose"}, errShouldBe: "FAIL: 0 build errors, 1 test errors", stderrShouldContain: "FAIL: TestAlwaysFailing"}, // {args: []string{"test", "../../tests/integ/failing2", "--verbose", "--no-precompile"}, recoverShouldBe: "fail on ../../tests/integ/failing2/failing_filetest.gno: got unexpected error: beep boop", stderrShouldContain: "== RUN file/failing_filetest.gno"}, // {args: []string{"test", "../../tests/integ/failing2", "--verbose"}, stderrShouldBe: "=== PREC ./../../tests/integ/failing2\n=== BUILD ./../../tests/integ/failing2\n=== RUN file/failing_filetest.gno\n", recoverShouldBe: "fail on ../../tests/integ/failing2/failing_filetest.gno: got unexpected error: beep boop"}, - // {args: []string{"test", "../../examples/gno.land/p/demo/ufmt", "--verbose", "--timeout", "10000" /* 10µs */}, recoverShouldContain: "test timed out after"}, // FIXME: should be testable + // {args: []string{"test", "../../../examples/gno.land/p/demo/ufmt", "--verbose", "--timeout", "10000" /* 10µs */}, recoverShouldContain: "test timed out after"}, // FIXME: should be testable } testMainCaseRun(t, tc) } diff --git a/cmd/gnodev/testutil.go b/gnovm/cmd/gno/testutil.go similarity index 100% rename from cmd/gnodev/testutil.go rename to gnovm/cmd/gno/testutil.go diff --git a/cmd/gnodev/util.go b/gnovm/cmd/gno/util.go similarity index 99% rename from cmd/gnodev/util.go rename to gnovm/cmd/gno/util.go index 7fb66bd6c3c..01ca51c27f1 100644 --- a/cmd/gnodev/util.go +++ b/gnovm/cmd/gno/util.go @@ -12,7 +12,7 @@ import ( "strings" "time" - gno "github.com/gnolang/gno/pkgs/gnolang" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" ) func isGnoFile(f fs.DirEntry) bool { diff --git a/cmd/gnodev/util_match.go b/gnovm/cmd/gno/util_match.go similarity index 100% rename from cmd/gnodev/util_match.go rename to gnovm/cmd/gno/util_match.go diff --git a/gno.proto b/gnovm/gno.proto similarity index 100% rename from gno.proto rename to gnovm/gno.proto diff --git a/pkgs/gnolang/README.md b/gnovm/pkg/gnolang/README.md similarity index 100% rename from pkgs/gnolang/README.md rename to gnovm/pkg/gnolang/README.md diff --git a/pkgs/gnolang/alloc.go b/gnovm/pkg/gnolang/alloc.go similarity index 100% rename from pkgs/gnolang/alloc.go rename to gnovm/pkg/gnolang/alloc.go diff --git a/pkgs/gnolang/alloc_test.go b/gnovm/pkg/gnolang/alloc_test.go similarity index 100% rename from pkgs/gnolang/alloc_test.go rename to gnovm/pkg/gnolang/alloc_test.go diff --git a/pkgs/gnolang/debug.go b/gnovm/pkg/gnolang/debug.go similarity index 100% rename from pkgs/gnolang/debug.go rename to gnovm/pkg/gnolang/debug.go diff --git a/pkgs/gnolang/doc.go b/gnovm/pkg/gnolang/doc.go similarity index 100% rename from pkgs/gnolang/doc.go rename to gnovm/pkg/gnolang/doc.go diff --git a/pkgs/gnolang/frame.go b/gnovm/pkg/gnolang/frame.go similarity index 100% rename from pkgs/gnolang/frame.go rename to gnovm/pkg/gnolang/frame.go diff --git a/pkgs/gnolang/gno_test.go b/gnovm/pkg/gnolang/gno_test.go similarity index 100% rename from pkgs/gnolang/gno_test.go rename to gnovm/pkg/gnolang/gno_test.go diff --git a/gnovm/pkg/gnolang/gnolang.proto b/gnovm/pkg/gnolang/gnolang.proto new file mode 100644 index 00000000000..30508bb41a6 --- /dev/null +++ b/gnovm/pkg/gnolang/gnolang.proto @@ -0,0 +1,603 @@ +syntax = "proto3"; +package gno; + +option go_package = "github.com/gnolang/gno/gnovm/pkg/gnolang/pb"; + +// imports +import "google/protobuf/any.proto"; + +// messages +message TypedValue { + google.protobuf.Any T = 1; + google.protobuf.Any V = 2; + bytes N = 3; +} + +message StringValue { + string Value = 1; +} + +message BigintValue { + string Value = 1; +} + +message BigdecValue { + string Value = 1; +} + +message PointerValue { + TypedValue TV = 1; + google.protobuf.Any Base = 2; + sint64 Index = 3; + TypedValue Key = 4; +} + +message ArrayValue { + ObjectInfo ObjectInfo = 1; + repeated TypedValue List = 2; + bytes Data = 3; +} + +message SliceValue { + google.protobuf.Any Base = 1; + sint64 Offset = 2; + sint64 Length = 3; + sint64 Maxcap = 4; +} + +message StructValue { + ObjectInfo ObjectInfo = 1; + repeated TypedValue Fields = 2; +} + +message FuncValue { + google.protobuf.Any Type = 1; + bool IsMethod = 2; + google.protobuf.Any Source = 3; + string Name = 4; + google.protobuf.Any Closure = 5; + string FileName = 6; + string PkgPath = 7; +} + +message MapValue { + ObjectInfo ObjectInfo = 1; + MapList List = 2; +} + +message MapList { + repeated MapListItem List = 1; +} + +message MapListItem { + TypedValue Key = 1; + TypedValue Value = 2; +} + +message BoundMethodValue { + ObjectInfo ObjectInfo = 1; + FuncValue Func = 2; + TypedValue Receiver = 3; +} + +message TypeValue { + google.protobuf.Any Type = 1; +} + +message PackageValue { + ObjectInfo ObjectInfo = 1; + google.protobuf.Any Block = 2; + string PkgName = 3; + string PkgPath = 4; + repeated string FNames = 5; + repeated google.protobuf.Any FBlocks = 6; +} + +message Block { + ObjectInfo ObjectInfo = 1; + google.protobuf.Any Source = 2; + repeated TypedValue Values = 3; + google.protobuf.Any Parent = 4; + TypedValue Blank = 5; +} + +message RefValue { + string ObjectID = 1; + bool Escaped = 2; + string PkgPath = 3; + string Hash = 4; +} + +message ObjectID { + string Value = 1; +} + +message ObjectInfo { + string ID = 1; + string Hash = 2; + string OwnerID = 3; + uint64 ModTime = 4; + sint64 RefCount = 5; + bool IsEscaped = 6; +} + +message ValueHash { + string Value = 1; +} + +message Hashlet { + bytes Value = 1; +} + +message ValuePath { + uint32 Type = 1; + uint32 Depth = 2; + uint32 Index = 3; + string Name = 4; +} + +message Location { + string PkgPath = 1; + string File = 2; + sint64 Line = 3; + sint64 Nonce = 4; +} + +message Attributes { + sint64 Line = 1; + string Label = 2; +} + +message NameExpr { + Attributes Attributes = 1; + ValuePath Path = 2; + string Name = 3; +} + +message BasicLitExpr { + Attributes Attributes = 1; + sint64 Kind = 2; + string Value = 3; +} + +message BinaryExpr { + Attributes Attributes = 1; + google.protobuf.Any Left = 2; + sint64 Op = 3; + google.protobuf.Any Right = 4; +} + +message CallExpr { + Attributes Attributes = 1; + google.protobuf.Any Func = 2; + repeated google.protobuf.Any Args = 3; + bool Varg = 4; + sint64 NumArgs = 5; +} + +message IndexExpr { + Attributes Attributes = 1; + google.protobuf.Any X = 2; + google.protobuf.Any Index = 3; + bool HasOK = 4; +} + +message SelectorExpr { + Attributes Attributes = 1; + google.protobuf.Any X = 2; + ValuePath Path = 3; + string Sel = 4; +} + +message SliceExpr { + Attributes Attributes = 1; + google.protobuf.Any X = 2; + google.protobuf.Any Low = 3; + google.protobuf.Any High = 4; + google.protobuf.Any Max = 5; +} + +message StarExpr { + Attributes Attributes = 1; + google.protobuf.Any X = 2; +} + +message RefExpr { + Attributes Attributes = 1; + google.protobuf.Any X = 2; +} + +message TypeAssertExpr { + Attributes Attributes = 1; + google.protobuf.Any X = 2; + google.protobuf.Any Type = 3; + bool HasOK = 4; +} + +message UnaryExpr { + Attributes Attributes = 1; + google.protobuf.Any X = 2; + sint64 Op = 3; +} + +message CompositeLitExpr { + Attributes Attributes = 1; + google.protobuf.Any Type = 2; + repeated KeyValueExpr Elts = 3; +} + +message KeyValueExpr { + Attributes Attributes = 1; + google.protobuf.Any Key = 2; + google.protobuf.Any Value = 3; +} + +message FuncLitExpr { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + FuncTypeExpr Type = 3; + repeated google.protobuf.Any Body = 4; +} + +message ConstExpr { + Attributes Attributes = 1; + google.protobuf.Any Source = 2; + TypedValue TypedValue = 3; +} + +message FieldTypeExpr { + Attributes Attributes = 1; + string Name = 2; + google.protobuf.Any Type = 3; + google.protobuf.Any Tag = 4; +} + +message ArrayTypeExpr { + Attributes Attributes = 1; + google.protobuf.Any Len = 2; + google.protobuf.Any Elt = 3; +} + +message SliceTypeExpr { + Attributes Attributes = 1; + google.protobuf.Any Elt = 2; + bool Vrd = 3; +} + +message InterfaceTypeExpr { + Attributes Attributes = 1; + repeated FieldTypeExpr Methods = 2; + string Generic = 3; +} + +message ChanTypeExpr { + Attributes Attributes = 1; + sint64 Dir = 2; + google.protobuf.Any Value = 3; +} + +message FuncTypeExpr { + Attributes Attributes = 1; + repeated FieldTypeExpr Params = 2; + repeated FieldTypeExpr Results = 3; +} + +message MapTypeExpr { + Attributes Attributes = 1; + google.protobuf.Any Key = 2; + google.protobuf.Any Value = 3; +} + +message StructTypeExpr { + Attributes Attributes = 1; + repeated FieldTypeExpr Fields = 2; +} + +message constTypeExpr { + Attributes Attributes = 1; + google.protobuf.Any Source = 2; + google.protobuf.Any Type = 3; +} + +message MaybeNativeTypeExpr { + Attributes Attributes = 1; + google.protobuf.Any Type = 2; +} + +message AssignStmt { + Attributes Attributes = 1; + repeated google.protobuf.Any Lhs = 2; + sint64 Op = 3; + repeated google.protobuf.Any Rhs = 4; +} + +message BlockStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + repeated google.protobuf.Any Body = 3; +} + +message BranchStmt { + Attributes Attributes = 1; + sint64 Op = 2; + string Label = 3; + uint32 Depth = 4; + sint64 BodyIndex = 5; +} + +message DeclStmt { + Attributes Attributes = 1; + repeated google.protobuf.Any Body = 2; +} + +message DeferStmt { + Attributes Attributes = 1; + CallExpr Call = 2; +} + +message ExprStmt { + Attributes Attributes = 1; + google.protobuf.Any X = 2; +} + +message ForStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + google.protobuf.Any Init = 3; + google.protobuf.Any Cond = 4; + google.protobuf.Any Post = 5; + repeated google.protobuf.Any Body = 6; +} + +message GoStmt { + Attributes Attributes = 1; + CallExpr Call = 2; +} + +message IfStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + google.protobuf.Any Init = 3; + google.protobuf.Any Cond = 4; + IfCaseStmt Then = 5; + IfCaseStmt Else = 6; +} + +message IfCaseStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + repeated google.protobuf.Any Body = 3; +} + +message IncDecStmt { + Attributes Attributes = 1; + google.protobuf.Any X = 2; + sint64 Op = 3; +} + +message RangeStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + google.protobuf.Any X = 3; + google.protobuf.Any Key = 4; + google.protobuf.Any Value = 5; + sint64 Op = 6; + repeated google.protobuf.Any Body = 7; + bool IsMap = 8; + bool IsString = 9; + bool IsArrayPtr = 10; +} + +message ReturnStmt { + Attributes Attributes = 1; + repeated google.protobuf.Any Results = 2; +} + +message PanicStmt { + Attributes Attributes = 1; + google.protobuf.Any Exception = 2; +} + +message SelectStmt { + Attributes Attributes = 1; + repeated SelectCaseStmt Cases = 2; +} + +message SelectCaseStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + google.protobuf.Any Comm = 3; + repeated google.protobuf.Any Body = 4; +} + +message SendStmt { + Attributes Attributes = 1; + google.protobuf.Any Chan = 2; + google.protobuf.Any Value = 3; +} + +message SwitchStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + google.protobuf.Any Init = 3; + google.protobuf.Any X = 4; + bool IsTypeSwitch = 5; + repeated SwitchClauseStmt Clauses = 6; + string VarName = 7; +} + +message SwitchClauseStmt { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + repeated google.protobuf.Any Cases = 3; + repeated google.protobuf.Any Body = 4; +} + +message EmptyStmt { + Attributes Attributes = 1; +} + +message bodyStmt { + Attributes Attributes = 1; + repeated google.protobuf.Any Body = 2; + sint64 BodyLen = 3; + sint64 NextBodyIndex = 4; + sint64 NumOps = 5; + sint64 NumValues = 6; + sint64 NumExprs = 7; + sint64 NumStmts = 8; + google.protobuf.Any Cond = 9; + google.protobuf.Any Post = 10; + google.protobuf.Any Active = 11; + google.protobuf.Any Key = 12; + google.protobuf.Any Value = 13; + sint64 Op = 14; + sint64 ListLen = 15; + sint64 ListIndex = 16; + MapListItem NextItem = 17; + sint64 StrLen = 18; + sint64 StrIndex = 19; + sint32 NextRune = 20; +} + +message FuncDecl { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + NameExpr NameExpr = 3; + bool IsMethod = 4; + FieldTypeExpr Recv = 5; + FuncTypeExpr Type = 6; + repeated google.protobuf.Any Body = 7; +} + +message ImportDecl { + Attributes Attributes = 1; + NameExpr NameExpr = 2; + string PkgPath = 3; +} + +message ValueDecl { + Attributes Attributes = 1; + repeated NameExpr NameExprs = 2; + google.protobuf.Any Type = 3; + repeated google.protobuf.Any Values = 4; + bool Const = 5; +} + +message TypeDecl { + Attributes Attributes = 1; + NameExpr NameExpr = 2; + google.protobuf.Any Type = 3; + bool IsAlias = 4; +} + +message StaticBlock { + Block Block = 1; + repeated google.protobuf.Any Types = 2; + uint32 NumNames = 3; + repeated string Names = 4; + repeated string Consts = 5; + repeated string Externs = 6; + Location Loc = 7; +} + +message FileSet { + repeated FileNode Files = 1; +} + +message FileNode { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + string Name = 3; + string PkgName = 4; + repeated google.protobuf.Any Decls = 5; +} + +message PackageNode { + Attributes Attributes = 1; + StaticBlock StaticBlock = 2; + string PkgPath = 3; + string PkgName = 4; + FileSet FileSet = 5; +} + +message RefNode { + Location Location = 1; + google.protobuf.Any BlockNode = 2; +} + +message PrimitiveType { + sint64 Value = 1; +} + +message PointerType { + google.protobuf.Any Elt = 1; +} + +message ArrayType { + sint64 Len = 1; + google.protobuf.Any Elt = 2; + bool Vrd = 3; +} + +message SliceType { + google.protobuf.Any Elt = 1; + bool Vrd = 2; +} + +message StructType { + string PkgPath = 1; + repeated FieldType Fields = 2; +} + +message FieldType { + string Name = 1; + google.protobuf.Any Type = 2; + bool Embedded = 3; + string Tag = 4; +} + +message FuncType { + repeated FieldType Params = 1; + repeated FieldType Results = 2; +} + +message MapType { + google.protobuf.Any Key = 1; + google.protobuf.Any Value = 2; +} + +message InterfaceType { + string PkgPath = 1; + repeated FieldType Methods = 2; + string Generic = 3; +} + +message TypeType { +} + +message DeclaredType { + string PkgPath = 1; + string Name = 2; + google.protobuf.Any Base = 3; + repeated TypedValue Methods = 4; +} + +message PackageType { +} + +message ChanType { + sint64 Dir = 1; + google.protobuf.Any Elt = 2; +} + +message blockType { +} + +message tupleType { + repeated google.protobuf.Any Elts = 1; +} + +message RefType { + string ID = 1; +} \ No newline at end of file diff --git a/pkgs/gnolang/go2gno.go b/gnovm/pkg/gnolang/go2gno.go similarity index 99% rename from pkgs/gnolang/go2gno.go rename to gnovm/pkg/gnolang/go2gno.go index 2ed44de7271..c3ab4e95b73 100644 --- a/pkgs/gnolang/go2gno.go +++ b/gnovm/pkg/gnolang/go2gno.go @@ -40,7 +40,7 @@ import ( "strconv" "github.com/davecgh/go-spew/spew" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) func MustReadFile(path string) *FileNode { diff --git a/pkgs/gnolang/go2gno_test.go b/gnovm/pkg/gnolang/go2gno_test.go similarity index 100% rename from pkgs/gnolang/go2gno_test.go rename to gnovm/pkg/gnolang/go2gno_test.go diff --git a/pkgs/gnolang/go_bench_test.go b/gnovm/pkg/gnolang/go_bench_test.go similarity index 100% rename from pkgs/gnolang/go_bench_test.go rename to gnovm/pkg/gnolang/go_bench_test.go diff --git a/pkgs/gnolang/gonative.go b/gnovm/pkg/gnolang/gonative.go similarity index 100% rename from pkgs/gnolang/gonative.go rename to gnovm/pkg/gnolang/gonative.go diff --git a/pkgs/gnolang/gonative_test.go b/gnovm/pkg/gnolang/gonative_test.go similarity index 97% rename from pkgs/gnolang/gonative_test.go rename to gnovm/pkg/gnolang/gonative_test.go index 507e907b47e..b9b659aae99 100644 --- a/pkgs/gnolang/gonative_test.go +++ b/gnovm/pkg/gnolang/gonative_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" "github.com/jaekwon/testify/assert" ) @@ -139,5 +139,5 @@ func TestCrypto(t *testing.T) { store := gonativeTestStore() tv := Go2GnoValue(nilAllocator, store, reflect.ValueOf(addr)) assert.Equal(t, tv.String(), - `(array[0x0000000000000000000000000000000000000000] github.com/gnolang/gno/pkgs/crypto.Address)`) + `(array[0x0000000000000000000000000000000000000000] github.com/gnolang/gno/tm2/pkg/crypto.Address)`) } diff --git a/pkgs/gnolang/hash_image.go b/gnovm/pkg/gnolang/hash_image.go similarity index 100% rename from pkgs/gnolang/hash_image.go rename to gnovm/pkg/gnolang/hash_image.go diff --git a/pkgs/gnolang/helpers.go b/gnovm/pkg/gnolang/helpers.go similarity index 100% rename from pkgs/gnolang/helpers.go rename to gnovm/pkg/gnolang/helpers.go diff --git a/pkgs/gnolang/kind_string.go b/gnovm/pkg/gnolang/kind_string.go similarity index 95% rename from pkgs/gnolang/kind_string.go rename to gnovm/pkg/gnolang/kind_string.go index e90ee94d7a2..cbe6bfa8e33 100644 --- a/pkgs/gnolang/kind_string.go +++ b/gnovm/pkg/gnolang/kind_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type=Kind ./pkgs/gnolang"; DO NOT EDIT. +// Code generated by "stringer -type=Kind ./pkg/gnolang"; DO NOT EDIT. package gnolang diff --git a/pkgs/gnolang/machine.go b/gnovm/pkg/gnolang/machine.go similarity index 99% rename from pkgs/gnolang/machine.go rename to gnovm/pkg/gnolang/machine.go index 5030f6daa78..e83374251cb 100644 --- a/pkgs/gnolang/machine.go +++ b/gnovm/pkg/gnolang/machine.go @@ -11,8 +11,8 @@ import ( "sync" "testing" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/std" ) //---------------------------------------- diff --git a/pkgs/gnolang/misc.go b/gnovm/pkg/gnolang/misc.go similarity index 98% rename from pkgs/gnolang/misc.go rename to gnovm/pkg/gnolang/misc.go index 46f866a57e1..a05de8c74aa 100644 --- a/pkgs/gnolang/misc.go +++ b/gnovm/pkg/gnolang/misc.go @@ -6,7 +6,7 @@ import ( "unicode" "unsafe" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) //---------------------------------------- diff --git a/pkgs/gnolang/nodes.go b/gnovm/pkg/gnolang/nodes.go similarity index 99% rename from pkgs/gnolang/nodes.go rename to gnovm/pkg/gnolang/nodes.go index 38b887ad6d6..d8aa1b66477 100644 --- a/pkgs/gnolang/nodes.go +++ b/gnovm/pkg/gnolang/nodes.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/std" ) // ---------------------------------------- diff --git a/pkgs/gnolang/nodes_copy.go b/gnovm/pkg/gnolang/nodes_copy.go similarity index 100% rename from pkgs/gnolang/nodes_copy.go rename to gnovm/pkg/gnolang/nodes_copy.go diff --git a/pkgs/gnolang/nodes_string.go b/gnovm/pkg/gnolang/nodes_string.go similarity index 100% rename from pkgs/gnolang/nodes_string.go rename to gnovm/pkg/gnolang/nodes_string.go diff --git a/pkgs/gnolang/op_assign.go b/gnovm/pkg/gnolang/op_assign.go similarity index 100% rename from pkgs/gnolang/op_assign.go rename to gnovm/pkg/gnolang/op_assign.go diff --git a/pkgs/gnolang/op_binary.go b/gnovm/pkg/gnolang/op_binary.go similarity index 100% rename from pkgs/gnolang/op_binary.go rename to gnovm/pkg/gnolang/op_binary.go diff --git a/pkgs/gnolang/op_call.go b/gnovm/pkg/gnolang/op_call.go similarity index 100% rename from pkgs/gnolang/op_call.go rename to gnovm/pkg/gnolang/op_call.go diff --git a/pkgs/gnolang/op_decl.go b/gnovm/pkg/gnolang/op_decl.go similarity index 100% rename from pkgs/gnolang/op_decl.go rename to gnovm/pkg/gnolang/op_decl.go diff --git a/pkgs/gnolang/op_eval.go b/gnovm/pkg/gnolang/op_eval.go similarity index 100% rename from pkgs/gnolang/op_eval.go rename to gnovm/pkg/gnolang/op_eval.go diff --git a/pkgs/gnolang/op_exec.go b/gnovm/pkg/gnolang/op_exec.go similarity index 100% rename from pkgs/gnolang/op_exec.go rename to gnovm/pkg/gnolang/op_exec.go diff --git a/pkgs/gnolang/op_expressions.go b/gnovm/pkg/gnolang/op_expressions.go similarity index 100% rename from pkgs/gnolang/op_expressions.go rename to gnovm/pkg/gnolang/op_expressions.go diff --git a/pkgs/gnolang/op_inc_dec.go b/gnovm/pkg/gnolang/op_inc_dec.go similarity index 100% rename from pkgs/gnolang/op_inc_dec.go rename to gnovm/pkg/gnolang/op_inc_dec.go diff --git a/pkgs/gnolang/op_string.go b/gnovm/pkg/gnolang/op_string.go similarity index 98% rename from pkgs/gnolang/op_string.go rename to gnovm/pkg/gnolang/op_string.go index d7dfff55650..db52b4ff67b 100644 --- a/pkgs/gnolang/op_string.go +++ b/gnovm/pkg/gnolang/op_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type=Op ./pkgs/gnolang"; DO NOT EDIT. +// Code generated by "stringer -type=Op ./pkg/gnolang"; DO NOT EDIT. package gnolang diff --git a/pkgs/gnolang/op_types.go b/gnovm/pkg/gnolang/op_types.go similarity index 100% rename from pkgs/gnolang/op_types.go rename to gnovm/pkg/gnolang/op_types.go diff --git a/pkgs/gnolang/op_unary.go b/gnovm/pkg/gnolang/op_unary.go similarity index 100% rename from pkgs/gnolang/op_unary.go rename to gnovm/pkg/gnolang/op_unary.go diff --git a/pkgs/gnolang/ownership.go b/gnovm/pkg/gnolang/ownership.go similarity index 99% rename from pkgs/gnolang/ownership.go rename to gnovm/pkg/gnolang/ownership.go index 9bd041850e8..b66f8a31bee 100644 --- a/pkgs/gnolang/ownership.go +++ b/gnovm/pkg/gnolang/ownership.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) /* diff --git a/pkgs/gnolang/package.go b/gnovm/pkg/gnolang/package.go similarity index 95% rename from pkgs/gnolang/package.go rename to gnovm/pkg/gnolang/package.go index d8e3f896bbc..4d4cb5aaf45 100644 --- a/pkgs/gnolang/package.go +++ b/gnovm/pkg/gnolang/package.go @@ -1,11 +1,11 @@ package gnolang import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/gnolang", + "github.com/gnolang/gno/gnovm/pkg/gnolang", "gno", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/gnolang/precompile.go b/gnovm/pkg/gnolang/precompile.go similarity index 98% rename from pkgs/gnolang/precompile.go rename to gnovm/pkg/gnolang/precompile.go index 705caa11534..3295f88bb81 100644 --- a/pkgs/gnolang/precompile.go +++ b/gnovm/pkg/gnolang/precompile.go @@ -14,7 +14,7 @@ import ( "sort" "strings" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/std" "go.uber.org/multierr" "golang.org/x/tools/go/ast/astutil" ) @@ -25,7 +25,7 @@ const ( GnoPackagePrefixBefore = "gno.land/p/demo/" GnoPackagePrefixAfter = "github.com/gnolang/gno/examples/gno.land/p/demo/" GnoStdPkgBefore = "std" - GnoStdPkgAfter = "github.com/gnolang/gno/stdlibs/stdshim" + GnoStdPkgAfter = "github.com/gnolang/gno/gnovm/stdlibs/stdshim" ) var stdlibWhitelist = []string{ diff --git a/pkgs/gnolang/precompile_test.go b/gnovm/pkg/gnolang/precompile_test.go similarity index 94% rename from pkgs/gnolang/precompile_test.go rename to gnovm/pkg/gnolang/precompile_test.go index 4f6e3f78155..3d50353505f 100644 --- a/pkgs/gnolang/precompile_test.go +++ b/gnovm/pkg/gnolang/precompile_test.go @@ -25,7 +25,7 @@ func TestPrecompile(t *testing.T) { }, { name: "use-std", source: "package foo\nimport \"std\"\nfunc hello() string { _ = std.Foo\nreturn \"world\"}", - expectedOutput: "package foo\nimport \"github.com/gnolang/gno/stdlibs/stdshim\"\nfunc hello() string { _ = std.Foo\nreturn \"world\"}", + expectedOutput: "package foo\nimport \"github.com/gnolang/gno/gnovm/stdlibs/stdshim\"\nfunc hello() string { _ = std.Foo\nreturn \"world\"}", }, { name: "use-realm", source: "package foo\nimport \"gno.land/r/users\"\nfunc foo() { _ = users.Register}", @@ -37,7 +37,7 @@ func TestPrecompile(t *testing.T) { }, { name: "use-named-std", source: "package foo\nimport bar \"std\"\nfunc hello() string { _ = bar.Foo\nreturn \"world\"}", - expectedOutput: "package foo\nimport bar \"github.com/gnolang/gno/stdlibs/stdshim\"\nfunc hello() string { _ = bar.Foo\nreturn \"world\"}", + expectedOutput: "package foo\nimport bar \"github.com/gnolang/gno/gnovm/stdlibs/stdshim\"\nfunc hello() string { _ = bar.Foo\nreturn \"world\"}", }, { name: "blacklisted-package", source: "package foo\nimport \"reflect\"\nfunc foo() { _ = reflect.ValueOf}", diff --git a/pkgs/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go similarity index 99% rename from pkgs/gnolang/preprocess.go rename to gnovm/pkg/gnolang/preprocess.go index 61f432ef2a2..1700477d00b 100644 --- a/pkgs/gnolang/preprocess.go +++ b/gnovm/pkg/gnolang/preprocess.go @@ -5,7 +5,7 @@ import ( "math/big" "reflect" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // In the case of a *FileSet, some declaration steps have to happen diff --git a/pkgs/gnolang/realm.go b/gnovm/pkg/gnolang/realm.go similarity index 100% rename from pkgs/gnolang/realm.go rename to gnovm/pkg/gnolang/realm.go diff --git a/pkgs/gnolang/scanner.go b/gnovm/pkg/gnolang/scanner.go similarity index 100% rename from pkgs/gnolang/scanner.go rename to gnovm/pkg/gnolang/scanner.go diff --git a/pkgs/gnolang/store.go b/gnovm/pkg/gnolang/store.go similarity index 99% rename from pkgs/gnolang/store.go rename to gnovm/pkg/gnolang/store.go index 90185ee7124..d3628edf216 100644 --- a/pkgs/gnolang/store.go +++ b/gnovm/pkg/gnolang/store.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" ) const iavlCacheSize = 1024 * 1024 // TODO increase and parameterize. diff --git a/pkgs/gnolang/transcribe.go b/gnovm/pkg/gnolang/transcribe.go similarity index 100% rename from pkgs/gnolang/transcribe.go rename to gnovm/pkg/gnolang/transcribe.go diff --git a/pkgs/gnolang/transctrl_string.go b/gnovm/pkg/gnolang/transctrl_string.go similarity index 89% rename from pkgs/gnolang/transctrl_string.go rename to gnovm/pkg/gnolang/transctrl_string.go index 9299725d57c..92d33c65da5 100644 --- a/pkgs/gnolang/transctrl_string.go +++ b/gnovm/pkg/gnolang/transctrl_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type=TransCtrl ./pkgs/gnolang"; DO NOT EDIT. +// Code generated by "stringer -type=TransCtrl ./pkg/gnolang"; DO NOT EDIT. package gnolang diff --git a/pkgs/gnolang/transfield_string.go b/gnovm/pkg/gnolang/transfield_string.go similarity index 98% rename from pkgs/gnolang/transfield_string.go rename to gnovm/pkg/gnolang/transfield_string.go index d414af7e06f..587ca7a7654 100644 --- a/pkgs/gnolang/transfield_string.go +++ b/gnovm/pkg/gnolang/transfield_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type=TransField ./pkgs/gnolang"; DO NOT EDIT. +// Code generated by "stringer -type=TransField ./pkg/gnolang"; DO NOT EDIT. package gnolang diff --git a/pkgs/gnolang/types.go b/gnovm/pkg/gnolang/types.go similarity index 100% rename from pkgs/gnolang/types.go rename to gnovm/pkg/gnolang/types.go diff --git a/pkgs/gnolang/uverse.go b/gnovm/pkg/gnolang/uverse.go similarity index 100% rename from pkgs/gnolang/uverse.go rename to gnovm/pkg/gnolang/uverse.go diff --git a/pkgs/gnolang/values.go b/gnovm/pkg/gnolang/values.go similarity index 99% rename from pkgs/gnolang/values.go rename to gnovm/pkg/gnolang/values.go index 227d5368eeb..495fcf74cb7 100644 --- a/pkgs/gnolang/values.go +++ b/gnovm/pkg/gnolang/values.go @@ -11,7 +11,7 @@ import ( "unsafe" "github.com/cockroachdb/apd" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // ---------------------------------------- diff --git a/pkgs/gnolang/values_conversions.go b/gnovm/pkg/gnolang/values_conversions.go similarity index 100% rename from pkgs/gnolang/values_conversions.go rename to gnovm/pkg/gnolang/values_conversions.go diff --git a/pkgs/gnolang/values_string.go b/gnovm/pkg/gnolang/values_string.go similarity index 100% rename from pkgs/gnolang/values_string.go rename to gnovm/pkg/gnolang/values_string.go diff --git a/pkgs/gnolang/vptype_string.go b/gnovm/pkg/gnolang/vptype_string.go similarity index 93% rename from pkgs/gnolang/vptype_string.go rename to gnovm/pkg/gnolang/vptype_string.go index 5c4f977e032..62a51c3b256 100644 --- a/pkgs/gnolang/vptype_string.go +++ b/gnovm/pkg/gnolang/vptype_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type=VPType ./pkgs/gnolang"; DO NOT EDIT. +// Code generated by "stringer -type=VPType ./pkg/gnolang"; DO NOT EDIT. package gnolang diff --git a/pkgs/gnolang/word_string.go b/gnovm/pkg/gnolang/word_string.go similarity index 96% rename from pkgs/gnolang/word_string.go rename to gnovm/pkg/gnolang/word_string.go index c48f206cecb..da5fc3d7412 100644 --- a/pkgs/gnolang/word_string.go +++ b/gnovm/pkg/gnolang/word_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type=Word ./pkgs/gnolang"; DO NOT EDIT. +// Code generated by "stringer -type=Word ./pkg/gnolang"; DO NOT EDIT. package gnolang diff --git a/pkgs/gnolang/gnomod/fetch.go b/gnovm/pkg/gnomod/fetch.go similarity index 83% rename from pkgs/gnolang/gnomod/fetch.go rename to gnovm/pkg/gnomod/fetch.go index 75586fd73bf..6c2b1a63121 100644 --- a/pkgs/gnolang/gnomod/fetch.go +++ b/gnovm/pkg/gnomod/fetch.go @@ -3,8 +3,8 @@ package gnomod import ( "fmt" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/rpc/client" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" ) func queryChain(remote string, qpath string, data []byte) (res *abci.ResponseQuery, err error) { diff --git a/pkgs/gnolang/gnomod/file.go b/gnovm/pkg/gnomod/file.go similarity index 98% rename from pkgs/gnolang/gnomod/file.go rename to gnovm/pkg/gnomod/file.go index 9b97bd2e587..a86e94dc6eb 100644 --- a/pkgs/gnolang/gnomod/file.go +++ b/gnovm/pkg/gnomod/file.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/gnolang/gno/pkgs/gnolang" + "github.com/gnolang/gno/gnovm/pkg/gnolang" "golang.org/x/mod/modfile" "golang.org/x/mod/module" ) diff --git a/pkgs/gnolang/gnomod/file_test.go b/gnovm/pkg/gnomod/file_test.go similarity index 98% rename from pkgs/gnolang/gnomod/file_test.go rename to gnovm/pkg/gnomod/file_test.go index 2729dba5a4c..6e025d08e3b 100644 --- a/pkgs/gnolang/gnomod/file_test.go +++ b/gnovm/pkg/gnomod/file_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/mod/modfile" diff --git a/pkgs/gnolang/gnomod/gnomod.go b/gnovm/pkg/gnomod/gnomod.go similarity index 93% rename from pkgs/gnolang/gnomod/gnomod.go rename to gnovm/pkg/gnomod/gnomod.go index c0fcfb961fa..617cfb182da 100644 --- a/pkgs/gnolang/gnomod/gnomod.go +++ b/gnovm/pkg/gnomod/gnomod.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "github.com/gnolang/gno/pkgs/crypto/keys/client" - "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/tm2/pkg/crypto/keys/client" + "github.com/gnolang/gno/tm2/pkg/std" "golang.org/x/mod/modfile" "golang.org/x/mod/module" ) @@ -110,11 +110,11 @@ func GnoToGoMod(f File) (*File, error) { // // ``` // require ( - // gno.land/p/demo/avl v1.2.3 + // gno.land/p/demo/avl v1.2.3 // ) // // replace ( - // gno.land/p/demo/avl v1.2.3 => gno.land/p/demo/avl v3.2.1 + // gno.land/p/demo/avl v1.2.3 => gno.land/p/demo/avl v3.2.1 // ) // ``` // @@ -124,7 +124,7 @@ func GnoToGoMod(f File) (*File, error) { // ``` // replace ( // gno.land/p/demo/avl v1.2.3 => gno.land/p/demo/avl v3.2.1 - // gno.land/p/demo/avl v3.2.1 => /path/to/avl/version/v3.2.1 + // gno.land/p/demo/avl v3.2.1 => /path/to/avl/version/v3.2.1 // ) // ``` // diff --git a/pkgs/gnolang/gnomod/parse.go b/gnovm/pkg/gnomod/parse.go similarity index 100% rename from pkgs/gnolang/gnomod/parse.go rename to gnovm/pkg/gnomod/parse.go diff --git a/pkgs/gnolang/gnomod/preprocess.go b/gnovm/pkg/gnomod/preprocess.go similarity index 100% rename from pkgs/gnolang/gnomod/preprocess.go rename to gnovm/pkg/gnomod/preprocess.go diff --git a/pkgs/gnolang/gnomod/preprocess_test.go b/gnovm/pkg/gnomod/preprocess_test.go similarity index 100% rename from pkgs/gnolang/gnomod/preprocess_test.go rename to gnovm/pkg/gnomod/preprocess_test.go diff --git a/pkgs/gnolang/gnomod/read.go b/gnovm/pkg/gnomod/read.go similarity index 100% rename from pkgs/gnolang/gnomod/read.go rename to gnovm/pkg/gnomod/read.go diff --git a/stdlibs/README.md b/gnovm/stdlibs/README.md similarity index 100% rename from stdlibs/README.md rename to gnovm/stdlibs/README.md diff --git a/stdlibs/banker.go b/gnovm/stdlibs/banker.go similarity index 98% rename from stdlibs/banker.go rename to gnovm/stdlibs/banker.go index db450f8adbc..82bf1bad42a 100644 --- a/stdlibs/banker.go +++ b/gnovm/stdlibs/banker.go @@ -3,8 +3,8 @@ package stdlibs import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/std" ) // This has the same interface as stdlibs/std.Banker. diff --git a/stdlibs/bufio/bufio.gno b/gnovm/stdlibs/bufio/bufio.gno similarity index 100% rename from stdlibs/bufio/bufio.gno rename to gnovm/stdlibs/bufio/bufio.gno diff --git a/stdlibs/bufio/example_test.gno b/gnovm/stdlibs/bufio/example_test.gno similarity index 100% rename from stdlibs/bufio/example_test.gno rename to gnovm/stdlibs/bufio/example_test.gno diff --git a/stdlibs/bufio/export_test.gno b/gnovm/stdlibs/bufio/export_test.gno similarity index 100% rename from stdlibs/bufio/export_test.gno rename to gnovm/stdlibs/bufio/export_test.gno diff --git a/stdlibs/bufio/scan.gno b/gnovm/stdlibs/bufio/scan.gno similarity index 100% rename from stdlibs/bufio/scan.gno rename to gnovm/stdlibs/bufio/scan.gno diff --git a/stdlibs/bufio/scan_test.gno b/gnovm/stdlibs/bufio/scan_test.gno similarity index 100% rename from stdlibs/bufio/scan_test.gno rename to gnovm/stdlibs/bufio/scan_test.gno diff --git a/stdlibs/bytes/boundary_test.gno b/gnovm/stdlibs/bytes/boundary_test.gno similarity index 100% rename from stdlibs/bytes/boundary_test.gno rename to gnovm/stdlibs/bytes/boundary_test.gno diff --git a/stdlibs/bytes/buffer.gno b/gnovm/stdlibs/bytes/buffer.gno similarity index 100% rename from stdlibs/bytes/buffer.gno rename to gnovm/stdlibs/bytes/buffer.gno diff --git a/stdlibs/bytes/buffer_test.gno b/gnovm/stdlibs/bytes/buffer_test.gno similarity index 100% rename from stdlibs/bytes/buffer_test.gno rename to gnovm/stdlibs/bytes/buffer_test.gno diff --git a/stdlibs/bytes/bytes.gno b/gnovm/stdlibs/bytes/bytes.gno similarity index 100% rename from stdlibs/bytes/bytes.gno rename to gnovm/stdlibs/bytes/bytes.gno diff --git a/stdlibs/bytes/bytes_test.gno b/gnovm/stdlibs/bytes/bytes_test.gno similarity index 100% rename from stdlibs/bytes/bytes_test.gno rename to gnovm/stdlibs/bytes/bytes_test.gno diff --git a/stdlibs/bytes/compare_test.gno b/gnovm/stdlibs/bytes/compare_test.gno similarity index 100% rename from stdlibs/bytes/compare_test.gno rename to gnovm/stdlibs/bytes/compare_test.gno diff --git a/stdlibs/bytes/example_test.gno b/gnovm/stdlibs/bytes/example_test.gno similarity index 100% rename from stdlibs/bytes/example_test.gno rename to gnovm/stdlibs/bytes/example_test.gno diff --git a/stdlibs/bytes/export_test.gno b/gnovm/stdlibs/bytes/export_test.gno similarity index 100% rename from stdlibs/bytes/export_test.gno rename to gnovm/stdlibs/bytes/export_test.gno diff --git a/stdlibs/bytes/reader.gno b/gnovm/stdlibs/bytes/reader.gno similarity index 100% rename from stdlibs/bytes/reader.gno rename to gnovm/stdlibs/bytes/reader.gno diff --git a/stdlibs/bytes/reader_test.gno b/gnovm/stdlibs/bytes/reader_test.gno similarity index 100% rename from stdlibs/bytes/reader_test.gno rename to gnovm/stdlibs/bytes/reader_test.gno diff --git a/stdlibs/context.go b/gnovm/stdlibs/context.go similarity index 76% rename from stdlibs/context.go rename to gnovm/stdlibs/context.go index 91f995613c8..5f140c344d4 100644 --- a/stdlibs/context.go +++ b/gnovm/stdlibs/context.go @@ -1,9 +1,9 @@ package stdlibs import ( - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" ) type ExecContext struct { diff --git a/stdlibs/crypto/chacha20/chacha/README.md b/gnovm/stdlibs/crypto/chacha20/chacha/README.md similarity index 100% rename from stdlibs/crypto/chacha20/chacha/README.md rename to gnovm/stdlibs/crypto/chacha20/chacha/README.md diff --git a/stdlibs/crypto/chacha20/chacha/chacha.gno b/gnovm/stdlibs/crypto/chacha20/chacha/chacha.gno similarity index 100% rename from stdlibs/crypto/chacha20/chacha/chacha.gno rename to gnovm/stdlibs/crypto/chacha20/chacha/chacha.gno diff --git a/stdlibs/crypto/chacha20/chacha/chacha_generic.gno b/gnovm/stdlibs/crypto/chacha20/chacha/chacha_generic.gno similarity index 100% rename from stdlibs/crypto/chacha20/chacha/chacha_generic.gno rename to gnovm/stdlibs/crypto/chacha20/chacha/chacha_generic.gno diff --git a/stdlibs/crypto/chacha20/chacha/chacha_ref.gno b/gnovm/stdlibs/crypto/chacha20/chacha/chacha_ref.gno similarity index 100% rename from stdlibs/crypto/chacha20/chacha/chacha_ref.gno rename to gnovm/stdlibs/crypto/chacha20/chacha/chacha_ref.gno diff --git a/stdlibs/crypto/chacha20/chacha/chacha_test.gno b/gnovm/stdlibs/crypto/chacha20/chacha/chacha_test.gno similarity index 100% rename from stdlibs/crypto/chacha20/chacha/chacha_test.gno rename to gnovm/stdlibs/crypto/chacha20/chacha/chacha_test.gno diff --git a/stdlibs/crypto/chacha20/chacha20.gno b/gnovm/stdlibs/crypto/chacha20/chacha20.gno similarity index 100% rename from stdlibs/crypto/chacha20/chacha20.gno rename to gnovm/stdlibs/crypto/chacha20/chacha20.gno diff --git a/stdlibs/crypto/chacha20/chacha20_test.gno b/gnovm/stdlibs/crypto/chacha20/chacha20_test.gno similarity index 100% rename from stdlibs/crypto/chacha20/chacha20_test.gno rename to gnovm/stdlibs/crypto/chacha20/chacha20_test.gno diff --git a/stdlibs/crypto/chacha20/rand/rand.gno b/gnovm/stdlibs/crypto/chacha20/rand/rand.gno similarity index 100% rename from stdlibs/crypto/chacha20/rand/rand.gno rename to gnovm/stdlibs/crypto/chacha20/rand/rand.gno diff --git a/stdlibs/crypto/cipher/README.md b/gnovm/stdlibs/crypto/cipher/README.md similarity index 100% rename from stdlibs/crypto/cipher/README.md rename to gnovm/stdlibs/crypto/cipher/README.md diff --git a/stdlibs/crypto/cipher/cipher.gno b/gnovm/stdlibs/crypto/cipher/cipher.gno similarity index 100% rename from stdlibs/crypto/cipher/cipher.gno rename to gnovm/stdlibs/crypto/cipher/cipher.gno diff --git a/stdlibs/crypto/sha256/sha256.gno b/gnovm/stdlibs/crypto/sha256/sha256.gno similarity index 100% rename from stdlibs/crypto/sha256/sha256.gno rename to gnovm/stdlibs/crypto/sha256/sha256.gno diff --git a/stdlibs/crypto/sha256/sha256_test.gno b/gnovm/stdlibs/crypto/sha256/sha256_test.gno similarity index 100% rename from stdlibs/crypto/sha256/sha256_test.gno rename to gnovm/stdlibs/crypto/sha256/sha256_test.gno diff --git a/stdlibs/encoding/base64/base64.gno b/gnovm/stdlibs/encoding/base64/base64.gno similarity index 100% rename from stdlibs/encoding/base64/base64.gno rename to gnovm/stdlibs/encoding/base64/base64.gno diff --git a/stdlibs/encoding/base64/base64_test.gno b/gnovm/stdlibs/encoding/base64/base64_test.gno similarity index 100% rename from stdlibs/encoding/base64/base64_test.gno rename to gnovm/stdlibs/encoding/base64/base64_test.gno diff --git a/stdlibs/encoding/hex/hex.gno b/gnovm/stdlibs/encoding/hex/hex.gno similarity index 100% rename from stdlibs/encoding/hex/hex.gno rename to gnovm/stdlibs/encoding/hex/hex.gno diff --git a/stdlibs/encoding/hex/hex_test.gno b/gnovm/stdlibs/encoding/hex/hex_test.gno similarity index 100% rename from stdlibs/encoding/hex/hex_test.gno rename to gnovm/stdlibs/encoding/hex/hex_test.gno diff --git a/stdlibs/errors/README.md b/gnovm/stdlibs/errors/README.md similarity index 100% rename from stdlibs/errors/README.md rename to gnovm/stdlibs/errors/README.md diff --git a/stdlibs/errors/errors.gno b/gnovm/stdlibs/errors/errors.gno similarity index 100% rename from stdlibs/errors/errors.gno rename to gnovm/stdlibs/errors/errors.gno diff --git a/stdlibs/errors/errors_test.gno b/gnovm/stdlibs/errors/errors_test.gno similarity index 100% rename from stdlibs/errors/errors_test.gno rename to gnovm/stdlibs/errors/errors_test.gno diff --git a/stdlibs/errors/example_test.gno b/gnovm/stdlibs/errors/example_test.gno similarity index 100% rename from stdlibs/errors/example_test.gno rename to gnovm/stdlibs/errors/example_test.gno diff --git a/stdlibs/internal/bytealg/bytealg.gno b/gnovm/stdlibs/internal/bytealg/bytealg.gno similarity index 100% rename from stdlibs/internal/bytealg/bytealg.gno rename to gnovm/stdlibs/internal/bytealg/bytealg.gno diff --git a/stdlibs/internal/bytealg/compare_generic.gno b/gnovm/stdlibs/internal/bytealg/compare_generic.gno similarity index 100% rename from stdlibs/internal/bytealg/compare_generic.gno rename to gnovm/stdlibs/internal/bytealg/compare_generic.gno diff --git a/stdlibs/internal/bytealg/count_generic.gno b/gnovm/stdlibs/internal/bytealg/count_generic.gno similarity index 100% rename from stdlibs/internal/bytealg/count_generic.gno rename to gnovm/stdlibs/internal/bytealg/count_generic.gno diff --git a/stdlibs/internal/bytealg/equal_generic.gno b/gnovm/stdlibs/internal/bytealg/equal_generic.gno similarity index 100% rename from stdlibs/internal/bytealg/equal_generic.gno rename to gnovm/stdlibs/internal/bytealg/equal_generic.gno diff --git a/stdlibs/internal/bytealg/index_generic.gno b/gnovm/stdlibs/internal/bytealg/index_generic.gno similarity index 100% rename from stdlibs/internal/bytealg/index_generic.gno rename to gnovm/stdlibs/internal/bytealg/index_generic.gno diff --git a/stdlibs/internal/bytealg/indexbyte_generic.gno b/gnovm/stdlibs/internal/bytealg/indexbyte_generic.gno similarity index 100% rename from stdlibs/internal/bytealg/indexbyte_generic.gno rename to gnovm/stdlibs/internal/bytealg/indexbyte_generic.gno diff --git a/stdlibs/internal/crypto/sha256/sha256.gno b/gnovm/stdlibs/internal/crypto/sha256/sha256.gno similarity index 100% rename from stdlibs/internal/crypto/sha256/sha256.gno rename to gnovm/stdlibs/internal/crypto/sha256/sha256.gno diff --git a/stdlibs/internal/math/math.gno b/gnovm/stdlibs/internal/math/math.gno similarity index 100% rename from stdlibs/internal/math/math.gno rename to gnovm/stdlibs/internal/math/math.gno diff --git a/stdlibs/internal/os/os.gno b/gnovm/stdlibs/internal/os/os.gno similarity index 100% rename from stdlibs/internal/os/os.gno rename to gnovm/stdlibs/internal/os/os.gno diff --git a/stdlibs/io/example_test.gno b/gnovm/stdlibs/io/example_test.gno similarity index 100% rename from stdlibs/io/example_test.gno rename to gnovm/stdlibs/io/example_test.gno diff --git a/stdlibs/io/export_test.gno b/gnovm/stdlibs/io/export_test.gno similarity index 100% rename from stdlibs/io/export_test.gno rename to gnovm/stdlibs/io/export_test.gno diff --git a/stdlibs/io/io.gno b/gnovm/stdlibs/io/io.gno similarity index 100% rename from stdlibs/io/io.gno rename to gnovm/stdlibs/io/io.gno diff --git a/stdlibs/io/io_test.gno b/gnovm/stdlibs/io/io_test.gno similarity index 100% rename from stdlibs/io/io_test.gno rename to gnovm/stdlibs/io/io_test.gno diff --git a/stdlibs/io/ioutil/ioutil.gno b/gnovm/stdlibs/io/ioutil/ioutil.gno similarity index 100% rename from stdlibs/io/ioutil/ioutil.gno rename to gnovm/stdlibs/io/ioutil/ioutil.gno diff --git a/stdlibs/io/multi.gno b/gnovm/stdlibs/io/multi.gno similarity index 100% rename from stdlibs/io/multi.gno rename to gnovm/stdlibs/io/multi.gno diff --git a/stdlibs/io/multi_test.gno b/gnovm/stdlibs/io/multi_test.gno similarity index 100% rename from stdlibs/io/multi_test.gno rename to gnovm/stdlibs/io/multi_test.gno diff --git a/stdlibs/math/abs.gno b/gnovm/stdlibs/math/abs.gno similarity index 100% rename from stdlibs/math/abs.gno rename to gnovm/stdlibs/math/abs.gno diff --git a/stdlibs/math/bits.gno b/gnovm/stdlibs/math/bits.gno similarity index 100% rename from stdlibs/math/bits.gno rename to gnovm/stdlibs/math/bits.gno diff --git a/stdlibs/math/const.gno b/gnovm/stdlibs/math/const.gno similarity index 100% rename from stdlibs/math/const.gno rename to gnovm/stdlibs/math/const.gno diff --git a/stdlibs/math/copysign.gno b/gnovm/stdlibs/math/copysign.gno similarity index 100% rename from stdlibs/math/copysign.gno rename to gnovm/stdlibs/math/copysign.gno diff --git a/stdlibs/math/exp.gno b/gnovm/stdlibs/math/exp.gno similarity index 100% rename from stdlibs/math/exp.gno rename to gnovm/stdlibs/math/exp.gno diff --git a/stdlibs/math/floor.gno b/gnovm/stdlibs/math/floor.gno similarity index 100% rename from stdlibs/math/floor.gno rename to gnovm/stdlibs/math/floor.gno diff --git a/stdlibs/math/ldexp.gno b/gnovm/stdlibs/math/ldexp.gno similarity index 100% rename from stdlibs/math/ldexp.gno rename to gnovm/stdlibs/math/ldexp.gno diff --git a/stdlibs/math/modf.gno b/gnovm/stdlibs/math/modf.gno similarity index 100% rename from stdlibs/math/modf.gno rename to gnovm/stdlibs/math/modf.gno diff --git a/stdlibs/regexp/all_test.gno b/gnovm/stdlibs/regexp/all_test.gno similarity index 100% rename from stdlibs/regexp/all_test.gno rename to gnovm/stdlibs/regexp/all_test.gno diff --git a/stdlibs/regexp/backtrack.gno b/gnovm/stdlibs/regexp/backtrack.gno similarity index 100% rename from stdlibs/regexp/backtrack.gno rename to gnovm/stdlibs/regexp/backtrack.gno diff --git a/stdlibs/regexp/example_test.gno b/gnovm/stdlibs/regexp/example_test.gno similarity index 100% rename from stdlibs/regexp/example_test.gno rename to gnovm/stdlibs/regexp/example_test.gno diff --git a/stdlibs/regexp/exec.gno b/gnovm/stdlibs/regexp/exec.gno similarity index 100% rename from stdlibs/regexp/exec.gno rename to gnovm/stdlibs/regexp/exec.gno diff --git a/stdlibs/regexp/exec_test.gno b/gnovm/stdlibs/regexp/exec_test.gno similarity index 100% rename from stdlibs/regexp/exec_test.gno rename to gnovm/stdlibs/regexp/exec_test.gno diff --git a/stdlibs/regexp/find_test.gno b/gnovm/stdlibs/regexp/find_test.gno similarity index 100% rename from stdlibs/regexp/find_test.gno rename to gnovm/stdlibs/regexp/find_test.gno diff --git a/stdlibs/regexp/onepass.gno b/gnovm/stdlibs/regexp/onepass.gno similarity index 100% rename from stdlibs/regexp/onepass.gno rename to gnovm/stdlibs/regexp/onepass.gno diff --git a/stdlibs/regexp/onepass_test.gno b/gnovm/stdlibs/regexp/onepass_test.gno similarity index 100% rename from stdlibs/regexp/onepass_test.gno rename to gnovm/stdlibs/regexp/onepass_test.gno diff --git a/stdlibs/regexp/regexp.gno b/gnovm/stdlibs/regexp/regexp.gno similarity index 100% rename from stdlibs/regexp/regexp.gno rename to gnovm/stdlibs/regexp/regexp.gno diff --git a/stdlibs/regexp/syntax/compile.gno b/gnovm/stdlibs/regexp/syntax/compile.gno similarity index 100% rename from stdlibs/regexp/syntax/compile.gno rename to gnovm/stdlibs/regexp/syntax/compile.gno diff --git a/stdlibs/regexp/syntax/doc.gno b/gnovm/stdlibs/regexp/syntax/doc.gno similarity index 100% rename from stdlibs/regexp/syntax/doc.gno rename to gnovm/stdlibs/regexp/syntax/doc.gno diff --git a/stdlibs/regexp/syntax/make_perl_groups.pl b/gnovm/stdlibs/regexp/syntax/make_perl_groups.pl similarity index 100% rename from stdlibs/regexp/syntax/make_perl_groups.pl rename to gnovm/stdlibs/regexp/syntax/make_perl_groups.pl diff --git a/stdlibs/regexp/syntax/op_string.gno b/gnovm/stdlibs/regexp/syntax/op_string.gno similarity index 100% rename from stdlibs/regexp/syntax/op_string.gno rename to gnovm/stdlibs/regexp/syntax/op_string.gno diff --git a/stdlibs/regexp/syntax/parse.gno b/gnovm/stdlibs/regexp/syntax/parse.gno similarity index 100% rename from stdlibs/regexp/syntax/parse.gno rename to gnovm/stdlibs/regexp/syntax/parse.gno diff --git a/stdlibs/regexp/syntax/parse_test.gno b/gnovm/stdlibs/regexp/syntax/parse_test.gno similarity index 100% rename from stdlibs/regexp/syntax/parse_test.gno rename to gnovm/stdlibs/regexp/syntax/parse_test.gno diff --git a/stdlibs/regexp/syntax/perl_groups.gno b/gnovm/stdlibs/regexp/syntax/perl_groups.gno similarity index 100% rename from stdlibs/regexp/syntax/perl_groups.gno rename to gnovm/stdlibs/regexp/syntax/perl_groups.gno diff --git a/stdlibs/regexp/syntax/prog.gno b/gnovm/stdlibs/regexp/syntax/prog.gno similarity index 100% rename from stdlibs/regexp/syntax/prog.gno rename to gnovm/stdlibs/regexp/syntax/prog.gno diff --git a/stdlibs/regexp/syntax/prog_test.gno b/gnovm/stdlibs/regexp/syntax/prog_test.gno similarity index 100% rename from stdlibs/regexp/syntax/prog_test.gno rename to gnovm/stdlibs/regexp/syntax/prog_test.gno diff --git a/stdlibs/regexp/syntax/regexp.gno b/gnovm/stdlibs/regexp/syntax/regexp.gno similarity index 100% rename from stdlibs/regexp/syntax/regexp.gno rename to gnovm/stdlibs/regexp/syntax/regexp.gno diff --git a/stdlibs/regexp/syntax/simplify.gno b/gnovm/stdlibs/regexp/syntax/simplify.gno similarity index 100% rename from stdlibs/regexp/syntax/simplify.gno rename to gnovm/stdlibs/regexp/syntax/simplify.gno diff --git a/stdlibs/regexp/syntax/simplify_test.gno b/gnovm/stdlibs/regexp/syntax/simplify_test.gno similarity index 100% rename from stdlibs/regexp/syntax/simplify_test.gno rename to gnovm/stdlibs/regexp/syntax/simplify_test.gno diff --git a/stdlibs/sort/search.gno b/gnovm/stdlibs/sort/search.gno similarity index 100% rename from stdlibs/sort/search.gno rename to gnovm/stdlibs/sort/search.gno diff --git a/stdlibs/sort/search_test.gno b/gnovm/stdlibs/sort/search_test.gno similarity index 100% rename from stdlibs/sort/search_test.gno rename to gnovm/stdlibs/sort/search_test.gno diff --git a/stdlibs/sort/sort.gno b/gnovm/stdlibs/sort/sort.gno similarity index 100% rename from stdlibs/sort/sort.gno rename to gnovm/stdlibs/sort/sort.gno diff --git a/stdlibs/sort/sort_test.gno b/gnovm/stdlibs/sort/sort_test.gno similarity index 100% rename from stdlibs/sort/sort_test.gno rename to gnovm/stdlibs/sort/sort_test.gno diff --git a/stdlibs/std/addr_set.gno b/gnovm/stdlibs/std/addr_set.gno similarity index 100% rename from stdlibs/std/addr_set.gno rename to gnovm/stdlibs/std/addr_set.gno diff --git a/stdlibs/std/banker.gno b/gnovm/stdlibs/std/banker.gno similarity index 100% rename from stdlibs/std/banker.gno rename to gnovm/stdlibs/std/banker.gno diff --git a/stdlibs/std/coins.gno b/gnovm/stdlibs/std/coins.gno similarity index 100% rename from stdlibs/std/coins.gno rename to gnovm/stdlibs/std/coins.gno diff --git a/stdlibs/std/context.gno b/gnovm/stdlibs/std/context.gno similarity index 100% rename from stdlibs/std/context.gno rename to gnovm/stdlibs/std/context.gno diff --git a/stdlibs/std/crypto.gno b/gnovm/stdlibs/std/crypto.gno similarity index 100% rename from stdlibs/std/crypto.gno rename to gnovm/stdlibs/std/crypto.gno diff --git a/stdlibs/std/time.gno b/gnovm/stdlibs/std/time.gno similarity index 100% rename from stdlibs/std/time.gno rename to gnovm/stdlibs/std/time.gno diff --git a/stdlibs/stdlibs.go b/gnovm/stdlibs/stdlibs.go similarity index 98% rename from stdlibs/stdlibs.go rename to gnovm/stdlibs/stdlibs.go index 44bd05664f5..495482cfad2 100644 --- a/stdlibs/stdlibs.go +++ b/gnovm/stdlibs/stdlibs.go @@ -7,10 +7,10 @@ import ( "strconv" "time" - "github.com/gnolang/gno/pkgs/bech32" - "github.com/gnolang/gno/pkgs/crypto" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/std" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/tm2/pkg/bech32" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/std" ) func InjectNativeMappings(store gno.Store) { diff --git a/stdlibs/stdshim/addr_set.gno b/gnovm/stdlibs/stdshim/addr_set.gno similarity index 100% rename from stdlibs/stdshim/addr_set.gno rename to gnovm/stdlibs/stdshim/addr_set.gno diff --git a/stdlibs/stdshim/banker.gno b/gnovm/stdlibs/stdshim/banker.gno similarity index 100% rename from stdlibs/stdshim/banker.gno rename to gnovm/stdlibs/stdshim/banker.gno diff --git a/stdlibs/stdshim/coins.gno b/gnovm/stdlibs/stdshim/coins.gno similarity index 100% rename from stdlibs/stdshim/coins.gno rename to gnovm/stdlibs/stdshim/coins.gno diff --git a/stdlibs/stdshim/context.gno b/gnovm/stdlibs/stdshim/context.gno similarity index 100% rename from stdlibs/stdshim/context.gno rename to gnovm/stdlibs/stdshim/context.gno diff --git a/stdlibs/stdshim/crypto.gno b/gnovm/stdlibs/stdshim/crypto.gno similarity index 100% rename from stdlibs/stdshim/crypto.gno rename to gnovm/stdlibs/stdshim/crypto.gno diff --git a/stdlibs/stdshim/stdshim.gno b/gnovm/stdlibs/stdshim/stdshim.gno similarity index 100% rename from stdlibs/stdshim/stdshim.gno rename to gnovm/stdlibs/stdshim/stdshim.gno diff --git a/stdlibs/stdshim/time.gno b/gnovm/stdlibs/stdshim/time.gno similarity index 100% rename from stdlibs/stdshim/time.gno rename to gnovm/stdlibs/stdshim/time.gno diff --git a/stdlibs/strconv/strconv.gno b/gnovm/stdlibs/strconv/strconv.gno similarity index 100% rename from stdlibs/strconv/strconv.gno rename to gnovm/stdlibs/strconv/strconv.gno diff --git a/stdlibs/strings/builder.gno b/gnovm/stdlibs/strings/builder.gno similarity index 100% rename from stdlibs/strings/builder.gno rename to gnovm/stdlibs/strings/builder.gno diff --git a/stdlibs/strings/builder_test.gno b/gnovm/stdlibs/strings/builder_test.gno similarity index 100% rename from stdlibs/strings/builder_test.gno rename to gnovm/stdlibs/strings/builder_test.gno diff --git a/stdlibs/strings/compare.gno b/gnovm/stdlibs/strings/compare.gno similarity index 100% rename from stdlibs/strings/compare.gno rename to gnovm/stdlibs/strings/compare.gno diff --git a/stdlibs/strings/example_test.gno b/gnovm/stdlibs/strings/example_test.gno similarity index 100% rename from stdlibs/strings/example_test.gno rename to gnovm/stdlibs/strings/example_test.gno diff --git a/stdlibs/strings/export_test.gno b/gnovm/stdlibs/strings/export_test.gno similarity index 100% rename from stdlibs/strings/export_test.gno rename to gnovm/stdlibs/strings/export_test.gno diff --git a/stdlibs/strings/reader.gno b/gnovm/stdlibs/strings/reader.gno similarity index 100% rename from stdlibs/strings/reader.gno rename to gnovm/stdlibs/strings/reader.gno diff --git a/stdlibs/strings/reader_test.gno b/gnovm/stdlibs/strings/reader_test.gno similarity index 100% rename from stdlibs/strings/reader_test.gno rename to gnovm/stdlibs/strings/reader_test.gno diff --git a/stdlibs/strings/search.gno b/gnovm/stdlibs/strings/search.gno similarity index 100% rename from stdlibs/strings/search.gno rename to gnovm/stdlibs/strings/search.gno diff --git a/stdlibs/strings/strings.gno b/gnovm/stdlibs/strings/strings.gno similarity index 100% rename from stdlibs/strings/strings.gno rename to gnovm/stdlibs/strings/strings.gno diff --git a/stdlibs/testing/match.gno b/gnovm/stdlibs/testing/match.gno similarity index 100% rename from stdlibs/testing/match.gno rename to gnovm/stdlibs/testing/match.gno diff --git a/stdlibs/testing/testing.gno b/gnovm/stdlibs/testing/testing.gno similarity index 100% rename from stdlibs/testing/testing.gno rename to gnovm/stdlibs/testing/testing.gno diff --git a/stdlibs/time/format.gno b/gnovm/stdlibs/time/format.gno similarity index 100% rename from stdlibs/time/format.gno rename to gnovm/stdlibs/time/format.gno diff --git a/stdlibs/time/time.gno b/gnovm/stdlibs/time/time.gno similarity index 100% rename from stdlibs/time/time.gno rename to gnovm/stdlibs/time/time.gno diff --git a/stdlibs/time/timezoneinfo.gno b/gnovm/stdlibs/time/timezoneinfo.gno similarity index 100% rename from stdlibs/time/timezoneinfo.gno rename to gnovm/stdlibs/time/timezoneinfo.gno diff --git a/stdlibs/unicode/README.md b/gnovm/stdlibs/unicode/README.md similarity index 100% rename from stdlibs/unicode/README.md rename to gnovm/stdlibs/unicode/README.md diff --git a/stdlibs/unicode/casetables.gno b/gnovm/stdlibs/unicode/casetables.gno similarity index 100% rename from stdlibs/unicode/casetables.gno rename to gnovm/stdlibs/unicode/casetables.gno diff --git a/stdlibs/unicode/digit.gno b/gnovm/stdlibs/unicode/digit.gno similarity index 100% rename from stdlibs/unicode/digit.gno rename to gnovm/stdlibs/unicode/digit.gno diff --git a/stdlibs/unicode/digit_test.gno b/gnovm/stdlibs/unicode/digit_test.gno similarity index 100% rename from stdlibs/unicode/digit_test.gno rename to gnovm/stdlibs/unicode/digit_test.gno diff --git a/stdlibs/unicode/example_test.gno b/gnovm/stdlibs/unicode/example_test.gno similarity index 100% rename from stdlibs/unicode/example_test.gno rename to gnovm/stdlibs/unicode/example_test.gno diff --git a/stdlibs/unicode/graphic.gno b/gnovm/stdlibs/unicode/graphic.gno similarity index 100% rename from stdlibs/unicode/graphic.gno rename to gnovm/stdlibs/unicode/graphic.gno diff --git a/stdlibs/unicode/graphic_test.gno b/gnovm/stdlibs/unicode/graphic_test.gno similarity index 100% rename from stdlibs/unicode/graphic_test.gno rename to gnovm/stdlibs/unicode/graphic_test.gno diff --git a/stdlibs/unicode/letter.gno b/gnovm/stdlibs/unicode/letter.gno similarity index 100% rename from stdlibs/unicode/letter.gno rename to gnovm/stdlibs/unicode/letter.gno diff --git a/stdlibs/unicode/letter_test.gno b/gnovm/stdlibs/unicode/letter_test.gno similarity index 100% rename from stdlibs/unicode/letter_test.gno rename to gnovm/stdlibs/unicode/letter_test.gno diff --git a/stdlibs/unicode/script_test.gno b/gnovm/stdlibs/unicode/script_test.gno similarity index 100% rename from stdlibs/unicode/script_test.gno rename to gnovm/stdlibs/unicode/script_test.gno diff --git a/stdlibs/unicode/tables.gno b/gnovm/stdlibs/unicode/tables.gno similarity index 100% rename from stdlibs/unicode/tables.gno rename to gnovm/stdlibs/unicode/tables.gno diff --git a/stdlibs/unicode/utf8/example_test.gno b/gnovm/stdlibs/unicode/utf8/example_test.gno similarity index 100% rename from stdlibs/unicode/utf8/example_test.gno rename to gnovm/stdlibs/unicode/utf8/example_test.gno diff --git a/stdlibs/unicode/utf8/utf8.gno b/gnovm/stdlibs/unicode/utf8/utf8.gno similarity index 100% rename from stdlibs/unicode/utf8/utf8.gno rename to gnovm/stdlibs/unicode/utf8/utf8.gno diff --git a/stdlibs/unicode/utf8/utf8_test.gno b/gnovm/stdlibs/unicode/utf8/utf8_test.gno similarity index 100% rename from stdlibs/unicode/utf8/utf8_test.gno rename to gnovm/stdlibs/unicode/utf8/utf8_test.gno diff --git a/tests/README.md b/gnovm/tests/README.md similarity index 100% rename from tests/README.md rename to gnovm/tests/README.md diff --git a/tests/backup/addr0.gno b/gnovm/tests/backup/addr0.gno similarity index 100% rename from tests/backup/addr0.gno rename to gnovm/tests/backup/addr0.gno diff --git a/tests/backup/addr2.gno b/gnovm/tests/backup/addr2.gno similarity index 100% rename from tests/backup/addr2.gno rename to gnovm/tests/backup/addr2.gno diff --git a/tests/backup/assert0.gno b/gnovm/tests/backup/assert0.gno similarity index 100% rename from tests/backup/assert0.gno rename to gnovm/tests/backup/assert0.gno diff --git a/tests/backup/assert1.gno b/gnovm/tests/backup/assert1.gno similarity index 100% rename from tests/backup/assert1.gno rename to gnovm/tests/backup/assert1.gno diff --git a/tests/backup/assign0.gno b/gnovm/tests/backup/assign0.gno similarity index 100% rename from tests/backup/assign0.gno rename to gnovm/tests/backup/assign0.gno diff --git a/tests/backup/assign13.gno b/gnovm/tests/backup/assign13.gno similarity index 100% rename from tests/backup/assign13.gno rename to gnovm/tests/backup/assign13.gno diff --git a/tests/backup/assign14.gno b/gnovm/tests/backup/assign14.gno similarity index 100% rename from tests/backup/assign14.gno rename to gnovm/tests/backup/assign14.gno diff --git a/tests/backup/assign15.gno b/gnovm/tests/backup/assign15.gno similarity index 100% rename from tests/backup/assign15.gno rename to gnovm/tests/backup/assign15.gno diff --git a/tests/backup/assign6.gno b/gnovm/tests/backup/assign6.gno similarity index 100% rename from tests/backup/assign6.gno rename to gnovm/tests/backup/assign6.gno diff --git a/tests/backup/assign7.gno b/gnovm/tests/backup/assign7.gno similarity index 100% rename from tests/backup/assign7.gno rename to gnovm/tests/backup/assign7.gno diff --git a/tests/backup/bad0.gno b/gnovm/tests/backup/bad0.gno similarity index 100% rename from tests/backup/bad0.gno rename to gnovm/tests/backup/bad0.gno diff --git a/tests/backup/bin2.gno b/gnovm/tests/backup/bin2.gno similarity index 100% rename from tests/backup/bin2.gno rename to gnovm/tests/backup/bin2.gno diff --git a/tests/backup/chan0.gno b/gnovm/tests/backup/chan0.gno similarity index 100% rename from tests/backup/chan0.gno rename to gnovm/tests/backup/chan0.gno diff --git a/tests/backup/chan1.gno b/gnovm/tests/backup/chan1.gno similarity index 100% rename from tests/backup/chan1.gno rename to gnovm/tests/backup/chan1.gno diff --git a/tests/backup/chan10.gno b/gnovm/tests/backup/chan10.gno similarity index 100% rename from tests/backup/chan10.gno rename to gnovm/tests/backup/chan10.gno diff --git a/tests/backup/chan2.gno b/gnovm/tests/backup/chan2.gno similarity index 100% rename from tests/backup/chan2.gno rename to gnovm/tests/backup/chan2.gno diff --git a/tests/backup/chan3.gno b/gnovm/tests/backup/chan3.gno similarity index 100% rename from tests/backup/chan3.gno rename to gnovm/tests/backup/chan3.gno diff --git a/tests/backup/chan4.gno b/gnovm/tests/backup/chan4.gno similarity index 100% rename from tests/backup/chan4.gno rename to gnovm/tests/backup/chan4.gno diff --git a/tests/backup/chan5.gno b/gnovm/tests/backup/chan5.gno similarity index 100% rename from tests/backup/chan5.gno rename to gnovm/tests/backup/chan5.gno diff --git a/tests/backup/chan6.gno b/gnovm/tests/backup/chan6.gno similarity index 100% rename from tests/backup/chan6.gno rename to gnovm/tests/backup/chan6.gno diff --git a/tests/backup/chan7.gno b/gnovm/tests/backup/chan7.gno similarity index 100% rename from tests/backup/chan7.gno rename to gnovm/tests/backup/chan7.gno diff --git a/tests/backup/chan8.gno b/gnovm/tests/backup/chan8.gno similarity index 100% rename from tests/backup/chan8.gno rename to gnovm/tests/backup/chan8.gno diff --git a/tests/backup/chan9.gno b/gnovm/tests/backup/chan9.gno similarity index 100% rename from tests/backup/chan9.gno rename to gnovm/tests/backup/chan9.gno diff --git a/tests/backup/circular.gno b/gnovm/tests/backup/circular.gno similarity index 100% rename from tests/backup/circular.gno rename to gnovm/tests/backup/circular.gno diff --git a/tests/backup/cli1.gno b/gnovm/tests/backup/cli1.gno similarity index 100% rename from tests/backup/cli1.gno rename to gnovm/tests/backup/cli1.gno diff --git a/tests/backup/cli2.gno b/gnovm/tests/backup/cli2.gno similarity index 100% rename from tests/backup/cli2.gno rename to gnovm/tests/backup/cli2.gno diff --git a/tests/backup/cli3.gno b/gnovm/tests/backup/cli3.gno similarity index 100% rename from tests/backup/cli3.gno rename to gnovm/tests/backup/cli3.gno diff --git a/tests/backup/cli4.gno b/gnovm/tests/backup/cli4.gno similarity index 100% rename from tests/backup/cli4.gno rename to gnovm/tests/backup/cli4.gno diff --git a/tests/backup/cli5.gno b/gnovm/tests/backup/cli5.gno similarity index 100% rename from tests/backup/cli5.gno rename to gnovm/tests/backup/cli5.gno diff --git a/tests/backup/cli6.gno b/gnovm/tests/backup/cli6.gno similarity index 100% rename from tests/backup/cli6.gno rename to gnovm/tests/backup/cli6.gno diff --git a/tests/backup/comp0.gno b/gnovm/tests/backup/comp0.gno similarity index 100% rename from tests/backup/comp0.gno rename to gnovm/tests/backup/comp0.gno diff --git a/tests/backup/complex0.gno b/gnovm/tests/backup/complex0.gno similarity index 100% rename from tests/backup/complex0.gno rename to gnovm/tests/backup/complex0.gno diff --git a/tests/backup/complex1.gno b/gnovm/tests/backup/complex1.gno similarity index 100% rename from tests/backup/complex1.gno rename to gnovm/tests/backup/complex1.gno diff --git a/tests/backup/complex2.gno b/gnovm/tests/backup/complex2.gno similarity index 100% rename from tests/backup/complex2.gno rename to gnovm/tests/backup/complex2.gno diff --git a/tests/backup/complex3.gno b/gnovm/tests/backup/complex3.gno similarity index 100% rename from tests/backup/complex3.gno rename to gnovm/tests/backup/complex3.gno diff --git a/tests/backup/complex4.gno b/gnovm/tests/backup/complex4.gno similarity index 100% rename from tests/backup/complex4.gno rename to gnovm/tests/backup/complex4.gno diff --git a/tests/backup/composite2.gno b/gnovm/tests/backup/composite2.gno similarity index 100% rename from tests/backup/composite2.gno rename to gnovm/tests/backup/composite2.gno diff --git a/tests/backup/composite5.gno b/gnovm/tests/backup/composite5.gno similarity index 100% rename from tests/backup/composite5.gno rename to gnovm/tests/backup/composite5.gno diff --git a/tests/backup/composite6.gno b/gnovm/tests/backup/composite6.gno similarity index 100% rename from tests/backup/composite6.gno rename to gnovm/tests/backup/composite6.gno diff --git a/tests/backup/convert2.gno b/gnovm/tests/backup/convert2.gno similarity index 100% rename from tests/backup/convert2.gno rename to gnovm/tests/backup/convert2.gno diff --git a/tests/backup/defer9.gno b/gnovm/tests/backup/defer9.gno similarity index 100% rename from tests/backup/defer9.gno rename to gnovm/tests/backup/defer9.gno diff --git a/tests/backup/eval0.gno b/gnovm/tests/backup/eval0.gno similarity index 100% rename from tests/backup/eval0.gno rename to gnovm/tests/backup/eval0.gno diff --git a/tests/backup/file_access.gno b/gnovm/tests/backup/file_access.gno similarity index 100% rename from tests/backup/file_access.gno rename to gnovm/tests/backup/file_access.gno diff --git a/tests/backup/flag0.gno b/gnovm/tests/backup/flag0.gno similarity index 100% rename from tests/backup/flag0.gno rename to gnovm/tests/backup/flag0.gno diff --git a/tests/backup/fun10.gno b/gnovm/tests/backup/fun10.gno similarity index 100% rename from tests/backup/fun10.gno rename to gnovm/tests/backup/fun10.gno diff --git a/tests/backup/fun19.gno b/gnovm/tests/backup/fun19.gno similarity index 100% rename from tests/backup/fun19.gno rename to gnovm/tests/backup/fun19.gno diff --git a/tests/backup/fun20.gno b/gnovm/tests/backup/fun20.gno similarity index 100% rename from tests/backup/fun20.gno rename to gnovm/tests/backup/fun20.gno diff --git a/tests/backup/heap.gno b/gnovm/tests/backup/heap.gno similarity index 100% rename from tests/backup/heap.gno rename to gnovm/tests/backup/heap.gno diff --git a/tests/backup/imag0.gno b/gnovm/tests/backup/imag0.gno similarity index 100% rename from tests/backup/imag0.gno rename to gnovm/tests/backup/imag0.gno diff --git a/tests/backup/import2.gno b/gnovm/tests/backup/import2.gno similarity index 100% rename from tests/backup/import2.gno rename to gnovm/tests/backup/import2.gno diff --git a/tests/backup/inception.gno b/gnovm/tests/backup/inception.gno similarity index 100% rename from tests/backup/inception.gno rename to gnovm/tests/backup/inception.gno diff --git a/tests/backup/interface16.gno b/gnovm/tests/backup/interface16.gno similarity index 100% rename from tests/backup/interface16.gno rename to gnovm/tests/backup/interface16.gno diff --git a/tests/backup/interface27.gno b/gnovm/tests/backup/interface27.gno similarity index 100% rename from tests/backup/interface27.gno rename to gnovm/tests/backup/interface27.gno diff --git a/tests/backup/interface28.gno b/gnovm/tests/backup/interface28.gno similarity index 100% rename from tests/backup/interface28.gno rename to gnovm/tests/backup/interface28.gno diff --git a/tests/backup/interface38.gno b/gnovm/tests/backup/interface38.gno similarity index 100% rename from tests/backup/interface38.gno rename to gnovm/tests/backup/interface38.gno diff --git a/tests/backup/interface39.gno b/gnovm/tests/backup/interface39.gno similarity index 100% rename from tests/backup/interface39.gno rename to gnovm/tests/backup/interface39.gno diff --git a/tests/backup/interface40.gno b/gnovm/tests/backup/interface40.gno similarity index 100% rename from tests/backup/interface40.gno rename to gnovm/tests/backup/interface40.gno diff --git a/tests/backup/interface41.gno b/gnovm/tests/backup/interface41.gno similarity index 100% rename from tests/backup/interface41.gno rename to gnovm/tests/backup/interface41.gno diff --git a/tests/backup/interface7.gno b/gnovm/tests/backup/interface7.gno similarity index 100% rename from tests/backup/interface7.gno rename to gnovm/tests/backup/interface7.gno diff --git a/tests/backup/interface9.gno b/gnovm/tests/backup/interface9.gno similarity index 100% rename from tests/backup/interface9.gno rename to gnovm/tests/backup/interface9.gno diff --git a/tests/backup/ioutil.gno b/gnovm/tests/backup/ioutil.gno similarity index 100% rename from tests/backup/ioutil.gno rename to gnovm/tests/backup/ioutil.gno diff --git a/tests/backup/issue-558.gno b/gnovm/tests/backup/issue-558.gno similarity index 100% rename from tests/backup/issue-558.gno rename to gnovm/tests/backup/issue-558.gno diff --git a/tests/backup/issue-770.gno b/gnovm/tests/backup/issue-770.gno similarity index 100% rename from tests/backup/issue-770.gno rename to gnovm/tests/backup/issue-770.gno diff --git a/tests/backup/issue-772.gno b/gnovm/tests/backup/issue-772.gno similarity index 100% rename from tests/backup/issue-772.gno rename to gnovm/tests/backup/issue-772.gno diff --git a/tests/backup/issue-775.gno b/gnovm/tests/backup/issue-775.gno similarity index 100% rename from tests/backup/issue-775.gno rename to gnovm/tests/backup/issue-775.gno diff --git a/tests/backup/make.gno b/gnovm/tests/backup/make.gno similarity index 100% rename from tests/backup/make.gno rename to gnovm/tests/backup/make.gno diff --git a/tests/backup/map14.gno b/gnovm/tests/backup/map14.gno similarity index 100% rename from tests/backup/map14.gno rename to gnovm/tests/backup/map14.gno diff --git a/tests/backup/map19.gno b/gnovm/tests/backup/map19.gno similarity index 100% rename from tests/backup/map19.gno rename to gnovm/tests/backup/map19.gno diff --git a/tests/backup/map28.gno b/gnovm/tests/backup/map28.gno similarity index 100% rename from tests/backup/map28.gno rename to gnovm/tests/backup/map28.gno diff --git a/tests/backup/math1.gno b/gnovm/tests/backup/math1.gno similarity index 100% rename from tests/backup/math1.gno rename to gnovm/tests/backup/math1.gno diff --git a/tests/backup/method16.gno b/gnovm/tests/backup/method16.gno similarity index 100% rename from tests/backup/method16.gno rename to gnovm/tests/backup/method16.gno diff --git a/tests/backup/method17.gno b/gnovm/tests/backup/method17.gno similarity index 100% rename from tests/backup/method17.gno rename to gnovm/tests/backup/method17.gno diff --git a/tests/backup/method29.gno b/gnovm/tests/backup/method29.gno similarity index 100% rename from tests/backup/method29.gno rename to gnovm/tests/backup/method29.gno diff --git a/tests/backup/method31.gno b/gnovm/tests/backup/method31.gno similarity index 100% rename from tests/backup/method31.gno rename to gnovm/tests/backup/method31.gno diff --git a/tests/backup/num0.gno b/gnovm/tests/backup/num0.gno similarity index 100% rename from tests/backup/num0.gno rename to gnovm/tests/backup/num0.gno diff --git a/tests/backup/op1.gno b/gnovm/tests/backup/op1.gno similarity index 100% rename from tests/backup/op1.gno rename to gnovm/tests/backup/op1.gno diff --git a/tests/backup/op3.gno b/gnovm/tests/backup/op3.gno similarity index 100% rename from tests/backup/op3.gno rename to gnovm/tests/backup/op3.gno diff --git a/tests/backup/op4.gno b/gnovm/tests/backup/op4.gno similarity index 100% rename from tests/backup/op4.gno rename to gnovm/tests/backup/op4.gno diff --git a/tests/backup/op5.gno b/gnovm/tests/backup/op5.gno similarity index 100% rename from tests/backup/op5.gno rename to gnovm/tests/backup/op5.gno diff --git a/tests/backup/op9.gno b/gnovm/tests/backup/op9.gno similarity index 100% rename from tests/backup/op9.gno rename to gnovm/tests/backup/op9.gno diff --git a/tests/backup/opfloat32.gno b/gnovm/tests/backup/opfloat32.gno similarity index 100% rename from tests/backup/opfloat32.gno rename to gnovm/tests/backup/opfloat32.gno diff --git a/tests/backup/opfloat64.gno b/gnovm/tests/backup/opfloat64.gno similarity index 100% rename from tests/backup/opfloat64.gno rename to gnovm/tests/backup/opfloat64.gno diff --git a/tests/backup/range6.gno b/gnovm/tests/backup/range6.gno similarity index 100% rename from tests/backup/range6.gno rename to gnovm/tests/backup/range6.gno diff --git a/tests/backup/range7.gno b/gnovm/tests/backup/range7.gno similarity index 100% rename from tests/backup/range7.gno rename to gnovm/tests/backup/range7.gno diff --git a/tests/backup/range8.gno b/gnovm/tests/backup/range8.gno similarity index 100% rename from tests/backup/range8.gno rename to gnovm/tests/backup/range8.gno diff --git a/tests/backup/range9.gno b/gnovm/tests/backup/range9.gno similarity index 100% rename from tests/backup/range9.gno rename to gnovm/tests/backup/range9.gno diff --git a/tests/backup/real0.gno b/gnovm/tests/backup/real0.gno similarity index 100% rename from tests/backup/real0.gno rename to gnovm/tests/backup/real0.gno diff --git a/tests/backup/redeclaration-global2.gno b/gnovm/tests/backup/redeclaration-global2.gno similarity index 100% rename from tests/backup/redeclaration-global2.gno rename to gnovm/tests/backup/redeclaration-global2.gno diff --git a/tests/backup/redeclaration-global3.gno b/gnovm/tests/backup/redeclaration-global3.gno similarity index 100% rename from tests/backup/redeclaration-global3.gno rename to gnovm/tests/backup/redeclaration-global3.gno diff --git a/tests/backup/redeclaration-global4.gno b/gnovm/tests/backup/redeclaration-global4.gno similarity index 100% rename from tests/backup/redeclaration-global4.gno rename to gnovm/tests/backup/redeclaration-global4.gno diff --git a/tests/backup/redeclaration-global6.gno b/gnovm/tests/backup/redeclaration-global6.gno similarity index 100% rename from tests/backup/redeclaration-global6.gno rename to gnovm/tests/backup/redeclaration-global6.gno diff --git a/tests/backup/redeclaration-global7.gno b/gnovm/tests/backup/redeclaration-global7.gno similarity index 100% rename from tests/backup/redeclaration-global7.gno rename to gnovm/tests/backup/redeclaration-global7.gno diff --git a/tests/backup/restricted0.gno b/gnovm/tests/backup/restricted0.gno similarity index 100% rename from tests/backup/restricted0.gno rename to gnovm/tests/backup/restricted0.gno diff --git a/tests/backup/restricted1.gno b/gnovm/tests/backup/restricted1.gno similarity index 100% rename from tests/backup/restricted1.gno rename to gnovm/tests/backup/restricted1.gno diff --git a/tests/backup/restricted2.gno b/gnovm/tests/backup/restricted2.gno similarity index 100% rename from tests/backup/restricted2.gno rename to gnovm/tests/backup/restricted2.gno diff --git a/tests/backup/restricted3.gno b/gnovm/tests/backup/restricted3.gno similarity index 100% rename from tests/backup/restricted3.gno rename to gnovm/tests/backup/restricted3.gno diff --git a/tests/backup/select.gno b/gnovm/tests/backup/select.gno similarity index 100% rename from tests/backup/select.gno rename to gnovm/tests/backup/select.gno diff --git a/tests/backup/select0.gno b/gnovm/tests/backup/select0.gno similarity index 100% rename from tests/backup/select0.gno rename to gnovm/tests/backup/select0.gno diff --git a/tests/backup/select1.gno b/gnovm/tests/backup/select1.gno similarity index 100% rename from tests/backup/select1.gno rename to gnovm/tests/backup/select1.gno diff --git a/tests/backup/select10.gno b/gnovm/tests/backup/select10.gno similarity index 100% rename from tests/backup/select10.gno rename to gnovm/tests/backup/select10.gno diff --git a/tests/backup/select11.gno b/gnovm/tests/backup/select11.gno similarity index 100% rename from tests/backup/select11.gno rename to gnovm/tests/backup/select11.gno diff --git a/tests/backup/select12.gno b/gnovm/tests/backup/select12.gno similarity index 100% rename from tests/backup/select12.gno rename to gnovm/tests/backup/select12.gno diff --git a/tests/backup/select13.gno b/gnovm/tests/backup/select13.gno similarity index 100% rename from tests/backup/select13.gno rename to gnovm/tests/backup/select13.gno diff --git a/tests/backup/select14.gno b/gnovm/tests/backup/select14.gno similarity index 100% rename from tests/backup/select14.gno rename to gnovm/tests/backup/select14.gno diff --git a/tests/backup/select15.gno b/gnovm/tests/backup/select15.gno similarity index 100% rename from tests/backup/select15.gno rename to gnovm/tests/backup/select15.gno diff --git a/tests/backup/select2.gno b/gnovm/tests/backup/select2.gno similarity index 100% rename from tests/backup/select2.gno rename to gnovm/tests/backup/select2.gno diff --git a/tests/backup/select3.gno b/gnovm/tests/backup/select3.gno similarity index 100% rename from tests/backup/select3.gno rename to gnovm/tests/backup/select3.gno diff --git a/tests/backup/select4.gno b/gnovm/tests/backup/select4.gno similarity index 100% rename from tests/backup/select4.gno rename to gnovm/tests/backup/select4.gno diff --git a/tests/backup/select5.gno b/gnovm/tests/backup/select5.gno similarity index 100% rename from tests/backup/select5.gno rename to gnovm/tests/backup/select5.gno diff --git a/tests/backup/select6.gno b/gnovm/tests/backup/select6.gno similarity index 100% rename from tests/backup/select6.gno rename to gnovm/tests/backup/select6.gno diff --git a/tests/backup/select7.gno b/gnovm/tests/backup/select7.gno similarity index 100% rename from tests/backup/select7.gno rename to gnovm/tests/backup/select7.gno diff --git a/tests/backup/select8.gno b/gnovm/tests/backup/select8.gno similarity index 100% rename from tests/backup/select8.gno rename to gnovm/tests/backup/select8.gno diff --git a/tests/backup/select9.gno b/gnovm/tests/backup/select9.gno similarity index 100% rename from tests/backup/select9.gno rename to gnovm/tests/backup/select9.gno diff --git a/tests/backup/selector-scope0.gno b/gnovm/tests/backup/selector-scope0.gno similarity index 100% rename from tests/backup/selector-scope0.gno rename to gnovm/tests/backup/selector-scope0.gno diff --git a/tests/backup/server.gno b/gnovm/tests/backup/server.gno similarity index 100% rename from tests/backup/server.gno rename to gnovm/tests/backup/server.gno diff --git a/tests/backup/server0.gno b/gnovm/tests/backup/server0.gno similarity index 100% rename from tests/backup/server0.gno rename to gnovm/tests/backup/server0.gno diff --git a/tests/backup/server1.gno b/gnovm/tests/backup/server1.gno similarity index 100% rename from tests/backup/server1.gno rename to gnovm/tests/backup/server1.gno diff --git a/tests/backup/server1a.gno b/gnovm/tests/backup/server1a.gno similarity index 100% rename from tests/backup/server1a.gno rename to gnovm/tests/backup/server1a.gno diff --git a/tests/backup/server2.gno b/gnovm/tests/backup/server2.gno similarity index 100% rename from tests/backup/server2.gno rename to gnovm/tests/backup/server2.gno diff --git a/tests/backup/server3.gno b/gnovm/tests/backup/server3.gno similarity index 100% rename from tests/backup/server3.gno rename to gnovm/tests/backup/server3.gno diff --git a/tests/backup/server4.gno b/gnovm/tests/backup/server4.gno similarity index 100% rename from tests/backup/server4.gno rename to gnovm/tests/backup/server4.gno diff --git a/tests/backup/server5.gno b/gnovm/tests/backup/server5.gno similarity index 100% rename from tests/backup/server5.gno rename to gnovm/tests/backup/server5.gno diff --git a/tests/backup/server6.gno b/gnovm/tests/backup/server6.gno similarity index 100% rename from tests/backup/server6.gno rename to gnovm/tests/backup/server6.gno diff --git a/tests/backup/server7.gno b/gnovm/tests/backup/server7.gno similarity index 100% rename from tests/backup/server7.gno rename to gnovm/tests/backup/server7.gno diff --git a/tests/backup/shift3.gno b/gnovm/tests/backup/shift3.gno similarity index 100% rename from tests/backup/shift3.gno rename to gnovm/tests/backup/shift3.gno diff --git a/tests/backup/sieve.gno b/gnovm/tests/backup/sieve.gno similarity index 100% rename from tests/backup/sieve.gno rename to gnovm/tests/backup/sieve.gno diff --git a/tests/backup/struct15.gno b/gnovm/tests/backup/struct15.gno similarity index 100% rename from tests/backup/struct15.gno rename to gnovm/tests/backup/struct15.gno diff --git a/tests/backup/struct18.gno b/gnovm/tests/backup/struct18.gno similarity index 100% rename from tests/backup/struct18.gno rename to gnovm/tests/backup/struct18.gno diff --git a/tests/backup/struct23.gno b/gnovm/tests/backup/struct23.gno similarity index 100% rename from tests/backup/struct23.gno rename to gnovm/tests/backup/struct23.gno diff --git a/tests/backup/struct28.gno b/gnovm/tests/backup/struct28.gno similarity index 100% rename from tests/backup/struct28.gno rename to gnovm/tests/backup/struct28.gno diff --git a/tests/backup/struct50.gno b/gnovm/tests/backup/struct50.gno similarity index 100% rename from tests/backup/struct50.gno rename to gnovm/tests/backup/struct50.gno diff --git a/tests/backup/struct51.gno b/gnovm/tests/backup/struct51.gno similarity index 100% rename from tests/backup/struct51.gno rename to gnovm/tests/backup/struct51.gno diff --git a/tests/backup/struct52.gno b/gnovm/tests/backup/struct52.gno similarity index 100% rename from tests/backup/struct52.gno rename to gnovm/tests/backup/struct52.gno diff --git a/tests/backup/struct53.gno b/gnovm/tests/backup/struct53.gno similarity index 100% rename from tests/backup/struct53.gno rename to gnovm/tests/backup/struct53.gno diff --git a/tests/backup/struct55.gno b/gnovm/tests/backup/struct55.gno similarity index 100% rename from tests/backup/struct55.gno rename to gnovm/tests/backup/struct55.gno diff --git a/tests/backup/struct58.gno b/gnovm/tests/backup/struct58.gno similarity index 100% rename from tests/backup/struct58.gno rename to gnovm/tests/backup/struct58.gno diff --git a/tests/backup/tag0.gno b/gnovm/tests/backup/tag0.gno similarity index 100% rename from tests/backup/tag0.gno rename to gnovm/tests/backup/tag0.gno diff --git a/tests/backup/time10.gno b/gnovm/tests/backup/time10.gno similarity index 100% rename from tests/backup/time10.gno rename to gnovm/tests/backup/time10.gno diff --git a/tests/backup/time5.gno b/gnovm/tests/backup/time5.gno similarity index 100% rename from tests/backup/time5.gno rename to gnovm/tests/backup/time5.gno diff --git a/tests/backup/type10.gno b/gnovm/tests/backup/type10.gno similarity index 100% rename from tests/backup/type10.gno rename to gnovm/tests/backup/type10.gno diff --git a/tests/backup/type21.gno b/gnovm/tests/backup/type21.gno similarity index 100% rename from tests/backup/type21.gno rename to gnovm/tests/backup/type21.gno diff --git a/tests/backup/type23.gno b/gnovm/tests/backup/type23.gno similarity index 100% rename from tests/backup/type23.gno rename to gnovm/tests/backup/type23.gno diff --git a/tests/backup/type24.gno b/gnovm/tests/backup/type24.gno similarity index 100% rename from tests/backup/type24.gno rename to gnovm/tests/backup/type24.gno diff --git a/tests/backup/type25.gno b/gnovm/tests/backup/type25.gno similarity index 100% rename from tests/backup/type25.gno rename to gnovm/tests/backup/type25.gno diff --git a/tests/backup/type26.gno b/gnovm/tests/backup/type26.gno similarity index 100% rename from tests/backup/type26.gno rename to gnovm/tests/backup/type26.gno diff --git a/tests/backup/type4.gno b/gnovm/tests/backup/type4.gno similarity index 100% rename from tests/backup/type4.gno rename to gnovm/tests/backup/type4.gno diff --git a/tests/backup/type5.gno b/gnovm/tests/backup/type5.gno similarity index 100% rename from tests/backup/type5.gno rename to gnovm/tests/backup/type5.gno diff --git a/tests/backup/type6.gno b/gnovm/tests/backup/type6.gno similarity index 100% rename from tests/backup/type6.gno rename to gnovm/tests/backup/type6.gno diff --git a/tests/backup/type9.gno b/gnovm/tests/backup/type9.gno similarity index 100% rename from tests/backup/type9.gno rename to gnovm/tests/backup/type9.gno diff --git a/tests/backup/unsafe0.gno b/gnovm/tests/backup/unsafe0.gno similarity index 100% rename from tests/backup/unsafe0.gno rename to gnovm/tests/backup/unsafe0.gno diff --git a/tests/backup/unsafe1.gno b/gnovm/tests/backup/unsafe1.gno similarity index 100% rename from tests/backup/unsafe1.gno rename to gnovm/tests/backup/unsafe1.gno diff --git a/tests/backup/unsafe2.gno b/gnovm/tests/backup/unsafe2.gno similarity index 100% rename from tests/backup/unsafe2.gno rename to gnovm/tests/backup/unsafe2.gno diff --git a/tests/backup/unsafe3.gno b/gnovm/tests/backup/unsafe3.gno similarity index 100% rename from tests/backup/unsafe3.gno rename to gnovm/tests/backup/unsafe3.gno diff --git a/tests/backup/unsafe4.gno b/gnovm/tests/backup/unsafe4.gno similarity index 100% rename from tests/backup/unsafe4.gno rename to gnovm/tests/backup/unsafe4.gno diff --git a/tests/backup/unsafe5.gno b/gnovm/tests/backup/unsafe5.gno similarity index 100% rename from tests/backup/unsafe5.gno rename to gnovm/tests/backup/unsafe5.gno diff --git a/tests/backup/var8.gno b/gnovm/tests/backup/var8.gno similarity index 100% rename from tests/backup/var8.gno rename to gnovm/tests/backup/var8.gno diff --git a/tests/backup/variadic10.gno b/gnovm/tests/backup/variadic10.gno similarity index 100% rename from tests/backup/variadic10.gno rename to gnovm/tests/backup/variadic10.gno diff --git a/tests/backup/variadic7.gno b/gnovm/tests/backup/variadic7.gno similarity index 100% rename from tests/backup/variadic7.gno rename to gnovm/tests/backup/variadic7.gno diff --git a/tests/backup/variadic8.gno b/gnovm/tests/backup/variadic8.gno similarity index 100% rename from tests/backup/variadic8.gno rename to gnovm/tests/backup/variadic8.gno diff --git a/tests/challenges/composite0b.gno b/gnovm/tests/challenges/composite0b.gno similarity index 100% rename from tests/challenges/composite0b.gno rename to gnovm/tests/challenges/composite0b.gno diff --git a/tests/challenges/composite1b.gno b/gnovm/tests/challenges/composite1b.gno similarity index 100% rename from tests/challenges/composite1b.gno rename to gnovm/tests/challenges/composite1b.gno diff --git a/tests/file.go b/gnovm/tests/file.go similarity index 98% rename from tests/file.go rename to gnovm/tests/file.go index 33afbe38ebb..10eb0ddb62c 100644 --- a/tests/file.go +++ b/gnovm/tests/file.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/crypto" - gno "github.com/gnolang/gno/pkgs/gnolang" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/stdlibs" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/gnovm/stdlibs" + "github.com/gnolang/gno/tm2/pkg/crypto" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/std" ) type loggerFunc func(args ...interface{}) @@ -279,7 +279,7 @@ func RunFileTest(rootDir string, path string, opts ...RunFileTestOption) error { if pnc != nil { if tv, ok := pnc.(*gno.TypedValue); ok { panic(fmt.Sprintf("fail on %s: got unexpected error: %s", path, tv.Sprint(m))) - } else { // TODO: does this happen? + } else { // happens on 'unknown import path ...' panic(fmt.Sprintf("fail on %s: got unexpected error: %v", path, pnc)) } } diff --git a/tests/file_test.go b/gnovm/tests/file_test.go similarity index 93% rename from tests/file_test.go rename to gnovm/tests/file_test.go index 61c22ba7bab..f070546ab74 100644 --- a/tests/file_test.go +++ b/gnovm/tests/file_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - gno "github.com/gnolang/gno/pkgs/gnolang" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" ) var withSync = flag.Bool("update-golden-tests", false, "rewrite tests updating Realm: and Output: with new values where changed") @@ -94,7 +94,8 @@ func runFileTest(t *testing.T, path string, opts ...RunFileTestOption) { if gno.IsDebug() && testing.Verbose() { logger = t.Log } - err := RunFileTest("..", path, append(opts, WithLoggerFunc(logger))...) + rootDir := filepath.Join("..", "..") + err := RunFileTest(rootDir, path, append(opts, WithLoggerFunc(logger))...) if err != nil { t.Fatalf("got error: %v", err) } diff --git a/tests/files/a1.gno b/gnovm/tests/files/a1.gno similarity index 100% rename from tests/files/a1.gno rename to gnovm/tests/files/a1.gno diff --git a/tests/files/a10.gno b/gnovm/tests/files/a10.gno similarity index 100% rename from tests/files/a10.gno rename to gnovm/tests/files/a10.gno diff --git a/tests/files/a11.gno b/gnovm/tests/files/a11.gno similarity index 100% rename from tests/files/a11.gno rename to gnovm/tests/files/a11.gno diff --git a/tests/files/a12.gno b/gnovm/tests/files/a12.gno similarity index 100% rename from tests/files/a12.gno rename to gnovm/tests/files/a12.gno diff --git a/tests/files/a13.gno b/gnovm/tests/files/a13.gno similarity index 100% rename from tests/files/a13.gno rename to gnovm/tests/files/a13.gno diff --git a/tests/files/a14.gno b/gnovm/tests/files/a14.gno similarity index 100% rename from tests/files/a14.gno rename to gnovm/tests/files/a14.gno diff --git a/tests/files/a15.gno b/gnovm/tests/files/a15.gno similarity index 100% rename from tests/files/a15.gno rename to gnovm/tests/files/a15.gno diff --git a/tests/files/a16.gno b/gnovm/tests/files/a16.gno similarity index 100% rename from tests/files/a16.gno rename to gnovm/tests/files/a16.gno diff --git a/tests/files/a17.gno b/gnovm/tests/files/a17.gno similarity index 100% rename from tests/files/a17.gno rename to gnovm/tests/files/a17.gno diff --git a/tests/files/a18.gno b/gnovm/tests/files/a18.gno similarity index 100% rename from tests/files/a18.gno rename to gnovm/tests/files/a18.gno diff --git a/tests/files/a19.gno b/gnovm/tests/files/a19.gno similarity index 100% rename from tests/files/a19.gno rename to gnovm/tests/files/a19.gno diff --git a/tests/files/a2.gno b/gnovm/tests/files/a2.gno similarity index 100% rename from tests/files/a2.gno rename to gnovm/tests/files/a2.gno diff --git a/tests/files/a20.gno b/gnovm/tests/files/a20.gno similarity index 100% rename from tests/files/a20.gno rename to gnovm/tests/files/a20.gno diff --git a/tests/files/a21.gno b/gnovm/tests/files/a21.gno similarity index 100% rename from tests/files/a21.gno rename to gnovm/tests/files/a21.gno diff --git a/tests/files/a22.gno b/gnovm/tests/files/a22.gno similarity index 100% rename from tests/files/a22.gno rename to gnovm/tests/files/a22.gno diff --git a/tests/files/a23.gno b/gnovm/tests/files/a23.gno similarity index 100% rename from tests/files/a23.gno rename to gnovm/tests/files/a23.gno diff --git a/tests/files/a24.gno b/gnovm/tests/files/a24.gno similarity index 100% rename from tests/files/a24.gno rename to gnovm/tests/files/a24.gno diff --git a/tests/files/a25.gno b/gnovm/tests/files/a25.gno similarity index 100% rename from tests/files/a25.gno rename to gnovm/tests/files/a25.gno diff --git a/tests/files/a26.gno b/gnovm/tests/files/a26.gno similarity index 100% rename from tests/files/a26.gno rename to gnovm/tests/files/a26.gno diff --git a/tests/files/a27.gno b/gnovm/tests/files/a27.gno similarity index 100% rename from tests/files/a27.gno rename to gnovm/tests/files/a27.gno diff --git a/tests/files/a28.gno b/gnovm/tests/files/a28.gno similarity index 100% rename from tests/files/a28.gno rename to gnovm/tests/files/a28.gno diff --git a/tests/files/a29.gno b/gnovm/tests/files/a29.gno similarity index 100% rename from tests/files/a29.gno rename to gnovm/tests/files/a29.gno diff --git a/tests/files/a3.gno b/gnovm/tests/files/a3.gno similarity index 100% rename from tests/files/a3.gno rename to gnovm/tests/files/a3.gno diff --git a/tests/files/a30.gno b/gnovm/tests/files/a30.gno similarity index 100% rename from tests/files/a30.gno rename to gnovm/tests/files/a30.gno diff --git a/tests/files/a31.gno b/gnovm/tests/files/a31.gno similarity index 100% rename from tests/files/a31.gno rename to gnovm/tests/files/a31.gno diff --git a/tests/files/a32.gno b/gnovm/tests/files/a32.gno similarity index 100% rename from tests/files/a32.gno rename to gnovm/tests/files/a32.gno diff --git a/tests/files/a33.gno b/gnovm/tests/files/a33.gno similarity index 100% rename from tests/files/a33.gno rename to gnovm/tests/files/a33.gno diff --git a/tests/files/a34.gno b/gnovm/tests/files/a34.gno similarity index 100% rename from tests/files/a34.gno rename to gnovm/tests/files/a34.gno diff --git a/tests/files/a35.gno b/gnovm/tests/files/a35.gno similarity index 100% rename from tests/files/a35.gno rename to gnovm/tests/files/a35.gno diff --git a/tests/files/a36.gno b/gnovm/tests/files/a36.gno similarity index 100% rename from tests/files/a36.gno rename to gnovm/tests/files/a36.gno diff --git a/tests/files/a37.gno b/gnovm/tests/files/a37.gno similarity index 100% rename from tests/files/a37.gno rename to gnovm/tests/files/a37.gno diff --git a/tests/files/a38.gno b/gnovm/tests/files/a38.gno similarity index 100% rename from tests/files/a38.gno rename to gnovm/tests/files/a38.gno diff --git a/tests/files/a39.gno b/gnovm/tests/files/a39.gno similarity index 100% rename from tests/files/a39.gno rename to gnovm/tests/files/a39.gno diff --git a/tests/files/a4.gno b/gnovm/tests/files/a4.gno similarity index 100% rename from tests/files/a4.gno rename to gnovm/tests/files/a4.gno diff --git a/tests/files/a40.gno b/gnovm/tests/files/a40.gno similarity index 100% rename from tests/files/a40.gno rename to gnovm/tests/files/a40.gno diff --git a/tests/files/a41.gno b/gnovm/tests/files/a41.gno similarity index 100% rename from tests/files/a41.gno rename to gnovm/tests/files/a41.gno diff --git a/tests/files/a42.gno b/gnovm/tests/files/a42.gno similarity index 100% rename from tests/files/a42.gno rename to gnovm/tests/files/a42.gno diff --git a/tests/files/a43.gno b/gnovm/tests/files/a43.gno similarity index 100% rename from tests/files/a43.gno rename to gnovm/tests/files/a43.gno diff --git a/tests/files/a44.gno b/gnovm/tests/files/a44.gno similarity index 100% rename from tests/files/a44.gno rename to gnovm/tests/files/a44.gno diff --git a/tests/files/a45.gno b/gnovm/tests/files/a45.gno similarity index 100% rename from tests/files/a45.gno rename to gnovm/tests/files/a45.gno diff --git a/tests/files/a45a.gno b/gnovm/tests/files/a45a.gno similarity index 100% rename from tests/files/a45a.gno rename to gnovm/tests/files/a45a.gno diff --git a/tests/files/a46.gno b/gnovm/tests/files/a46.gno similarity index 100% rename from tests/files/a46.gno rename to gnovm/tests/files/a46.gno diff --git a/tests/files/a5.gno b/gnovm/tests/files/a5.gno similarity index 100% rename from tests/files/a5.gno rename to gnovm/tests/files/a5.gno diff --git a/tests/files/a6.gno b/gnovm/tests/files/a6.gno similarity index 100% rename from tests/files/a6.gno rename to gnovm/tests/files/a6.gno diff --git a/tests/files/a7.gno b/gnovm/tests/files/a7.gno similarity index 100% rename from tests/files/a7.gno rename to gnovm/tests/files/a7.gno diff --git a/tests/files/a8.gno b/gnovm/tests/files/a8.gno similarity index 100% rename from tests/files/a8.gno rename to gnovm/tests/files/a8.gno diff --git a/tests/files/a9.gno b/gnovm/tests/files/a9.gno similarity index 100% rename from tests/files/a9.gno rename to gnovm/tests/files/a9.gno diff --git a/tests/files/access0.gno b/gnovm/tests/files/access0.gno similarity index 100% rename from tests/files/access0.gno rename to gnovm/tests/files/access0.gno diff --git a/tests/files/access1.gno b/gnovm/tests/files/access1.gno similarity index 100% rename from tests/files/access1.gno rename to gnovm/tests/files/access1.gno diff --git a/tests/files/access2.gno b/gnovm/tests/files/access2.gno similarity index 100% rename from tests/files/access2.gno rename to gnovm/tests/files/access2.gno diff --git a/tests/files/access3.gno b/gnovm/tests/files/access3.gno similarity index 100% rename from tests/files/access3.gno rename to gnovm/tests/files/access3.gno diff --git a/tests/files/access4.gno b/gnovm/tests/files/access4.gno similarity index 100% rename from tests/files/access4.gno rename to gnovm/tests/files/access4.gno diff --git a/tests/files/access5.gno b/gnovm/tests/files/access5.gno similarity index 100% rename from tests/files/access5.gno rename to gnovm/tests/files/access5.gno diff --git a/tests/files/access6.gno b/gnovm/tests/files/access6.gno similarity index 100% rename from tests/files/access6.gno rename to gnovm/tests/files/access6.gno diff --git a/tests/files/access7.gno b/gnovm/tests/files/access7.gno similarity index 100% rename from tests/files/access7.gno rename to gnovm/tests/files/access7.gno diff --git a/tests/files/add0.gno b/gnovm/tests/files/add0.gno similarity index 100% rename from tests/files/add0.gno rename to gnovm/tests/files/add0.gno diff --git a/tests/files/add1.gno b/gnovm/tests/files/add1.gno similarity index 100% rename from tests/files/add1.gno rename to gnovm/tests/files/add1.gno diff --git a/tests/files/add2.gno b/gnovm/tests/files/add2.gno similarity index 100% rename from tests/files/add2.gno rename to gnovm/tests/files/add2.gno diff --git a/tests/files/addr0b_native.gno b/gnovm/tests/files/addr0b_native.gno similarity index 100% rename from tests/files/addr0b_native.gno rename to gnovm/tests/files/addr0b_native.gno diff --git a/tests/files/addr0b_stdlibs.gno b/gnovm/tests/files/addr0b_stdlibs.gno similarity index 100% rename from tests/files/addr0b_stdlibs.gno rename to gnovm/tests/files/addr0b_stdlibs.gno diff --git a/tests/files/addr1.gno b/gnovm/tests/files/addr1.gno similarity index 100% rename from tests/files/addr1.gno rename to gnovm/tests/files/addr1.gno diff --git a/tests/files/addr2b.gno b/gnovm/tests/files/addr2b.gno similarity index 100% rename from tests/files/addr2b.gno rename to gnovm/tests/files/addr2b.gno diff --git a/tests/files/alias0.gno b/gnovm/tests/files/alias0.gno similarity index 100% rename from tests/files/alias0.gno rename to gnovm/tests/files/alias0.gno diff --git a/tests/files/alias1.gno b/gnovm/tests/files/alias1.gno similarity index 100% rename from tests/files/alias1.gno rename to gnovm/tests/files/alias1.gno diff --git a/tests/files/and.gno b/gnovm/tests/files/and.gno similarity index 100% rename from tests/files/and.gno rename to gnovm/tests/files/and.gno diff --git a/tests/files/and0.gno b/gnovm/tests/files/and0.gno similarity index 100% rename from tests/files/and0.gno rename to gnovm/tests/files/and0.gno diff --git a/tests/files/and1.gno b/gnovm/tests/files/and1.gno similarity index 100% rename from tests/files/and1.gno rename to gnovm/tests/files/and1.gno diff --git a/tests/files/and2.gno b/gnovm/tests/files/and2.gno similarity index 100% rename from tests/files/and2.gno rename to gnovm/tests/files/and2.gno diff --git a/tests/files/and3.gno b/gnovm/tests/files/and3.gno similarity index 100% rename from tests/files/and3.gno rename to gnovm/tests/files/and3.gno diff --git a/tests/files/append0.gno b/gnovm/tests/files/append0.gno similarity index 100% rename from tests/files/append0.gno rename to gnovm/tests/files/append0.gno diff --git a/tests/files/append1.gno b/gnovm/tests/files/append1.gno similarity index 100% rename from tests/files/append1.gno rename to gnovm/tests/files/append1.gno diff --git a/tests/files/append2.gno b/gnovm/tests/files/append2.gno similarity index 100% rename from tests/files/append2.gno rename to gnovm/tests/files/append2.gno diff --git a/tests/files/append3.gno b/gnovm/tests/files/append3.gno similarity index 100% rename from tests/files/append3.gno rename to gnovm/tests/files/append3.gno diff --git a/tests/files/append4.gno b/gnovm/tests/files/append4.gno similarity index 100% rename from tests/files/append4.gno rename to gnovm/tests/files/append4.gno diff --git a/tests/files/assign.gno b/gnovm/tests/files/assign.gno similarity index 100% rename from tests/files/assign.gno rename to gnovm/tests/files/assign.gno diff --git a/tests/files/assign0b_native.gno b/gnovm/tests/files/assign0b_native.gno similarity index 100% rename from tests/files/assign0b_native.gno rename to gnovm/tests/files/assign0b_native.gno diff --git a/tests/files/assign0b_stdlibs.gno b/gnovm/tests/files/assign0b_stdlibs.gno similarity index 100% rename from tests/files/assign0b_stdlibs.gno rename to gnovm/tests/files/assign0b_stdlibs.gno diff --git a/tests/files/assign1.gno b/gnovm/tests/files/assign1.gno similarity index 100% rename from tests/files/assign1.gno rename to gnovm/tests/files/assign1.gno diff --git a/tests/files/assign10.gno b/gnovm/tests/files/assign10.gno similarity index 100% rename from tests/files/assign10.gno rename to gnovm/tests/files/assign10.gno diff --git a/tests/files/assign11.gno b/gnovm/tests/files/assign11.gno similarity index 100% rename from tests/files/assign11.gno rename to gnovm/tests/files/assign11.gno diff --git a/tests/files/assign12.gno b/gnovm/tests/files/assign12.gno similarity index 100% rename from tests/files/assign12.gno rename to gnovm/tests/files/assign12.gno diff --git a/tests/files/assign16.gno b/gnovm/tests/files/assign16.gno similarity index 100% rename from tests/files/assign16.gno rename to gnovm/tests/files/assign16.gno diff --git a/tests/files/assign2.gno b/gnovm/tests/files/assign2.gno similarity index 100% rename from tests/files/assign2.gno rename to gnovm/tests/files/assign2.gno diff --git a/tests/files/assign20.gno b/gnovm/tests/files/assign20.gno similarity index 100% rename from tests/files/assign20.gno rename to gnovm/tests/files/assign20.gno diff --git a/tests/files/assign21.gno b/gnovm/tests/files/assign21.gno similarity index 100% rename from tests/files/assign21.gno rename to gnovm/tests/files/assign21.gno diff --git a/tests/files/assign3.gno b/gnovm/tests/files/assign3.gno similarity index 100% rename from tests/files/assign3.gno rename to gnovm/tests/files/assign3.gno diff --git a/tests/files/assign4.gno b/gnovm/tests/files/assign4.gno similarity index 100% rename from tests/files/assign4.gno rename to gnovm/tests/files/assign4.gno diff --git a/tests/files/assign5.gno b/gnovm/tests/files/assign5.gno similarity index 100% rename from tests/files/assign5.gno rename to gnovm/tests/files/assign5.gno diff --git a/tests/files/assign8.gno b/gnovm/tests/files/assign8.gno similarity index 100% rename from tests/files/assign8.gno rename to gnovm/tests/files/assign8.gno diff --git a/tests/files/assign9.gno b/gnovm/tests/files/assign9.gno similarity index 100% rename from tests/files/assign9.gno rename to gnovm/tests/files/assign9.gno diff --git a/tests/files/avl0.gno b/gnovm/tests/files/avl0.gno similarity index 100% rename from tests/files/avl0.gno rename to gnovm/tests/files/avl0.gno diff --git a/tests/files/avl1.gno b/gnovm/tests/files/avl1.gno similarity index 100% rename from tests/files/avl1.gno rename to gnovm/tests/files/avl1.gno diff --git a/tests/files/bin.gno b/gnovm/tests/files/bin.gno similarity index 100% rename from tests/files/bin.gno rename to gnovm/tests/files/bin.gno diff --git a/tests/files/bin0.gno b/gnovm/tests/files/bin0.gno similarity index 100% rename from tests/files/bin0.gno rename to gnovm/tests/files/bin0.gno diff --git a/tests/files/bin1.gno b/gnovm/tests/files/bin1.gno similarity index 100% rename from tests/files/bin1.gno rename to gnovm/tests/files/bin1.gno diff --git a/tests/files/bin3.gno b/gnovm/tests/files/bin3.gno similarity index 100% rename from tests/files/bin3.gno rename to gnovm/tests/files/bin3.gno diff --git a/tests/files/bin4.gno b/gnovm/tests/files/bin4.gno similarity index 100% rename from tests/files/bin4.gno rename to gnovm/tests/files/bin4.gno diff --git a/tests/files/bin5.gno b/gnovm/tests/files/bin5.gno similarity index 100% rename from tests/files/bin5.gno rename to gnovm/tests/files/bin5.gno diff --git a/tests/files/binstruct_ptr_map0.gno b/gnovm/tests/files/binstruct_ptr_map0.gno similarity index 100% rename from tests/files/binstruct_ptr_map0.gno rename to gnovm/tests/files/binstruct_ptr_map0.gno diff --git a/tests/files/binstruct_ptr_slice0.gno b/gnovm/tests/files/binstruct_ptr_slice0.gno similarity index 100% rename from tests/files/binstruct_ptr_slice0.gno rename to gnovm/tests/files/binstruct_ptr_slice0.gno diff --git a/tests/files/binstruct_slice0.gno b/gnovm/tests/files/binstruct_slice0.gno similarity index 100% rename from tests/files/binstruct_slice0.gno rename to gnovm/tests/files/binstruct_slice0.gno diff --git a/tests/files/bltn.gno b/gnovm/tests/files/bltn.gno similarity index 100% rename from tests/files/bltn.gno rename to gnovm/tests/files/bltn.gno diff --git a/tests/files/bltn0.gno b/gnovm/tests/files/bltn0.gno similarity index 100% rename from tests/files/bltn0.gno rename to gnovm/tests/files/bltn0.gno diff --git a/tests/files/bool.gno b/gnovm/tests/files/bool.gno similarity index 100% rename from tests/files/bool.gno rename to gnovm/tests/files/bool.gno diff --git a/tests/files/bool0.gno b/gnovm/tests/files/bool0.gno similarity index 100% rename from tests/files/bool0.gno rename to gnovm/tests/files/bool0.gno diff --git a/tests/files/bool1.gno b/gnovm/tests/files/bool1.gno similarity index 100% rename from tests/files/bool1.gno rename to gnovm/tests/files/bool1.gno diff --git a/tests/files/bool2.gno b/gnovm/tests/files/bool2.gno similarity index 100% rename from tests/files/bool2.gno rename to gnovm/tests/files/bool2.gno diff --git a/tests/files/bool3.gno b/gnovm/tests/files/bool3.gno similarity index 100% rename from tests/files/bool3.gno rename to gnovm/tests/files/bool3.gno diff --git a/tests/files/bool4.gno b/gnovm/tests/files/bool4.gno similarity index 100% rename from tests/files/bool4.gno rename to gnovm/tests/files/bool4.gno diff --git a/tests/files/bool5.gno b/gnovm/tests/files/bool5.gno similarity index 100% rename from tests/files/bool5.gno rename to gnovm/tests/files/bool5.gno diff --git a/tests/files/build0.gno b/gnovm/tests/files/build0.gno similarity index 100% rename from tests/files/build0.gno rename to gnovm/tests/files/build0.gno diff --git a/tests/files/cap0.gno b/gnovm/tests/files/cap0.gno similarity index 100% rename from tests/files/cap0.gno rename to gnovm/tests/files/cap0.gno diff --git a/tests/files/closure0.gno b/gnovm/tests/files/closure0.gno similarity index 100% rename from tests/files/closure0.gno rename to gnovm/tests/files/closure0.gno diff --git a/tests/files/closure1.gno b/gnovm/tests/files/closure1.gno similarity index 100% rename from tests/files/closure1.gno rename to gnovm/tests/files/closure1.gno diff --git a/tests/files/closure2.gno b/gnovm/tests/files/closure2.gno similarity index 100% rename from tests/files/closure2.gno rename to gnovm/tests/files/closure2.gno diff --git a/tests/files/closure3.gno b/gnovm/tests/files/closure3.gno similarity index 100% rename from tests/files/closure3.gno rename to gnovm/tests/files/closure3.gno diff --git a/tests/files/closure4.gno b/gnovm/tests/files/closure4.gno similarity index 100% rename from tests/files/closure4.gno rename to gnovm/tests/files/closure4.gno diff --git a/tests/files/closure5.gno b/gnovm/tests/files/closure5.gno similarity index 100% rename from tests/files/closure5.gno rename to gnovm/tests/files/closure5.gno diff --git a/tests/files/closure6.gno b/gnovm/tests/files/closure6.gno similarity index 100% rename from tests/files/closure6.gno rename to gnovm/tests/files/closure6.gno diff --git a/tests/files/closure7.gno b/gnovm/tests/files/closure7.gno similarity index 100% rename from tests/files/closure7.gno rename to gnovm/tests/files/closure7.gno diff --git a/tests/files/closure8.gno b/gnovm/tests/files/closure8.gno similarity index 100% rename from tests/files/closure8.gno rename to gnovm/tests/files/closure8.gno diff --git a/tests/files/comp1.gno b/gnovm/tests/files/comp1.gno similarity index 100% rename from tests/files/comp1.gno rename to gnovm/tests/files/comp1.gno diff --git a/tests/files/comp2.gno b/gnovm/tests/files/comp2.gno similarity index 100% rename from tests/files/comp2.gno rename to gnovm/tests/files/comp2.gno diff --git a/tests/files/composite0.gno b/gnovm/tests/files/composite0.gno similarity index 100% rename from tests/files/composite0.gno rename to gnovm/tests/files/composite0.gno diff --git a/tests/files/composite1.gno b/gnovm/tests/files/composite1.gno similarity index 100% rename from tests/files/composite1.gno rename to gnovm/tests/files/composite1.gno diff --git a/tests/files/composite10.gno b/gnovm/tests/files/composite10.gno similarity index 100% rename from tests/files/composite10.gno rename to gnovm/tests/files/composite10.gno diff --git a/tests/files/composite11.gno b/gnovm/tests/files/composite11.gno similarity index 100% rename from tests/files/composite11.gno rename to gnovm/tests/files/composite11.gno diff --git a/tests/files/composite12.gno b/gnovm/tests/files/composite12.gno similarity index 100% rename from tests/files/composite12.gno rename to gnovm/tests/files/composite12.gno diff --git a/tests/files/composite13.gno b/gnovm/tests/files/composite13.gno similarity index 100% rename from tests/files/composite13.gno rename to gnovm/tests/files/composite13.gno diff --git a/tests/files/composite14.gno b/gnovm/tests/files/composite14.gno similarity index 100% rename from tests/files/composite14.gno rename to gnovm/tests/files/composite14.gno diff --git a/tests/files/composite15.gno b/gnovm/tests/files/composite15.gno similarity index 100% rename from tests/files/composite15.gno rename to gnovm/tests/files/composite15.gno diff --git a/tests/files/composite16.gno b/gnovm/tests/files/composite16.gno similarity index 100% rename from tests/files/composite16.gno rename to gnovm/tests/files/composite16.gno diff --git a/tests/files/composite17.gno b/gnovm/tests/files/composite17.gno similarity index 100% rename from tests/files/composite17.gno rename to gnovm/tests/files/composite17.gno diff --git a/tests/files/composite2.gno b/gnovm/tests/files/composite2.gno similarity index 100% rename from tests/files/composite2.gno rename to gnovm/tests/files/composite2.gno diff --git a/tests/files/composite3.gno b/gnovm/tests/files/composite3.gno similarity index 100% rename from tests/files/composite3.gno rename to gnovm/tests/files/composite3.gno diff --git a/tests/files/composite4.gno b/gnovm/tests/files/composite4.gno similarity index 100% rename from tests/files/composite4.gno rename to gnovm/tests/files/composite4.gno diff --git a/tests/files/composite5.gno b/gnovm/tests/files/composite5.gno similarity index 100% rename from tests/files/composite5.gno rename to gnovm/tests/files/composite5.gno diff --git a/tests/files/composite6.gno b/gnovm/tests/files/composite6.gno similarity index 100% rename from tests/files/composite6.gno rename to gnovm/tests/files/composite6.gno diff --git a/tests/files/composite7.gno b/gnovm/tests/files/composite7.gno similarity index 100% rename from tests/files/composite7.gno rename to gnovm/tests/files/composite7.gno diff --git a/tests/files/composite8.gno b/gnovm/tests/files/composite8.gno similarity index 100% rename from tests/files/composite8.gno rename to gnovm/tests/files/composite8.gno diff --git a/tests/files/composite8bis.gno b/gnovm/tests/files/composite8bis.gno similarity index 100% rename from tests/files/composite8bis.gno rename to gnovm/tests/files/composite8bis.gno diff --git a/tests/files/composite9.gno b/gnovm/tests/files/composite9.gno similarity index 100% rename from tests/files/composite9.gno rename to gnovm/tests/files/composite9.gno diff --git a/tests/files/const0.gno b/gnovm/tests/files/const0.gno similarity index 100% rename from tests/files/const0.gno rename to gnovm/tests/files/const0.gno diff --git a/tests/files/const1.gno b/gnovm/tests/files/const1.gno similarity index 100% rename from tests/files/const1.gno rename to gnovm/tests/files/const1.gno diff --git a/tests/files/const10.gno b/gnovm/tests/files/const10.gno similarity index 100% rename from tests/files/const10.gno rename to gnovm/tests/files/const10.gno diff --git a/tests/files/const11.gno b/gnovm/tests/files/const11.gno similarity index 100% rename from tests/files/const11.gno rename to gnovm/tests/files/const11.gno diff --git a/tests/files/const12.gno b/gnovm/tests/files/const12.gno similarity index 100% rename from tests/files/const12.gno rename to gnovm/tests/files/const12.gno diff --git a/tests/files/const13.gno b/gnovm/tests/files/const13.gno similarity index 100% rename from tests/files/const13.gno rename to gnovm/tests/files/const13.gno diff --git a/tests/files/const14.gno b/gnovm/tests/files/const14.gno similarity index 100% rename from tests/files/const14.gno rename to gnovm/tests/files/const14.gno diff --git a/tests/files/const15.gno b/gnovm/tests/files/const15.gno similarity index 100% rename from tests/files/const15.gno rename to gnovm/tests/files/const15.gno diff --git a/tests/files/const16.gno b/gnovm/tests/files/const16.gno similarity index 100% rename from tests/files/const16.gno rename to gnovm/tests/files/const16.gno diff --git a/tests/files/const17.gno b/gnovm/tests/files/const17.gno similarity index 100% rename from tests/files/const17.gno rename to gnovm/tests/files/const17.gno diff --git a/tests/files/const18.gno b/gnovm/tests/files/const18.gno similarity index 100% rename from tests/files/const18.gno rename to gnovm/tests/files/const18.gno diff --git a/tests/files/const19.gno b/gnovm/tests/files/const19.gno similarity index 100% rename from tests/files/const19.gno rename to gnovm/tests/files/const19.gno diff --git a/tests/files/const2.gno b/gnovm/tests/files/const2.gno similarity index 100% rename from tests/files/const2.gno rename to gnovm/tests/files/const2.gno diff --git a/tests/files/const20.gno b/gnovm/tests/files/const20.gno similarity index 100% rename from tests/files/const20.gno rename to gnovm/tests/files/const20.gno diff --git a/tests/files/const21.gno b/gnovm/tests/files/const21.gno similarity index 100% rename from tests/files/const21.gno rename to gnovm/tests/files/const21.gno diff --git a/tests/files/const22.gno b/gnovm/tests/files/const22.gno similarity index 100% rename from tests/files/const22.gno rename to gnovm/tests/files/const22.gno diff --git a/tests/files/const3.gno b/gnovm/tests/files/const3.gno similarity index 100% rename from tests/files/const3.gno rename to gnovm/tests/files/const3.gno diff --git a/tests/files/const4.gno b/gnovm/tests/files/const4.gno similarity index 100% rename from tests/files/const4.gno rename to gnovm/tests/files/const4.gno diff --git a/tests/files/const5.gno b/gnovm/tests/files/const5.gno similarity index 100% rename from tests/files/const5.gno rename to gnovm/tests/files/const5.gno diff --git a/tests/files/const6.gno b/gnovm/tests/files/const6.gno similarity index 100% rename from tests/files/const6.gno rename to gnovm/tests/files/const6.gno diff --git a/tests/files/const7.gno b/gnovm/tests/files/const7.gno similarity index 100% rename from tests/files/const7.gno rename to gnovm/tests/files/const7.gno diff --git a/tests/files/const8.gno b/gnovm/tests/files/const8.gno similarity index 100% rename from tests/files/const8.gno rename to gnovm/tests/files/const8.gno diff --git a/tests/files/const9.gno b/gnovm/tests/files/const9.gno similarity index 100% rename from tests/files/const9.gno rename to gnovm/tests/files/const9.gno diff --git a/tests/files/cont.gno b/gnovm/tests/files/cont.gno similarity index 100% rename from tests/files/cont.gno rename to gnovm/tests/files/cont.gno diff --git a/tests/files/cont0.gno b/gnovm/tests/files/cont0.gno similarity index 100% rename from tests/files/cont0.gno rename to gnovm/tests/files/cont0.gno diff --git a/tests/files/cont1.gno b/gnovm/tests/files/cont1.gno similarity index 100% rename from tests/files/cont1.gno rename to gnovm/tests/files/cont1.gno diff --git a/tests/files/context.gno b/gnovm/tests/files/context.gno similarity index 100% rename from tests/files/context.gno rename to gnovm/tests/files/context.gno diff --git a/tests/files/context2.gno b/gnovm/tests/files/context2.gno similarity index 100% rename from tests/files/context2.gno rename to gnovm/tests/files/context2.gno diff --git a/tests/files/convert0.gno b/gnovm/tests/files/convert0.gno similarity index 100% rename from tests/files/convert0.gno rename to gnovm/tests/files/convert0.gno diff --git a/tests/files/convert1.gno b/gnovm/tests/files/convert1.gno similarity index 100% rename from tests/files/convert1.gno rename to gnovm/tests/files/convert1.gno diff --git a/tests/files/convert3.gno b/gnovm/tests/files/convert3.gno similarity index 100% rename from tests/files/convert3.gno rename to gnovm/tests/files/convert3.gno diff --git a/tests/files/copy0.gno b/gnovm/tests/files/copy0.gno similarity index 100% rename from tests/files/copy0.gno rename to gnovm/tests/files/copy0.gno diff --git a/tests/files/copy1.gno b/gnovm/tests/files/copy1.gno similarity index 100% rename from tests/files/copy1.gno rename to gnovm/tests/files/copy1.gno diff --git a/tests/files/copy2.gno b/gnovm/tests/files/copy2.gno similarity index 100% rename from tests/files/copy2.gno rename to gnovm/tests/files/copy2.gno diff --git a/tests/files/defer0.gno b/gnovm/tests/files/defer0.gno similarity index 100% rename from tests/files/defer0.gno rename to gnovm/tests/files/defer0.gno diff --git a/tests/files/defer1.gno b/gnovm/tests/files/defer1.gno similarity index 100% rename from tests/files/defer1.gno rename to gnovm/tests/files/defer1.gno diff --git a/tests/files/defer2.gno b/gnovm/tests/files/defer2.gno similarity index 100% rename from tests/files/defer2.gno rename to gnovm/tests/files/defer2.gno diff --git a/tests/files/defer3.gno b/gnovm/tests/files/defer3.gno similarity index 100% rename from tests/files/defer3.gno rename to gnovm/tests/files/defer3.gno diff --git a/tests/files/defer4.gno b/gnovm/tests/files/defer4.gno similarity index 100% rename from tests/files/defer4.gno rename to gnovm/tests/files/defer4.gno diff --git a/tests/files/defer5.gno b/gnovm/tests/files/defer5.gno similarity index 100% rename from tests/files/defer5.gno rename to gnovm/tests/files/defer5.gno diff --git a/tests/files/defer6.gno b/gnovm/tests/files/defer6.gno similarity index 100% rename from tests/files/defer6.gno rename to gnovm/tests/files/defer6.gno diff --git a/tests/files/defer7.gno b/gnovm/tests/files/defer7.gno similarity index 100% rename from tests/files/defer7.gno rename to gnovm/tests/files/defer7.gno diff --git a/tests/files/defer8.gno b/gnovm/tests/files/defer8.gno similarity index 100% rename from tests/files/defer8.gno rename to gnovm/tests/files/defer8.gno diff --git a/tests/files/define0.gno b/gnovm/tests/files/define0.gno similarity index 100% rename from tests/files/define0.gno rename to gnovm/tests/files/define0.gno diff --git a/tests/files/define1.gno b/gnovm/tests/files/define1.gno similarity index 100% rename from tests/files/define1.gno rename to gnovm/tests/files/define1.gno diff --git a/tests/files/define2.gno b/gnovm/tests/files/define2.gno similarity index 100% rename from tests/files/define2.gno rename to gnovm/tests/files/define2.gno diff --git a/tests/files/define3.gno b/gnovm/tests/files/define3.gno similarity index 100% rename from tests/files/define3.gno rename to gnovm/tests/files/define3.gno diff --git a/tests/files/define4.gno b/gnovm/tests/files/define4.gno similarity index 100% rename from tests/files/define4.gno rename to gnovm/tests/files/define4.gno diff --git a/tests/files/delete0.gno b/gnovm/tests/files/delete0.gno similarity index 100% rename from tests/files/delete0.gno rename to gnovm/tests/files/delete0.gno diff --git a/tests/files/errors.gno b/gnovm/tests/files/errors.gno similarity index 100% rename from tests/files/errors.gno rename to gnovm/tests/files/errors.gno diff --git a/tests/files/extern/b1/foo/foo.gno b/gnovm/tests/files/extern/b1/foo/foo.gno similarity index 100% rename from tests/files/extern/b1/foo/foo.gno rename to gnovm/tests/files/extern/b1/foo/foo.gno diff --git a/tests/files/extern/b2/foo/foo.gno b/gnovm/tests/files/extern/b2/foo/foo.gno similarity index 100% rename from tests/files/extern/b2/foo/foo.gno rename to gnovm/tests/files/extern/b2/foo/foo.gno diff --git a/tests/files/extern/bar/quux.gno b/gnovm/tests/files/extern/bar/quux.gno similarity index 100% rename from tests/files/extern/bar/quux.gno rename to gnovm/tests/files/extern/bar/quux.gno diff --git a/tests/files/extern/baz-bat/baz-bat.gno b/gnovm/tests/files/extern/baz-bat/baz-bat.gno similarity index 100% rename from tests/files/extern/baz-bat/baz-bat.gno rename to gnovm/tests/files/extern/baz-bat/baz-bat.gno diff --git a/tests/files/extern/baz/quux.gno b/gnovm/tests/files/extern/baz/quux.gno similarity index 100% rename from tests/files/extern/baz/quux.gno rename to gnovm/tests/files/extern/baz/quux.gno diff --git a/tests/files/extern/c1/c1.gno b/gnovm/tests/files/extern/c1/c1.gno similarity index 100% rename from tests/files/extern/c1/c1.gno rename to gnovm/tests/files/extern/c1/c1.gno diff --git a/tests/files/extern/c2/c2.gno b/gnovm/tests/files/extern/c2/c2.gno similarity index 100% rename from tests/files/extern/c2/c2.gno rename to gnovm/tests/files/extern/c2/c2.gno diff --git a/tests/files/extern/context/context.gno b/gnovm/tests/files/extern/context/context.gno similarity index 100% rename from tests/files/extern/context/context.gno rename to gnovm/tests/files/extern/context/context.gno diff --git a/tests/files/extern/ct/ct1.gno b/gnovm/tests/files/extern/ct/ct1.gno similarity index 100% rename from tests/files/extern/ct/ct1.gno rename to gnovm/tests/files/extern/ct/ct1.gno diff --git a/tests/files/extern/ct/ct2.gno b/gnovm/tests/files/extern/ct/ct2.gno similarity index 100% rename from tests/files/extern/ct/ct2.gno rename to gnovm/tests/files/extern/ct/ct2.gno diff --git a/tests/files/extern/ct/ct3.gno b/gnovm/tests/files/extern/ct/ct3.gno similarity index 100% rename from tests/files/extern/ct/ct3.gno rename to gnovm/tests/files/extern/ct/ct3.gno diff --git a/tests/files/extern/ct1/ct1.gno b/gnovm/tests/files/extern/ct1/ct1.gno similarity index 100% rename from tests/files/extern/ct1/ct1.gno rename to gnovm/tests/files/extern/ct1/ct1.gno diff --git a/tests/files/extern/foo-bar/foo-bar.gno b/gnovm/tests/files/extern/foo-bar/foo-bar.gno similarity index 100% rename from tests/files/extern/foo-bar/foo-bar.gno rename to gnovm/tests/files/extern/foo-bar/foo-bar.gno diff --git a/tests/files/extern/foo/bar.gno b/gnovm/tests/files/extern/foo/bar.gno similarity index 100% rename from tests/files/extern/foo/bar.gno rename to gnovm/tests/files/extern/foo/bar.gno diff --git a/tests/files/extern/foo/bir.gno b/gnovm/tests/files/extern/foo/bir.gno similarity index 100% rename from tests/files/extern/foo/bir.gno rename to gnovm/tests/files/extern/foo/bir.gno diff --git a/tests/files/extern/foo/boo/boo.gno b/gnovm/tests/files/extern/foo/boo/boo.gno similarity index 100% rename from tests/files/extern/foo/boo/boo.gno rename to gnovm/tests/files/extern/foo/boo/boo.gno diff --git a/tests/files/extern/m1/main.gno b/gnovm/tests/files/extern/m1/main.gno similarity index 100% rename from tests/files/extern/m1/main.gno rename to gnovm/tests/files/extern/m1/main.gno diff --git a/tests/files/extern/m1/main_test.gno b/gnovm/tests/files/extern/m1/main_test.gno similarity index 100% rename from tests/files/extern/m1/main_test.gno rename to gnovm/tests/files/extern/m1/main_test.gno diff --git a/tests/files/extern/m2/m2_test.gno b/gnovm/tests/files/extern/m2/m2_test.gno similarity index 100% rename from tests/files/extern/m2/m2_test.gno rename to gnovm/tests/files/extern/m2/m2_test.gno diff --git a/tests/files/extern/net/http/http.gno b/gnovm/tests/files/extern/net/http/http.gno similarity index 100% rename from tests/files/extern/net/http/http.gno rename to gnovm/tests/files/extern/net/http/http.gno diff --git a/tests/files/extern/net/http/httptest/httptest.gno b/gnovm/tests/files/extern/net/http/httptest/httptest.gno similarity index 100% rename from tests/files/extern/net/http/httptest/httptest.gno rename to gnovm/tests/files/extern/net/http/httptest/httptest.gno diff --git a/tests/files/extern/net/net.gno b/gnovm/tests/files/extern/net/net.gno similarity index 100% rename from tests/files/extern/net/net.gno rename to gnovm/tests/files/extern/net/net.gno diff --git a/tests/files/extern/net/url/url.gno b/gnovm/tests/files/extern/net/url/url.gno similarity index 100% rename from tests/files/extern/net/url/url.gno rename to gnovm/tests/files/extern/net/url/url.gno diff --git a/tests/files/extern/p1/s1.gno b/gnovm/tests/files/extern/p1/s1.gno similarity index 100% rename from tests/files/extern/p1/s1.gno rename to gnovm/tests/files/extern/p1/s1.gno diff --git a/tests/files/extern/p1/s2.gno b/gnovm/tests/files/extern/p1/s2.gno similarity index 100% rename from tests/files/extern/p1/s2.gno rename to gnovm/tests/files/extern/p1/s2.gno diff --git a/tests/files/extern/tata/tutu.gno b/gnovm/tests/files/extern/tata/tutu.gno similarity index 100% rename from tests/files/extern/tata/tutu.gno rename to gnovm/tests/files/extern/tata/tutu.gno diff --git a/tests/files/extern/time/time.gno b/gnovm/tests/files/extern/time/time.gno similarity index 100% rename from tests/files/extern/time/time.gno rename to gnovm/tests/files/extern/time/time.gno diff --git a/tests/files/extern/timtadh/data-structures/tree/avl/avltree.gno b/gnovm/tests/files/extern/timtadh/data-structures/tree/avl/avltree.gno similarity index 100% rename from tests/files/extern/timtadh/data-structures/tree/avl/avltree.gno rename to gnovm/tests/files/extern/timtadh/data-structures/tree/avl/avltree.gno diff --git a/tests/files/extern/timtadh/data-structures/tree/utils.gno b/gnovm/tests/files/extern/timtadh/data-structures/tree/utils.gno similarity index 100% rename from tests/files/extern/timtadh/data-structures/tree/utils.gno rename to gnovm/tests/files/extern/timtadh/data-structures/tree/utils.gno diff --git a/tests/files/extern/timtadh/data-structures/types/map_entry.gno b/gnovm/tests/files/extern/timtadh/data-structures/types/map_entry.gno similarity index 100% rename from tests/files/extern/timtadh/data-structures/types/map_entry.gno rename to gnovm/tests/files/extern/timtadh/data-structures/types/map_entry.gno diff --git a/tests/files/extern/timtadh/data-structures/types/string.gno b/gnovm/tests/files/extern/timtadh/data-structures/types/string.gno similarity index 100% rename from tests/files/extern/timtadh/data-structures/types/string.gno rename to gnovm/tests/files/extern/timtadh/data-structures/types/string.gno diff --git a/tests/files/extern/timtadh/data-structures/types/types.gno b/gnovm/tests/files/extern/timtadh/data-structures/types/types.gno similarity index 100% rename from tests/files/extern/timtadh/data-structures/types/types.gno rename to gnovm/tests/files/extern/timtadh/data-structures/types/types.gno diff --git a/tests/files/extern/timtadh/data-structures/types/util.gno b/gnovm/tests/files/extern/timtadh/data-structures/types/util.gno similarity index 100% rename from tests/files/extern/timtadh/data-structures/types/util.gno rename to gnovm/tests/files/extern/timtadh/data-structures/types/util.gno diff --git a/tests/files/extern/toto/titi.gno b/gnovm/tests/files/extern/toto/titi.gno similarity index 100% rename from tests/files/extern/toto/titi.gno rename to gnovm/tests/files/extern/toto/titi.gno diff --git a/tests/files/extern/vars/first.gno b/gnovm/tests/files/extern/vars/first.gno similarity index 100% rename from tests/files/extern/vars/first.gno rename to gnovm/tests/files/extern/vars/first.gno diff --git a/tests/files/extern/vars/second.gno b/gnovm/tests/files/extern/vars/second.gno similarity index 100% rename from tests/files/extern/vars/second.gno rename to gnovm/tests/files/extern/vars/second.gno diff --git a/tests/files/fib0.gno b/gnovm/tests/files/fib0.gno similarity index 100% rename from tests/files/fib0.gno rename to gnovm/tests/files/fib0.gno diff --git a/tests/files/float0.gno b/gnovm/tests/files/float0.gno similarity index 100% rename from tests/files/float0.gno rename to gnovm/tests/files/float0.gno diff --git a/tests/files/float1.gno b/gnovm/tests/files/float1.gno similarity index 100% rename from tests/files/float1.gno rename to gnovm/tests/files/float1.gno diff --git a/tests/files/float2.gno b/gnovm/tests/files/float2.gno similarity index 100% rename from tests/files/float2.gno rename to gnovm/tests/files/float2.gno diff --git a/tests/files/float3.gno b/gnovm/tests/files/float3.gno similarity index 100% rename from tests/files/float3.gno rename to gnovm/tests/files/float3.gno diff --git a/tests/files/float4.gno b/gnovm/tests/files/float4.gno similarity index 100% rename from tests/files/float4.gno rename to gnovm/tests/files/float4.gno diff --git a/tests/files/float5_native.gno b/gnovm/tests/files/float5_native.gno similarity index 100% rename from tests/files/float5_native.gno rename to gnovm/tests/files/float5_native.gno diff --git a/tests/files/float5_stdlibs.gno b/gnovm/tests/files/float5_stdlibs.gno similarity index 100% rename from tests/files/float5_stdlibs.gno rename to gnovm/tests/files/float5_stdlibs.gno diff --git a/tests/files/for0.gno b/gnovm/tests/files/for0.gno similarity index 100% rename from tests/files/for0.gno rename to gnovm/tests/files/for0.gno diff --git a/tests/files/for1.gno b/gnovm/tests/files/for1.gno similarity index 100% rename from tests/files/for1.gno rename to gnovm/tests/files/for1.gno diff --git a/tests/files/for10.gno b/gnovm/tests/files/for10.gno similarity index 100% rename from tests/files/for10.gno rename to gnovm/tests/files/for10.gno diff --git a/tests/files/for11.gno b/gnovm/tests/files/for11.gno similarity index 100% rename from tests/files/for11.gno rename to gnovm/tests/files/for11.gno diff --git a/tests/files/for12.gno b/gnovm/tests/files/for12.gno similarity index 100% rename from tests/files/for12.gno rename to gnovm/tests/files/for12.gno diff --git a/tests/files/for13.gno b/gnovm/tests/files/for13.gno similarity index 100% rename from tests/files/for13.gno rename to gnovm/tests/files/for13.gno diff --git a/tests/files/for14.gno b/gnovm/tests/files/for14.gno similarity index 100% rename from tests/files/for14.gno rename to gnovm/tests/files/for14.gno diff --git a/tests/files/for15.gno b/gnovm/tests/files/for15.gno similarity index 100% rename from tests/files/for15.gno rename to gnovm/tests/files/for15.gno diff --git a/tests/files/for16.gno b/gnovm/tests/files/for16.gno similarity index 100% rename from tests/files/for16.gno rename to gnovm/tests/files/for16.gno diff --git a/tests/files/for17.gno b/gnovm/tests/files/for17.gno similarity index 100% rename from tests/files/for17.gno rename to gnovm/tests/files/for17.gno diff --git a/tests/files/for18.gno b/gnovm/tests/files/for18.gno similarity index 100% rename from tests/files/for18.gno rename to gnovm/tests/files/for18.gno diff --git a/tests/files/for2.gno b/gnovm/tests/files/for2.gno similarity index 100% rename from tests/files/for2.gno rename to gnovm/tests/files/for2.gno diff --git a/tests/files/for3.gno b/gnovm/tests/files/for3.gno similarity index 100% rename from tests/files/for3.gno rename to gnovm/tests/files/for3.gno diff --git a/tests/files/for4.gno b/gnovm/tests/files/for4.gno similarity index 100% rename from tests/files/for4.gno rename to gnovm/tests/files/for4.gno diff --git a/tests/files/for5.gno b/gnovm/tests/files/for5.gno similarity index 100% rename from tests/files/for5.gno rename to gnovm/tests/files/for5.gno diff --git a/tests/files/for6.gno b/gnovm/tests/files/for6.gno similarity index 100% rename from tests/files/for6.gno rename to gnovm/tests/files/for6.gno diff --git a/tests/files/for7.gno b/gnovm/tests/files/for7.gno similarity index 100% rename from tests/files/for7.gno rename to gnovm/tests/files/for7.gno diff --git a/tests/files/for8.gno b/gnovm/tests/files/for8.gno similarity index 100% rename from tests/files/for8.gno rename to gnovm/tests/files/for8.gno diff --git a/tests/files/for9.gno b/gnovm/tests/files/for9.gno similarity index 100% rename from tests/files/for9.gno rename to gnovm/tests/files/for9.gno diff --git a/tests/files/fun.gno b/gnovm/tests/files/fun.gno similarity index 100% rename from tests/files/fun.gno rename to gnovm/tests/files/fun.gno diff --git a/tests/files/fun10.gno b/gnovm/tests/files/fun10.gno similarity index 100% rename from tests/files/fun10.gno rename to gnovm/tests/files/fun10.gno diff --git a/tests/files/fun11.gno b/gnovm/tests/files/fun11.gno similarity index 100% rename from tests/files/fun11.gno rename to gnovm/tests/files/fun11.gno diff --git a/tests/files/fun12.gno b/gnovm/tests/files/fun12.gno similarity index 100% rename from tests/files/fun12.gno rename to gnovm/tests/files/fun12.gno diff --git a/tests/files/fun13.gno b/gnovm/tests/files/fun13.gno similarity index 100% rename from tests/files/fun13.gno rename to gnovm/tests/files/fun13.gno diff --git a/tests/files/fun14.gno b/gnovm/tests/files/fun14.gno similarity index 100% rename from tests/files/fun14.gno rename to gnovm/tests/files/fun14.gno diff --git a/tests/files/fun15.gno b/gnovm/tests/files/fun15.gno similarity index 100% rename from tests/files/fun15.gno rename to gnovm/tests/files/fun15.gno diff --git a/tests/files/fun16.gno b/gnovm/tests/files/fun16.gno similarity index 100% rename from tests/files/fun16.gno rename to gnovm/tests/files/fun16.gno diff --git a/tests/files/fun17.gno b/gnovm/tests/files/fun17.gno similarity index 100% rename from tests/files/fun17.gno rename to gnovm/tests/files/fun17.gno diff --git a/tests/files/fun18.gno b/gnovm/tests/files/fun18.gno similarity index 100% rename from tests/files/fun18.gno rename to gnovm/tests/files/fun18.gno diff --git a/tests/files/fun19b.gno b/gnovm/tests/files/fun19b.gno similarity index 100% rename from tests/files/fun19b.gno rename to gnovm/tests/files/fun19b.gno diff --git a/tests/files/fun2.gno b/gnovm/tests/files/fun2.gno similarity index 100% rename from tests/files/fun2.gno rename to gnovm/tests/files/fun2.gno diff --git a/tests/files/fun20b.gno b/gnovm/tests/files/fun20b.gno similarity index 100% rename from tests/files/fun20b.gno rename to gnovm/tests/files/fun20b.gno diff --git a/tests/files/fun21.gno b/gnovm/tests/files/fun21.gno similarity index 100% rename from tests/files/fun21.gno rename to gnovm/tests/files/fun21.gno diff --git a/tests/files/fun22.gno b/gnovm/tests/files/fun22.gno similarity index 100% rename from tests/files/fun22.gno rename to gnovm/tests/files/fun22.gno diff --git a/tests/files/fun23.gno b/gnovm/tests/files/fun23.gno similarity index 100% rename from tests/files/fun23.gno rename to gnovm/tests/files/fun23.gno diff --git a/tests/files/fun24.gno b/gnovm/tests/files/fun24.gno similarity index 100% rename from tests/files/fun24.gno rename to gnovm/tests/files/fun24.gno diff --git a/tests/files/fun25.gno b/gnovm/tests/files/fun25.gno similarity index 100% rename from tests/files/fun25.gno rename to gnovm/tests/files/fun25.gno diff --git a/tests/files/fun26.gno b/gnovm/tests/files/fun26.gno similarity index 100% rename from tests/files/fun26.gno rename to gnovm/tests/files/fun26.gno diff --git a/tests/files/fun3.gno b/gnovm/tests/files/fun3.gno similarity index 100% rename from tests/files/fun3.gno rename to gnovm/tests/files/fun3.gno diff --git a/tests/files/fun4.gno b/gnovm/tests/files/fun4.gno similarity index 100% rename from tests/files/fun4.gno rename to gnovm/tests/files/fun4.gno diff --git a/tests/files/fun5.gno b/gnovm/tests/files/fun5.gno similarity index 100% rename from tests/files/fun5.gno rename to gnovm/tests/files/fun5.gno diff --git a/tests/files/fun6.gno b/gnovm/tests/files/fun6.gno similarity index 100% rename from tests/files/fun6.gno rename to gnovm/tests/files/fun6.gno diff --git a/tests/files/fun6b.gno b/gnovm/tests/files/fun6b.gno similarity index 100% rename from tests/files/fun6b.gno rename to gnovm/tests/files/fun6b.gno diff --git a/tests/files/fun7.gno b/gnovm/tests/files/fun7.gno similarity index 100% rename from tests/files/fun7.gno rename to gnovm/tests/files/fun7.gno diff --git a/tests/files/fun8.gno b/gnovm/tests/files/fun8.gno similarity index 100% rename from tests/files/fun8.gno rename to gnovm/tests/files/fun8.gno diff --git a/tests/files/fun9.gno b/gnovm/tests/files/fun9.gno similarity index 100% rename from tests/files/fun9.gno rename to gnovm/tests/files/fun9.gno diff --git a/tests/files/goto0.gno b/gnovm/tests/files/goto0.gno similarity index 100% rename from tests/files/goto0.gno rename to gnovm/tests/files/goto0.gno diff --git a/tests/files/goto1.gno b/gnovm/tests/files/goto1.gno similarity index 100% rename from tests/files/goto1.gno rename to gnovm/tests/files/goto1.gno diff --git a/tests/files/goto2.gno b/gnovm/tests/files/goto2.gno similarity index 100% rename from tests/files/goto2.gno rename to gnovm/tests/files/goto2.gno diff --git a/tests/files/goto3.gno b/gnovm/tests/files/goto3.gno similarity index 100% rename from tests/files/goto3.gno rename to gnovm/tests/files/goto3.gno diff --git a/tests/files/goto3a.gno b/gnovm/tests/files/goto3a.gno similarity index 100% rename from tests/files/goto3a.gno rename to gnovm/tests/files/goto3a.gno diff --git a/tests/files/goto4.gno b/gnovm/tests/files/goto4.gno similarity index 100% rename from tests/files/goto4.gno rename to gnovm/tests/files/goto4.gno diff --git a/tests/files/goto5.gno b/gnovm/tests/files/goto5.gno similarity index 100% rename from tests/files/goto5.gno rename to gnovm/tests/files/goto5.gno diff --git a/tests/files/goto6.gno b/gnovm/tests/files/goto6.gno similarity index 100% rename from tests/files/goto6.gno rename to gnovm/tests/files/goto6.gno diff --git a/tests/files/if.gno b/gnovm/tests/files/if.gno similarity index 100% rename from tests/files/if.gno rename to gnovm/tests/files/if.gno diff --git a/tests/files/if0.gno b/gnovm/tests/files/if0.gno similarity index 100% rename from tests/files/if0.gno rename to gnovm/tests/files/if0.gno diff --git a/tests/files/if1.gno b/gnovm/tests/files/if1.gno similarity index 100% rename from tests/files/if1.gno rename to gnovm/tests/files/if1.gno diff --git a/tests/files/if2.gno b/gnovm/tests/files/if2.gno similarity index 100% rename from tests/files/if2.gno rename to gnovm/tests/files/if2.gno diff --git a/tests/files/if3.gno b/gnovm/tests/files/if3.gno similarity index 100% rename from tests/files/if3.gno rename to gnovm/tests/files/if3.gno diff --git a/tests/files/if4.gno b/gnovm/tests/files/if4.gno similarity index 100% rename from tests/files/if4.gno rename to gnovm/tests/files/if4.gno diff --git a/tests/files/if5.gno b/gnovm/tests/files/if5.gno similarity index 100% rename from tests/files/if5.gno rename to gnovm/tests/files/if5.gno diff --git a/tests/files/if6.gno b/gnovm/tests/files/if6.gno similarity index 100% rename from tests/files/if6.gno rename to gnovm/tests/files/if6.gno diff --git a/tests/files/if7.gno b/gnovm/tests/files/if7.gno similarity index 100% rename from tests/files/if7.gno rename to gnovm/tests/files/if7.gno diff --git a/tests/files/import0.gno b/gnovm/tests/files/import0.gno similarity index 100% rename from tests/files/import0.gno rename to gnovm/tests/files/import0.gno diff --git a/tests/files/import1.gno b/gnovm/tests/files/import1.gno similarity index 100% rename from tests/files/import1.gno rename to gnovm/tests/files/import1.gno diff --git a/tests/files/import10.gno b/gnovm/tests/files/import10.gno similarity index 100% rename from tests/files/import10.gno rename to gnovm/tests/files/import10.gno diff --git a/tests/files/import3.gno b/gnovm/tests/files/import3.gno similarity index 100% rename from tests/files/import3.gno rename to gnovm/tests/files/import3.gno diff --git a/tests/files/import4.gno b/gnovm/tests/files/import4.gno similarity index 100% rename from tests/files/import4.gno rename to gnovm/tests/files/import4.gno diff --git a/tests/files/import5.gno b/gnovm/tests/files/import5.gno similarity index 100% rename from tests/files/import5.gno rename to gnovm/tests/files/import5.gno diff --git a/tests/files/import6.gno b/gnovm/tests/files/import6.gno similarity index 100% rename from tests/files/import6.gno rename to gnovm/tests/files/import6.gno diff --git a/tests/files/import7.gno b/gnovm/tests/files/import7.gno similarity index 100% rename from tests/files/import7.gno rename to gnovm/tests/files/import7.gno diff --git a/tests/files/import8.gno b/gnovm/tests/files/import8.gno similarity index 100% rename from tests/files/import8.gno rename to gnovm/tests/files/import8.gno diff --git a/tests/files/import9.gno b/gnovm/tests/files/import9.gno similarity index 100% rename from tests/files/import9.gno rename to gnovm/tests/files/import9.gno diff --git a/tests/files/inc.gno b/gnovm/tests/files/inc.gno similarity index 100% rename from tests/files/inc.gno rename to gnovm/tests/files/inc.gno diff --git a/tests/files/index0.gno b/gnovm/tests/files/index0.gno similarity index 100% rename from tests/files/index0.gno rename to gnovm/tests/files/index0.gno diff --git a/tests/files/init0.gno b/gnovm/tests/files/init0.gno similarity index 100% rename from tests/files/init0.gno rename to gnovm/tests/files/init0.gno diff --git a/tests/files/init1.gno b/gnovm/tests/files/init1.gno similarity index 100% rename from tests/files/init1.gno rename to gnovm/tests/files/init1.gno diff --git a/tests/files/interface0.gno b/gnovm/tests/files/interface0.gno similarity index 100% rename from tests/files/interface0.gno rename to gnovm/tests/files/interface0.gno diff --git a/tests/files/interface1.gno b/gnovm/tests/files/interface1.gno similarity index 100% rename from tests/files/interface1.gno rename to gnovm/tests/files/interface1.gno diff --git a/tests/files/interface10.gno b/gnovm/tests/files/interface10.gno similarity index 100% rename from tests/files/interface10.gno rename to gnovm/tests/files/interface10.gno diff --git a/tests/files/interface11.gno b/gnovm/tests/files/interface11.gno similarity index 100% rename from tests/files/interface11.gno rename to gnovm/tests/files/interface11.gno diff --git a/tests/files/interface12.gno b/gnovm/tests/files/interface12.gno similarity index 100% rename from tests/files/interface12.gno rename to gnovm/tests/files/interface12.gno diff --git a/tests/files/interface13.gno b/gnovm/tests/files/interface13.gno similarity index 100% rename from tests/files/interface13.gno rename to gnovm/tests/files/interface13.gno diff --git a/tests/files/interface14.gno b/gnovm/tests/files/interface14.gno similarity index 100% rename from tests/files/interface14.gno rename to gnovm/tests/files/interface14.gno diff --git a/tests/files/interface15.gno b/gnovm/tests/files/interface15.gno similarity index 100% rename from tests/files/interface15.gno rename to gnovm/tests/files/interface15.gno diff --git a/tests/files/interface16.gno b/gnovm/tests/files/interface16.gno similarity index 100% rename from tests/files/interface16.gno rename to gnovm/tests/files/interface16.gno diff --git a/tests/files/interface17.gno b/gnovm/tests/files/interface17.gno similarity index 100% rename from tests/files/interface17.gno rename to gnovm/tests/files/interface17.gno diff --git a/tests/files/interface18.gno b/gnovm/tests/files/interface18.gno similarity index 100% rename from tests/files/interface18.gno rename to gnovm/tests/files/interface18.gno diff --git a/tests/files/interface19.gno b/gnovm/tests/files/interface19.gno similarity index 100% rename from tests/files/interface19.gno rename to gnovm/tests/files/interface19.gno diff --git a/tests/files/interface2.gno b/gnovm/tests/files/interface2.gno similarity index 100% rename from tests/files/interface2.gno rename to gnovm/tests/files/interface2.gno diff --git a/tests/files/interface20.gno b/gnovm/tests/files/interface20.gno similarity index 100% rename from tests/files/interface20.gno rename to gnovm/tests/files/interface20.gno diff --git a/tests/files/interface21.gno b/gnovm/tests/files/interface21.gno similarity index 100% rename from tests/files/interface21.gno rename to gnovm/tests/files/interface21.gno diff --git a/tests/files/interface22.gno b/gnovm/tests/files/interface22.gno similarity index 100% rename from tests/files/interface22.gno rename to gnovm/tests/files/interface22.gno diff --git a/tests/files/interface23.gno b/gnovm/tests/files/interface23.gno similarity index 100% rename from tests/files/interface23.gno rename to gnovm/tests/files/interface23.gno diff --git a/tests/files/interface24.gno b/gnovm/tests/files/interface24.gno similarity index 100% rename from tests/files/interface24.gno rename to gnovm/tests/files/interface24.gno diff --git a/tests/files/interface25.gno b/gnovm/tests/files/interface25.gno similarity index 100% rename from tests/files/interface25.gno rename to gnovm/tests/files/interface25.gno diff --git a/tests/files/interface26.gno b/gnovm/tests/files/interface26.gno similarity index 100% rename from tests/files/interface26.gno rename to gnovm/tests/files/interface26.gno diff --git a/tests/files/interface27b.gno b/gnovm/tests/files/interface27b.gno similarity index 100% rename from tests/files/interface27b.gno rename to gnovm/tests/files/interface27b.gno diff --git a/tests/files/interface28b.gno b/gnovm/tests/files/interface28b.gno similarity index 100% rename from tests/files/interface28b.gno rename to gnovm/tests/files/interface28b.gno diff --git a/tests/files/interface29.gno b/gnovm/tests/files/interface29.gno similarity index 100% rename from tests/files/interface29.gno rename to gnovm/tests/files/interface29.gno diff --git a/tests/files/interface3.gno b/gnovm/tests/files/interface3.gno similarity index 100% rename from tests/files/interface3.gno rename to gnovm/tests/files/interface3.gno diff --git a/tests/files/interface30.gno b/gnovm/tests/files/interface30.gno similarity index 100% rename from tests/files/interface30.gno rename to gnovm/tests/files/interface30.gno diff --git a/tests/files/interface31.gno b/gnovm/tests/files/interface31.gno similarity index 100% rename from tests/files/interface31.gno rename to gnovm/tests/files/interface31.gno diff --git a/tests/files/interface32.gno b/gnovm/tests/files/interface32.gno similarity index 100% rename from tests/files/interface32.gno rename to gnovm/tests/files/interface32.gno diff --git a/tests/files/interface33.gno b/gnovm/tests/files/interface33.gno similarity index 100% rename from tests/files/interface33.gno rename to gnovm/tests/files/interface33.gno diff --git a/tests/files/interface34.gno b/gnovm/tests/files/interface34.gno similarity index 100% rename from tests/files/interface34.gno rename to gnovm/tests/files/interface34.gno diff --git a/tests/files/interface35.gno b/gnovm/tests/files/interface35.gno similarity index 100% rename from tests/files/interface35.gno rename to gnovm/tests/files/interface35.gno diff --git a/tests/files/interface36.gno b/gnovm/tests/files/interface36.gno similarity index 100% rename from tests/files/interface36.gno rename to gnovm/tests/files/interface36.gno diff --git a/tests/files/interface37.gno b/gnovm/tests/files/interface37.gno similarity index 100% rename from tests/files/interface37.gno rename to gnovm/tests/files/interface37.gno diff --git a/tests/files/interface38b.gno b/gnovm/tests/files/interface38b.gno similarity index 100% rename from tests/files/interface38b.gno rename to gnovm/tests/files/interface38b.gno diff --git a/tests/files/interface39b.gno b/gnovm/tests/files/interface39b.gno similarity index 100% rename from tests/files/interface39b.gno rename to gnovm/tests/files/interface39b.gno diff --git a/tests/files/interface4.gno b/gnovm/tests/files/interface4.gno similarity index 100% rename from tests/files/interface4.gno rename to gnovm/tests/files/interface4.gno diff --git a/tests/files/interface40b.gno b/gnovm/tests/files/interface40b.gno similarity index 100% rename from tests/files/interface40b.gno rename to gnovm/tests/files/interface40b.gno diff --git a/tests/files/interface41b.gno b/gnovm/tests/files/interface41b.gno similarity index 100% rename from tests/files/interface41b.gno rename to gnovm/tests/files/interface41b.gno diff --git a/tests/files/interface42.gno b/gnovm/tests/files/interface42.gno similarity index 100% rename from tests/files/interface42.gno rename to gnovm/tests/files/interface42.gno diff --git a/tests/files/interface43.gno b/gnovm/tests/files/interface43.gno similarity index 100% rename from tests/files/interface43.gno rename to gnovm/tests/files/interface43.gno diff --git a/tests/files/interface44.gno b/gnovm/tests/files/interface44.gno similarity index 100% rename from tests/files/interface44.gno rename to gnovm/tests/files/interface44.gno diff --git a/tests/files/interface45.gno b/gnovm/tests/files/interface45.gno similarity index 100% rename from tests/files/interface45.gno rename to gnovm/tests/files/interface45.gno diff --git a/tests/files/interface46.gno b/gnovm/tests/files/interface46.gno similarity index 100% rename from tests/files/interface46.gno rename to gnovm/tests/files/interface46.gno diff --git a/tests/files/interface5.gno b/gnovm/tests/files/interface5.gno similarity index 100% rename from tests/files/interface5.gno rename to gnovm/tests/files/interface5.gno diff --git a/tests/files/interface6.gno b/gnovm/tests/files/interface6.gno similarity index 100% rename from tests/files/interface6.gno rename to gnovm/tests/files/interface6.gno diff --git a/tests/files/interface7b.gno b/gnovm/tests/files/interface7b.gno similarity index 100% rename from tests/files/interface7b.gno rename to gnovm/tests/files/interface7b.gno diff --git a/tests/files/interface8.gno b/gnovm/tests/files/interface8.gno similarity index 100% rename from tests/files/interface8.gno rename to gnovm/tests/files/interface8.gno diff --git a/tests/files/interface9b.gno b/gnovm/tests/files/interface9b.gno similarity index 100% rename from tests/files/interface9b.gno rename to gnovm/tests/files/interface9b.gno diff --git a/tests/files/interp.gi b/gnovm/tests/files/interp.gi similarity index 100% rename from tests/files/interp.gi rename to gnovm/tests/files/interp.gi diff --git a/tests/files/interp2.gi b/gnovm/tests/files/interp2.gi similarity index 100% rename from tests/files/interp2.gi rename to gnovm/tests/files/interp2.gi diff --git a/tests/files/io0_native.gno b/gnovm/tests/files/io0_native.gno similarity index 100% rename from tests/files/io0_native.gno rename to gnovm/tests/files/io0_native.gno diff --git a/tests/files/io0_stdlibs.gno b/gnovm/tests/files/io0_stdlibs.gno similarity index 100% rename from tests/files/io0_stdlibs.gno rename to gnovm/tests/files/io0_stdlibs.gno diff --git a/tests/files/io1.gno b/gnovm/tests/files/io1.gno similarity index 100% rename from tests/files/io1.gno rename to gnovm/tests/files/io1.gno diff --git a/tests/files/iota.gno b/gnovm/tests/files/iota.gno similarity index 100% rename from tests/files/iota.gno rename to gnovm/tests/files/iota.gno diff --git a/tests/files/iota0.gno b/gnovm/tests/files/iota0.gno similarity index 100% rename from tests/files/iota0.gno rename to gnovm/tests/files/iota0.gno diff --git a/tests/files/ioutil0.gno b/gnovm/tests/files/ioutil0.gno similarity index 100% rename from tests/files/ioutil0.gno rename to gnovm/tests/files/ioutil0.gno diff --git a/tests/files/ipp_as_key.gno b/gnovm/tests/files/ipp_as_key.gno similarity index 100% rename from tests/files/ipp_as_key.gno rename to gnovm/tests/files/ipp_as_key.gno diff --git a/tests/files/issue-558b.gno b/gnovm/tests/files/issue-558b.gno similarity index 100% rename from tests/files/issue-558b.gno rename to gnovm/tests/files/issue-558b.gno diff --git a/tests/files/issue-735.gno b/gnovm/tests/files/issue-735.gno similarity index 100% rename from tests/files/issue-735.gno rename to gnovm/tests/files/issue-735.gno diff --git a/tests/files/issue-776.gno b/gnovm/tests/files/issue-776.gno similarity index 100% rename from tests/files/issue-776.gno rename to gnovm/tests/files/issue-776.gno diff --git a/tests/files/issue-782.gno b/gnovm/tests/files/issue-782.gno similarity index 100% rename from tests/files/issue-782.gno rename to gnovm/tests/files/issue-782.gno diff --git a/tests/files/issue-784.gno b/gnovm/tests/files/issue-784.gno similarity index 100% rename from tests/files/issue-784.gno rename to gnovm/tests/files/issue-784.gno diff --git a/tests/files/issue-880.gno b/gnovm/tests/files/issue-880.gno similarity index 100% rename from tests/files/issue-880.gno rename to gnovm/tests/files/issue-880.gno diff --git a/tests/files/l2_long.gno b/gnovm/tests/files/l2_long.gno similarity index 100% rename from tests/files/l2_long.gno rename to gnovm/tests/files/l2_long.gno diff --git a/tests/files/l3_long.gno b/gnovm/tests/files/l3_long.gno similarity index 100% rename from tests/files/l3_long.gno rename to gnovm/tests/files/l3_long.gno diff --git a/tests/files/l4_long.gno b/gnovm/tests/files/l4_long.gno similarity index 100% rename from tests/files/l4_long.gno rename to gnovm/tests/files/l4_long.gno diff --git a/tests/files/l5_long.gno b/gnovm/tests/files/l5_long.gno similarity index 100% rename from tests/files/l5_long.gno rename to gnovm/tests/files/l5_long.gno diff --git a/tests/files/len0.gno b/gnovm/tests/files/len0.gno similarity index 100% rename from tests/files/len0.gno rename to gnovm/tests/files/len0.gno diff --git a/tests/files/make0.gno b/gnovm/tests/files/make0.gno similarity index 100% rename from tests/files/make0.gno rename to gnovm/tests/files/make0.gno diff --git a/tests/files/make1.gno b/gnovm/tests/files/make1.gno similarity index 100% rename from tests/files/make1.gno rename to gnovm/tests/files/make1.gno diff --git a/tests/files/make2.gno b/gnovm/tests/files/make2.gno similarity index 100% rename from tests/files/make2.gno rename to gnovm/tests/files/make2.gno diff --git a/tests/files/map.gno b/gnovm/tests/files/map.gno similarity index 100% rename from tests/files/map.gno rename to gnovm/tests/files/map.gno diff --git a/tests/files/map10.gno b/gnovm/tests/files/map10.gno similarity index 100% rename from tests/files/map10.gno rename to gnovm/tests/files/map10.gno diff --git a/tests/files/map11.gno b/gnovm/tests/files/map11.gno similarity index 100% rename from tests/files/map11.gno rename to gnovm/tests/files/map11.gno diff --git a/tests/files/map12.gno b/gnovm/tests/files/map12.gno similarity index 100% rename from tests/files/map12.gno rename to gnovm/tests/files/map12.gno diff --git a/tests/files/map13.gno b/gnovm/tests/files/map13.gno similarity index 100% rename from tests/files/map13.gno rename to gnovm/tests/files/map13.gno diff --git a/tests/files/map14b.gno b/gnovm/tests/files/map14b.gno similarity index 100% rename from tests/files/map14b.gno rename to gnovm/tests/files/map14b.gno diff --git a/tests/files/map15.gno b/gnovm/tests/files/map15.gno similarity index 100% rename from tests/files/map15.gno rename to gnovm/tests/files/map15.gno diff --git a/tests/files/map16.gno b/gnovm/tests/files/map16.gno similarity index 100% rename from tests/files/map16.gno rename to gnovm/tests/files/map16.gno diff --git a/tests/files/map17.gno b/gnovm/tests/files/map17.gno similarity index 100% rename from tests/files/map17.gno rename to gnovm/tests/files/map17.gno diff --git a/tests/files/map18.gno b/gnovm/tests/files/map18.gno similarity index 100% rename from tests/files/map18.gno rename to gnovm/tests/files/map18.gno diff --git a/tests/files/map19b.gno b/gnovm/tests/files/map19b.gno similarity index 100% rename from tests/files/map19b.gno rename to gnovm/tests/files/map19b.gno diff --git a/tests/files/map2.gno b/gnovm/tests/files/map2.gno similarity index 100% rename from tests/files/map2.gno rename to gnovm/tests/files/map2.gno diff --git a/tests/files/map20.gno b/gnovm/tests/files/map20.gno similarity index 100% rename from tests/files/map20.gno rename to gnovm/tests/files/map20.gno diff --git a/tests/files/map21.gno b/gnovm/tests/files/map21.gno similarity index 100% rename from tests/files/map21.gno rename to gnovm/tests/files/map21.gno diff --git a/tests/files/map22.gno b/gnovm/tests/files/map22.gno similarity index 100% rename from tests/files/map22.gno rename to gnovm/tests/files/map22.gno diff --git a/tests/files/map23.gno b/gnovm/tests/files/map23.gno similarity index 100% rename from tests/files/map23.gno rename to gnovm/tests/files/map23.gno diff --git a/tests/files/map24.gno b/gnovm/tests/files/map24.gno similarity index 100% rename from tests/files/map24.gno rename to gnovm/tests/files/map24.gno diff --git a/tests/files/map25.gno b/gnovm/tests/files/map25.gno similarity index 100% rename from tests/files/map25.gno rename to gnovm/tests/files/map25.gno diff --git a/tests/files/map26.gno b/gnovm/tests/files/map26.gno similarity index 100% rename from tests/files/map26.gno rename to gnovm/tests/files/map26.gno diff --git a/tests/files/map27.gno b/gnovm/tests/files/map27.gno similarity index 100% rename from tests/files/map27.gno rename to gnovm/tests/files/map27.gno diff --git a/tests/files/map28b.gno b/gnovm/tests/files/map28b.gno similarity index 100% rename from tests/files/map28b.gno rename to gnovm/tests/files/map28b.gno diff --git a/tests/files/map28c.gno b/gnovm/tests/files/map28c.gno similarity index 100% rename from tests/files/map28c.gno rename to gnovm/tests/files/map28c.gno diff --git a/tests/files/map29_native.gno b/gnovm/tests/files/map29_native.gno similarity index 100% rename from tests/files/map29_native.gno rename to gnovm/tests/files/map29_native.gno diff --git a/tests/files/map29_stdlibs.gno b/gnovm/tests/files/map29_stdlibs.gno similarity index 100% rename from tests/files/map29_stdlibs.gno rename to gnovm/tests/files/map29_stdlibs.gno diff --git a/tests/files/map3.gno b/gnovm/tests/files/map3.gno similarity index 100% rename from tests/files/map3.gno rename to gnovm/tests/files/map3.gno diff --git a/tests/files/map4.gno b/gnovm/tests/files/map4.gno similarity index 100% rename from tests/files/map4.gno rename to gnovm/tests/files/map4.gno diff --git a/tests/files/map5.gno b/gnovm/tests/files/map5.gno similarity index 100% rename from tests/files/map5.gno rename to gnovm/tests/files/map5.gno diff --git a/tests/files/map6.gno b/gnovm/tests/files/map6.gno similarity index 100% rename from tests/files/map6.gno rename to gnovm/tests/files/map6.gno diff --git a/tests/files/map7.gno b/gnovm/tests/files/map7.gno similarity index 100% rename from tests/files/map7.gno rename to gnovm/tests/files/map7.gno diff --git a/tests/files/map8.gno b/gnovm/tests/files/map8.gno similarity index 100% rename from tests/files/map8.gno rename to gnovm/tests/files/map8.gno diff --git a/tests/files/map9.gno b/gnovm/tests/files/map9.gno similarity index 100% rename from tests/files/map9.gno rename to gnovm/tests/files/map9.gno diff --git a/tests/files/math0_native.gno b/gnovm/tests/files/math0_native.gno similarity index 100% rename from tests/files/math0_native.gno rename to gnovm/tests/files/math0_native.gno diff --git a/tests/files/math0_stdlibs.gno b/gnovm/tests/files/math0_stdlibs.gno similarity index 100% rename from tests/files/math0_stdlibs.gno rename to gnovm/tests/files/math0_stdlibs.gno diff --git a/tests/files/math2.gno b/gnovm/tests/files/math2.gno similarity index 100% rename from tests/files/math2.gno rename to gnovm/tests/files/math2.gno diff --git a/tests/files/math3.gno b/gnovm/tests/files/math3.gno similarity index 100% rename from tests/files/math3.gno rename to gnovm/tests/files/math3.gno diff --git a/tests/files/maths_int16_long.gno b/gnovm/tests/files/maths_int16_long.gno similarity index 100% rename from tests/files/maths_int16_long.gno rename to gnovm/tests/files/maths_int16_long.gno diff --git a/tests/files/maths_int8.gno b/gnovm/tests/files/maths_int8.gno similarity index 100% rename from tests/files/maths_int8.gno rename to gnovm/tests/files/maths_int8.gno diff --git a/tests/files/method.gno b/gnovm/tests/files/method.gno similarity index 100% rename from tests/files/method.gno rename to gnovm/tests/files/method.gno diff --git a/tests/files/method0.gno b/gnovm/tests/files/method0.gno similarity index 100% rename from tests/files/method0.gno rename to gnovm/tests/files/method0.gno diff --git a/tests/files/method1.gno b/gnovm/tests/files/method1.gno similarity index 100% rename from tests/files/method1.gno rename to gnovm/tests/files/method1.gno diff --git a/tests/files/method10.gno b/gnovm/tests/files/method10.gno similarity index 100% rename from tests/files/method10.gno rename to gnovm/tests/files/method10.gno diff --git a/tests/files/method11.gno b/gnovm/tests/files/method11.gno similarity index 100% rename from tests/files/method11.gno rename to gnovm/tests/files/method11.gno diff --git a/tests/files/method12.gno b/gnovm/tests/files/method12.gno similarity index 100% rename from tests/files/method12.gno rename to gnovm/tests/files/method12.gno diff --git a/tests/files/method13.gno b/gnovm/tests/files/method13.gno similarity index 100% rename from tests/files/method13.gno rename to gnovm/tests/files/method13.gno diff --git a/tests/files/method14.gno b/gnovm/tests/files/method14.gno similarity index 100% rename from tests/files/method14.gno rename to gnovm/tests/files/method14.gno diff --git a/tests/files/method15.gno b/gnovm/tests/files/method15.gno similarity index 100% rename from tests/files/method15.gno rename to gnovm/tests/files/method15.gno diff --git a/tests/files/method16b.gno b/gnovm/tests/files/method16b.gno similarity index 100% rename from tests/files/method16b.gno rename to gnovm/tests/files/method16b.gno diff --git a/tests/files/method17b.gno b/gnovm/tests/files/method17b.gno similarity index 100% rename from tests/files/method17b.gno rename to gnovm/tests/files/method17b.gno diff --git a/tests/files/method18.gno b/gnovm/tests/files/method18.gno similarity index 100% rename from tests/files/method18.gno rename to gnovm/tests/files/method18.gno diff --git a/tests/files/method19.gno b/gnovm/tests/files/method19.gno similarity index 100% rename from tests/files/method19.gno rename to gnovm/tests/files/method19.gno diff --git a/tests/files/method2.gno b/gnovm/tests/files/method2.gno similarity index 100% rename from tests/files/method2.gno rename to gnovm/tests/files/method2.gno diff --git a/tests/files/method20.gno b/gnovm/tests/files/method20.gno similarity index 100% rename from tests/files/method20.gno rename to gnovm/tests/files/method20.gno diff --git a/tests/files/method21.gno b/gnovm/tests/files/method21.gno similarity index 100% rename from tests/files/method21.gno rename to gnovm/tests/files/method21.gno diff --git a/tests/files/method22.gno b/gnovm/tests/files/method22.gno similarity index 100% rename from tests/files/method22.gno rename to gnovm/tests/files/method22.gno diff --git a/tests/files/method23.gno b/gnovm/tests/files/method23.gno similarity index 100% rename from tests/files/method23.gno rename to gnovm/tests/files/method23.gno diff --git a/tests/files/method24.gno b/gnovm/tests/files/method24.gno similarity index 100% rename from tests/files/method24.gno rename to gnovm/tests/files/method24.gno diff --git a/tests/files/method25.gno b/gnovm/tests/files/method25.gno similarity index 100% rename from tests/files/method25.gno rename to gnovm/tests/files/method25.gno diff --git a/tests/files/method26.gno b/gnovm/tests/files/method26.gno similarity index 100% rename from tests/files/method26.gno rename to gnovm/tests/files/method26.gno diff --git a/tests/files/method27.gno b/gnovm/tests/files/method27.gno similarity index 100% rename from tests/files/method27.gno rename to gnovm/tests/files/method27.gno diff --git a/tests/files/method28.gno b/gnovm/tests/files/method28.gno similarity index 100% rename from tests/files/method28.gno rename to gnovm/tests/files/method28.gno diff --git a/tests/files/method29b.gno b/gnovm/tests/files/method29b.gno similarity index 100% rename from tests/files/method29b.gno rename to gnovm/tests/files/method29b.gno diff --git a/tests/files/method3.gno b/gnovm/tests/files/method3.gno similarity index 100% rename from tests/files/method3.gno rename to gnovm/tests/files/method3.gno diff --git a/tests/files/method30.gno b/gnovm/tests/files/method30.gno similarity index 100% rename from tests/files/method30.gno rename to gnovm/tests/files/method30.gno diff --git a/tests/files/method31b.gno b/gnovm/tests/files/method31b.gno similarity index 100% rename from tests/files/method31b.gno rename to gnovm/tests/files/method31b.gno diff --git a/tests/files/method32.gno b/gnovm/tests/files/method32.gno similarity index 100% rename from tests/files/method32.gno rename to gnovm/tests/files/method32.gno diff --git a/tests/files/method33.gno b/gnovm/tests/files/method33.gno similarity index 100% rename from tests/files/method33.gno rename to gnovm/tests/files/method33.gno diff --git a/tests/files/method34.gno b/gnovm/tests/files/method34.gno similarity index 100% rename from tests/files/method34.gno rename to gnovm/tests/files/method34.gno diff --git a/tests/files/method35.gno b/gnovm/tests/files/method35.gno similarity index 100% rename from tests/files/method35.gno rename to gnovm/tests/files/method35.gno diff --git a/tests/files/method36.gno b/gnovm/tests/files/method36.gno similarity index 100% rename from tests/files/method36.gno rename to gnovm/tests/files/method36.gno diff --git a/tests/files/method37.gno b/gnovm/tests/files/method37.gno similarity index 100% rename from tests/files/method37.gno rename to gnovm/tests/files/method37.gno diff --git a/tests/files/method4.gno b/gnovm/tests/files/method4.gno similarity index 100% rename from tests/files/method4.gno rename to gnovm/tests/files/method4.gno diff --git a/tests/files/method5.gno b/gnovm/tests/files/method5.gno similarity index 100% rename from tests/files/method5.gno rename to gnovm/tests/files/method5.gno diff --git a/tests/files/method6.gno b/gnovm/tests/files/method6.gno similarity index 100% rename from tests/files/method6.gno rename to gnovm/tests/files/method6.gno diff --git a/tests/files/method7.gno b/gnovm/tests/files/method7.gno similarity index 100% rename from tests/files/method7.gno rename to gnovm/tests/files/method7.gno diff --git a/tests/files/method8.gno b/gnovm/tests/files/method8.gno similarity index 100% rename from tests/files/method8.gno rename to gnovm/tests/files/method8.gno diff --git a/tests/files/method9.gno b/gnovm/tests/files/method9.gno similarity index 100% rename from tests/files/method9.gno rename to gnovm/tests/files/method9.gno diff --git a/tests/files/neg0.gno b/gnovm/tests/files/neg0.gno similarity index 100% rename from tests/files/neg0.gno rename to gnovm/tests/files/neg0.gno diff --git a/tests/files/new0.gno b/gnovm/tests/files/new0.gno similarity index 100% rename from tests/files/new0.gno rename to gnovm/tests/files/new0.gno diff --git a/tests/files/new1.gno b/gnovm/tests/files/new1.gno similarity index 100% rename from tests/files/new1.gno rename to gnovm/tests/files/new1.gno diff --git a/tests/files/new2.gno b/gnovm/tests/files/new2.gno similarity index 100% rename from tests/files/new2.gno rename to gnovm/tests/files/new2.gno diff --git a/tests/files/new3.gno b/gnovm/tests/files/new3.gno similarity index 100% rename from tests/files/new3.gno rename to gnovm/tests/files/new3.gno diff --git a/tests/files/nil0.gno b/gnovm/tests/files/nil0.gno similarity index 100% rename from tests/files/nil0.gno rename to gnovm/tests/files/nil0.gno diff --git a/tests/files/nil1.gno b/gnovm/tests/files/nil1.gno similarity index 100% rename from tests/files/nil1.gno rename to gnovm/tests/files/nil1.gno diff --git a/tests/files/nil2.gno b/gnovm/tests/files/nil2.gno similarity index 100% rename from tests/files/nil2.gno rename to gnovm/tests/files/nil2.gno diff --git a/tests/files/nil3.gno b/gnovm/tests/files/nil3.gno similarity index 100% rename from tests/files/nil3.gno rename to gnovm/tests/files/nil3.gno diff --git a/tests/files/not0.gno b/gnovm/tests/files/not0.gno similarity index 100% rename from tests/files/not0.gno rename to gnovm/tests/files/not0.gno diff --git a/tests/files/not1.gno b/gnovm/tests/files/not1.gno similarity index 100% rename from tests/files/not1.gno rename to gnovm/tests/files/not1.gno diff --git a/tests/files/not2.gno b/gnovm/tests/files/not2.gno similarity index 100% rename from tests/files/not2.gno rename to gnovm/tests/files/not2.gno diff --git a/tests/files/op0.gno b/gnovm/tests/files/op0.gno similarity index 100% rename from tests/files/op0.gno rename to gnovm/tests/files/op0.gno diff --git a/tests/files/op2.gno b/gnovm/tests/files/op2.gno similarity index 100% rename from tests/files/op2.gno rename to gnovm/tests/files/op2.gno diff --git a/tests/files/op6.gno b/gnovm/tests/files/op6.gno similarity index 100% rename from tests/files/op6.gno rename to gnovm/tests/files/op6.gno diff --git a/tests/files/op7.gno b/gnovm/tests/files/op7.gno similarity index 100% rename from tests/files/op7.gno rename to gnovm/tests/files/op7.gno diff --git a/tests/files/op8.gno b/gnovm/tests/files/op8.gno similarity index 100% rename from tests/files/op8.gno rename to gnovm/tests/files/op8.gno diff --git a/tests/files/opint16.gno b/gnovm/tests/files/opint16.gno similarity index 100% rename from tests/files/opint16.gno rename to gnovm/tests/files/opint16.gno diff --git a/tests/files/opint32.gno b/gnovm/tests/files/opint32.gno similarity index 100% rename from tests/files/opint32.gno rename to gnovm/tests/files/opint32.gno diff --git a/tests/files/opint64.gno b/gnovm/tests/files/opint64.gno similarity index 100% rename from tests/files/opint64.gno rename to gnovm/tests/files/opint64.gno diff --git a/tests/files/opint8.gno b/gnovm/tests/files/opint8.gno similarity index 100% rename from tests/files/opint8.gno rename to gnovm/tests/files/opint8.gno diff --git a/tests/files/opstring.gno b/gnovm/tests/files/opstring.gno similarity index 100% rename from tests/files/opstring.gno rename to gnovm/tests/files/opstring.gno diff --git a/tests/files/opuint16.gno b/gnovm/tests/files/opuint16.gno similarity index 100% rename from tests/files/opuint16.gno rename to gnovm/tests/files/opuint16.gno diff --git a/tests/files/opuint32.gno b/gnovm/tests/files/opuint32.gno similarity index 100% rename from tests/files/opuint32.gno rename to gnovm/tests/files/opuint32.gno diff --git a/tests/files/opuint64.gno b/gnovm/tests/files/opuint64.gno similarity index 100% rename from tests/files/opuint64.gno rename to gnovm/tests/files/opuint64.gno diff --git a/tests/files/opuint8.gno b/gnovm/tests/files/opuint8.gno similarity index 100% rename from tests/files/opuint8.gno rename to gnovm/tests/files/opuint8.gno diff --git a/tests/files/or0.gno b/gnovm/tests/files/or0.gno similarity index 100% rename from tests/files/or0.gno rename to gnovm/tests/files/or0.gno diff --git a/tests/files/or1.gno b/gnovm/tests/files/or1.gno similarity index 100% rename from tests/files/or1.gno rename to gnovm/tests/files/or1.gno diff --git a/tests/files/or2.gno b/gnovm/tests/files/or2.gno similarity index 100% rename from tests/files/or2.gno rename to gnovm/tests/files/or2.gno diff --git a/tests/files/or3.gno b/gnovm/tests/files/or3.gno similarity index 100% rename from tests/files/or3.gno rename to gnovm/tests/files/or3.gno diff --git a/tests/files/or4.gno b/gnovm/tests/files/or4.gno similarity index 100% rename from tests/files/or4.gno rename to gnovm/tests/files/or4.gno diff --git a/tests/files/panic0.gno b/gnovm/tests/files/panic0.gno similarity index 100% rename from tests/files/panic0.gno rename to gnovm/tests/files/panic0.gno diff --git a/tests/files/pkgname0.gno b/gnovm/tests/files/pkgname0.gno similarity index 100% rename from tests/files/pkgname0.gno rename to gnovm/tests/files/pkgname0.gno diff --git a/tests/files/pkgname1.gno b/gnovm/tests/files/pkgname1.gno similarity index 100% rename from tests/files/pkgname1.gno rename to gnovm/tests/files/pkgname1.gno diff --git a/tests/files/pkgname2.gno b/gnovm/tests/files/pkgname2.gno similarity index 100% rename from tests/files/pkgname2.gno rename to gnovm/tests/files/pkgname2.gno diff --git a/tests/files/primes.gno b/gnovm/tests/files/primes.gno similarity index 100% rename from tests/files/primes.gno rename to gnovm/tests/files/primes.gno diff --git a/tests/files/print0.gno b/gnovm/tests/files/print0.gno similarity index 100% rename from tests/files/print0.gno rename to gnovm/tests/files/print0.gno diff --git a/tests/files/ptr0.gno b/gnovm/tests/files/ptr0.gno similarity index 100% rename from tests/files/ptr0.gno rename to gnovm/tests/files/ptr0.gno diff --git a/tests/files/ptr1.gno b/gnovm/tests/files/ptr1.gno similarity index 100% rename from tests/files/ptr1.gno rename to gnovm/tests/files/ptr1.gno diff --git a/tests/files/ptr2.gno b/gnovm/tests/files/ptr2.gno similarity index 100% rename from tests/files/ptr2.gno rename to gnovm/tests/files/ptr2.gno diff --git a/tests/files/ptr3.gno b/gnovm/tests/files/ptr3.gno similarity index 100% rename from tests/files/ptr3.gno rename to gnovm/tests/files/ptr3.gno diff --git a/tests/files/ptr4.gno b/gnovm/tests/files/ptr4.gno similarity index 100% rename from tests/files/ptr4.gno rename to gnovm/tests/files/ptr4.gno diff --git a/tests/files/ptr5.gno b/gnovm/tests/files/ptr5.gno similarity index 100% rename from tests/files/ptr5.gno rename to gnovm/tests/files/ptr5.gno diff --git a/tests/files/ptr5a.gno b/gnovm/tests/files/ptr5a.gno similarity index 100% rename from tests/files/ptr5a.gno rename to gnovm/tests/files/ptr5a.gno diff --git a/tests/files/ptr6.gno b/gnovm/tests/files/ptr6.gno similarity index 100% rename from tests/files/ptr6.gno rename to gnovm/tests/files/ptr6.gno diff --git a/tests/files/ptr7.gno b/gnovm/tests/files/ptr7.gno similarity index 100% rename from tests/files/ptr7.gno rename to gnovm/tests/files/ptr7.gno diff --git a/tests/files/ptr8.gno b/gnovm/tests/files/ptr8.gno similarity index 100% rename from tests/files/ptr8.gno rename to gnovm/tests/files/ptr8.gno diff --git a/tests/files/ptr_array0.gno b/gnovm/tests/files/ptr_array0.gno similarity index 100% rename from tests/files/ptr_array0.gno rename to gnovm/tests/files/ptr_array0.gno diff --git a/tests/files/ptr_array1.gno b/gnovm/tests/files/ptr_array1.gno similarity index 100% rename from tests/files/ptr_array1.gno rename to gnovm/tests/files/ptr_array1.gno diff --git a/tests/files/ptr_array2.gno b/gnovm/tests/files/ptr_array2.gno similarity index 100% rename from tests/files/ptr_array2.gno rename to gnovm/tests/files/ptr_array2.gno diff --git a/tests/files/ptr_array3.gno b/gnovm/tests/files/ptr_array3.gno similarity index 100% rename from tests/files/ptr_array3.gno rename to gnovm/tests/files/ptr_array3.gno diff --git a/tests/files/range0.gno b/gnovm/tests/files/range0.gno similarity index 100% rename from tests/files/range0.gno rename to gnovm/tests/files/range0.gno diff --git a/tests/files/range1.gno b/gnovm/tests/files/range1.gno similarity index 100% rename from tests/files/range1.gno rename to gnovm/tests/files/range1.gno diff --git a/tests/files/range2.gno b/gnovm/tests/files/range2.gno similarity index 100% rename from tests/files/range2.gno rename to gnovm/tests/files/range2.gno diff --git a/tests/files/range3.gno b/gnovm/tests/files/range3.gno similarity index 100% rename from tests/files/range3.gno rename to gnovm/tests/files/range3.gno diff --git a/tests/files/range4.gno b/gnovm/tests/files/range4.gno similarity index 100% rename from tests/files/range4.gno rename to gnovm/tests/files/range4.gno diff --git a/tests/files/range5.gno b/gnovm/tests/files/range5.gno similarity index 100% rename from tests/files/range5.gno rename to gnovm/tests/files/range5.gno diff --git a/tests/files/range6.gno b/gnovm/tests/files/range6.gno similarity index 100% rename from tests/files/range6.gno rename to gnovm/tests/files/range6.gno diff --git a/tests/files/range7.gno b/gnovm/tests/files/range7.gno similarity index 100% rename from tests/files/range7.gno rename to gnovm/tests/files/range7.gno diff --git a/tests/files/recover0.gno b/gnovm/tests/files/recover0.gno similarity index 100% rename from tests/files/recover0.gno rename to gnovm/tests/files/recover0.gno diff --git a/tests/files/recover1.gno b/gnovm/tests/files/recover1.gno similarity index 100% rename from tests/files/recover1.gno rename to gnovm/tests/files/recover1.gno diff --git a/tests/files/recover2.gno b/gnovm/tests/files/recover2.gno similarity index 100% rename from tests/files/recover2.gno rename to gnovm/tests/files/recover2.gno diff --git a/tests/files/recover3.gno b/gnovm/tests/files/recover3.gno similarity index 100% rename from tests/files/recover3.gno rename to gnovm/tests/files/recover3.gno diff --git a/tests/files/recover4.gno b/gnovm/tests/files/recover4.gno similarity index 100% rename from tests/files/recover4.gno rename to gnovm/tests/files/recover4.gno diff --git a/tests/files/recurse0.gno b/gnovm/tests/files/recurse0.gno similarity index 100% rename from tests/files/recurse0.gno rename to gnovm/tests/files/recurse0.gno diff --git a/tests/files/redeclaration-global0.gno b/gnovm/tests/files/redeclaration-global0.gno similarity index 100% rename from tests/files/redeclaration-global0.gno rename to gnovm/tests/files/redeclaration-global0.gno diff --git a/tests/files/redeclaration-global1.gno b/gnovm/tests/files/redeclaration-global1.gno similarity index 100% rename from tests/files/redeclaration-global1.gno rename to gnovm/tests/files/redeclaration-global1.gno diff --git a/tests/files/redeclaration-global5.gno b/gnovm/tests/files/redeclaration-global5.gno similarity index 100% rename from tests/files/redeclaration-global5.gno rename to gnovm/tests/files/redeclaration-global5.gno diff --git a/tests/files/redeclaration0.gno b/gnovm/tests/files/redeclaration0.gno similarity index 100% rename from tests/files/redeclaration0.gno rename to gnovm/tests/files/redeclaration0.gno diff --git a/tests/files/redeclaration1.gno b/gnovm/tests/files/redeclaration1.gno similarity index 100% rename from tests/files/redeclaration1.gno rename to gnovm/tests/files/redeclaration1.gno diff --git a/tests/files/redeclaration2.gno b/gnovm/tests/files/redeclaration2.gno similarity index 100% rename from tests/files/redeclaration2.gno rename to gnovm/tests/files/redeclaration2.gno diff --git a/tests/files/redeclaration3.gno b/gnovm/tests/files/redeclaration3.gno similarity index 100% rename from tests/files/redeclaration3.gno rename to gnovm/tests/files/redeclaration3.gno diff --git a/tests/files/redeclaration4.gno b/gnovm/tests/files/redeclaration4.gno similarity index 100% rename from tests/files/redeclaration4.gno rename to gnovm/tests/files/redeclaration4.gno diff --git a/tests/files/redeclaration5.gno b/gnovm/tests/files/redeclaration5.gno similarity index 100% rename from tests/files/redeclaration5.gno rename to gnovm/tests/files/redeclaration5.gno diff --git a/tests/files/ret1.gno b/gnovm/tests/files/ret1.gno similarity index 100% rename from tests/files/ret1.gno rename to gnovm/tests/files/ret1.gno diff --git a/tests/files/ret10.gno b/gnovm/tests/files/ret10.gno similarity index 100% rename from tests/files/ret10.gno rename to gnovm/tests/files/ret10.gno diff --git a/tests/files/ret11.gno b/gnovm/tests/files/ret11.gno similarity index 100% rename from tests/files/ret11.gno rename to gnovm/tests/files/ret11.gno diff --git a/tests/files/ret12.gno b/gnovm/tests/files/ret12.gno similarity index 100% rename from tests/files/ret12.gno rename to gnovm/tests/files/ret12.gno diff --git a/tests/files/ret13.gno b/gnovm/tests/files/ret13.gno similarity index 100% rename from tests/files/ret13.gno rename to gnovm/tests/files/ret13.gno diff --git a/tests/files/ret14.gno b/gnovm/tests/files/ret14.gno similarity index 100% rename from tests/files/ret14.gno rename to gnovm/tests/files/ret14.gno diff --git a/tests/files/ret2.gno b/gnovm/tests/files/ret2.gno similarity index 100% rename from tests/files/ret2.gno rename to gnovm/tests/files/ret2.gno diff --git a/tests/files/ret3.gno b/gnovm/tests/files/ret3.gno similarity index 100% rename from tests/files/ret3.gno rename to gnovm/tests/files/ret3.gno diff --git a/tests/files/ret4.gno b/gnovm/tests/files/ret4.gno similarity index 100% rename from tests/files/ret4.gno rename to gnovm/tests/files/ret4.gno diff --git a/tests/files/ret5.gno b/gnovm/tests/files/ret5.gno similarity index 100% rename from tests/files/ret5.gno rename to gnovm/tests/files/ret5.gno diff --git a/tests/files/ret6.gno b/gnovm/tests/files/ret6.gno similarity index 100% rename from tests/files/ret6.gno rename to gnovm/tests/files/ret6.gno diff --git a/tests/files/ret7.gno b/gnovm/tests/files/ret7.gno similarity index 100% rename from tests/files/ret7.gno rename to gnovm/tests/files/ret7.gno diff --git a/tests/files/ret8.gno b/gnovm/tests/files/ret8.gno similarity index 100% rename from tests/files/ret8.gno rename to gnovm/tests/files/ret8.gno diff --git a/tests/files/ret9.gno b/gnovm/tests/files/ret9.gno similarity index 100% rename from tests/files/ret9.gno rename to gnovm/tests/files/ret9.gno diff --git a/tests/files/run0.gno b/gnovm/tests/files/run0.gno similarity index 100% rename from tests/files/run0.gno rename to gnovm/tests/files/run0.gno diff --git a/tests/files/run1.gno b/gnovm/tests/files/run1.gno similarity index 100% rename from tests/files/run1.gno rename to gnovm/tests/files/run1.gno diff --git a/tests/files/run10.gno b/gnovm/tests/files/run10.gno similarity index 100% rename from tests/files/run10.gno rename to gnovm/tests/files/run10.gno diff --git a/tests/files/run11.gno b/gnovm/tests/files/run11.gno similarity index 100% rename from tests/files/run11.gno rename to gnovm/tests/files/run11.gno diff --git a/tests/files/run12.gno b/gnovm/tests/files/run12.gno similarity index 100% rename from tests/files/run12.gno rename to gnovm/tests/files/run12.gno diff --git a/tests/files/run13.gno b/gnovm/tests/files/run13.gno similarity index 100% rename from tests/files/run13.gno rename to gnovm/tests/files/run13.gno diff --git a/tests/files/run4.gno b/gnovm/tests/files/run4.gno similarity index 100% rename from tests/files/run4.gno rename to gnovm/tests/files/run4.gno diff --git a/tests/files/run5.gno b/gnovm/tests/files/run5.gno similarity index 100% rename from tests/files/run5.gno rename to gnovm/tests/files/run5.gno diff --git a/tests/files/run6.gno b/gnovm/tests/files/run6.gno similarity index 100% rename from tests/files/run6.gno rename to gnovm/tests/files/run6.gno diff --git a/tests/files/run7.gno b/gnovm/tests/files/run7.gno similarity index 100% rename from tests/files/run7.gno rename to gnovm/tests/files/run7.gno diff --git a/tests/files/run8.gno b/gnovm/tests/files/run8.gno similarity index 100% rename from tests/files/run8.gno rename to gnovm/tests/files/run8.gno diff --git a/tests/files/run9.gno b/gnovm/tests/files/run9.gno similarity index 100% rename from tests/files/run9.gno rename to gnovm/tests/files/run9.gno diff --git a/tests/files/rune0.gno b/gnovm/tests/files/rune0.gno similarity index 100% rename from tests/files/rune0.gno rename to gnovm/tests/files/rune0.gno diff --git a/tests/files/rune1.gno b/gnovm/tests/files/rune1.gno similarity index 100% rename from tests/files/rune1.gno rename to gnovm/tests/files/rune1.gno diff --git a/tests/files/rune2.gno b/gnovm/tests/files/rune2.gno similarity index 100% rename from tests/files/rune2.gno rename to gnovm/tests/files/rune2.gno diff --git a/tests/files/sample.plugin b/gnovm/tests/files/sample.plugin similarity index 100% rename from tests/files/sample.plugin rename to gnovm/tests/files/sample.plugin diff --git a/tests/files/scope0.gno b/gnovm/tests/files/scope0.gno similarity index 100% rename from tests/files/scope0.gno rename to gnovm/tests/files/scope0.gno diff --git a/tests/files/scope1.gno b/gnovm/tests/files/scope1.gno similarity index 100% rename from tests/files/scope1.gno rename to gnovm/tests/files/scope1.gno diff --git a/tests/files/scope2.gno b/gnovm/tests/files/scope2.gno similarity index 100% rename from tests/files/scope2.gno rename to gnovm/tests/files/scope2.gno diff --git a/tests/files/scope3.gno b/gnovm/tests/files/scope3.gno similarity index 100% rename from tests/files/scope3.gno rename to gnovm/tests/files/scope3.gno diff --git a/tests/files/scope4.gno b/gnovm/tests/files/scope4.gno similarity index 100% rename from tests/files/scope4.gno rename to gnovm/tests/files/scope4.gno diff --git a/tests/files/scope5.gno b/gnovm/tests/files/scope5.gno similarity index 100% rename from tests/files/scope5.gno rename to gnovm/tests/files/scope5.gno diff --git a/tests/files/scope6.gno b/gnovm/tests/files/scope6.gno similarity index 100% rename from tests/files/scope6.gno rename to gnovm/tests/files/scope6.gno diff --git a/tests/files/scope7.gno b/gnovm/tests/files/scope7.gno similarity index 100% rename from tests/files/scope7.gno rename to gnovm/tests/files/scope7.gno diff --git a/tests/files/secure.gi b/gnovm/tests/files/secure.gi similarity index 100% rename from tests/files/secure.gi rename to gnovm/tests/files/secure.gi diff --git a/tests/files/shift0.gno b/gnovm/tests/files/shift0.gno similarity index 100% rename from tests/files/shift0.gno rename to gnovm/tests/files/shift0.gno diff --git a/tests/files/shift1.gno b/gnovm/tests/files/shift1.gno similarity index 100% rename from tests/files/shift1.gno rename to gnovm/tests/files/shift1.gno diff --git a/tests/files/shift2.gno b/gnovm/tests/files/shift2.gno similarity index 100% rename from tests/files/shift2.gno rename to gnovm/tests/files/shift2.gno diff --git a/tests/files/shift3.gno b/gnovm/tests/files/shift3.gno similarity index 100% rename from tests/files/shift3.gno rename to gnovm/tests/files/shift3.gno diff --git a/tests/files/shift4.gno b/gnovm/tests/files/shift4.gno similarity index 100% rename from tests/files/shift4.gno rename to gnovm/tests/files/shift4.gno diff --git a/tests/files/shift5.gno b/gnovm/tests/files/shift5.gno similarity index 100% rename from tests/files/shift5.gno rename to gnovm/tests/files/shift5.gno diff --git a/tests/files/slice.gno b/gnovm/tests/files/slice.gno similarity index 100% rename from tests/files/slice.gno rename to gnovm/tests/files/slice.gno diff --git a/tests/files/std0.gno b/gnovm/tests/files/std0.gno similarity index 100% rename from tests/files/std0.gno rename to gnovm/tests/files/std0.gno diff --git a/tests/files/std1.gno b/gnovm/tests/files/std1.gno similarity index 100% rename from tests/files/std1.gno rename to gnovm/tests/files/std1.gno diff --git a/tests/files/std2.gno b/gnovm/tests/files/std2.gno similarity index 100% rename from tests/files/std2.gno rename to gnovm/tests/files/std2.gno diff --git a/tests/files/std3.gno b/gnovm/tests/files/std3.gno similarity index 100% rename from tests/files/std3.gno rename to gnovm/tests/files/std3.gno diff --git a/tests/files/std4.gno b/gnovm/tests/files/std4.gno similarity index 100% rename from tests/files/std4.gno rename to gnovm/tests/files/std4.gno diff --git a/tests/files/std5.gno b/gnovm/tests/files/std5.gno similarity index 100% rename from tests/files/std5.gno rename to gnovm/tests/files/std5.gno diff --git a/tests/files/std6.gno b/gnovm/tests/files/std6.gno similarity index 100% rename from tests/files/std6.gno rename to gnovm/tests/files/std6.gno diff --git a/tests/files/std7.gno b/gnovm/tests/files/std7.gno similarity index 100% rename from tests/files/std7.gno rename to gnovm/tests/files/std7.gno diff --git a/tests/files/std8.gno b/gnovm/tests/files/std8.gno similarity index 100% rename from tests/files/std8.gno rename to gnovm/tests/files/std8.gno diff --git a/tests/files/stdlibs_native.gno b/gnovm/tests/files/stdlibs_native.gno similarity index 100% rename from tests/files/stdlibs_native.gno rename to gnovm/tests/files/stdlibs_native.gno diff --git a/tests/files/stdlibs_stdlibs.gno b/gnovm/tests/files/stdlibs_stdlibs.gno similarity index 100% rename from tests/files/stdlibs_stdlibs.gno rename to gnovm/tests/files/stdlibs_stdlibs.gno diff --git a/tests/files/str.gno b/gnovm/tests/files/str.gno similarity index 100% rename from tests/files/str.gno rename to gnovm/tests/files/str.gno diff --git a/tests/files/str0.gno b/gnovm/tests/files/str0.gno similarity index 100% rename from tests/files/str0.gno rename to gnovm/tests/files/str0.gno diff --git a/tests/files/str1.gno b/gnovm/tests/files/str1.gno similarity index 100% rename from tests/files/str1.gno rename to gnovm/tests/files/str1.gno diff --git a/tests/files/str2.gno b/gnovm/tests/files/str2.gno similarity index 100% rename from tests/files/str2.gno rename to gnovm/tests/files/str2.gno diff --git a/tests/files/str3.gno b/gnovm/tests/files/str3.gno similarity index 100% rename from tests/files/str3.gno rename to gnovm/tests/files/str3.gno diff --git a/tests/files/str4.gno b/gnovm/tests/files/str4.gno similarity index 100% rename from tests/files/str4.gno rename to gnovm/tests/files/str4.gno diff --git a/tests/files/struct.gno b/gnovm/tests/files/struct.gno similarity index 100% rename from tests/files/struct.gno rename to gnovm/tests/files/struct.gno diff --git a/tests/files/struct0.gno b/gnovm/tests/files/struct0.gno similarity index 100% rename from tests/files/struct0.gno rename to gnovm/tests/files/struct0.gno diff --git a/tests/files/struct0a.gno b/gnovm/tests/files/struct0a.gno similarity index 100% rename from tests/files/struct0a.gno rename to gnovm/tests/files/struct0a.gno diff --git a/tests/files/struct1.gno b/gnovm/tests/files/struct1.gno similarity index 100% rename from tests/files/struct1.gno rename to gnovm/tests/files/struct1.gno diff --git a/tests/files/struct10.gno b/gnovm/tests/files/struct10.gno similarity index 100% rename from tests/files/struct10.gno rename to gnovm/tests/files/struct10.gno diff --git a/tests/files/struct11.gno b/gnovm/tests/files/struct11.gno similarity index 100% rename from tests/files/struct11.gno rename to gnovm/tests/files/struct11.gno diff --git a/tests/files/struct11b.gno b/gnovm/tests/files/struct11b.gno similarity index 100% rename from tests/files/struct11b.gno rename to gnovm/tests/files/struct11b.gno diff --git a/tests/files/struct12.gno b/gnovm/tests/files/struct12.gno similarity index 100% rename from tests/files/struct12.gno rename to gnovm/tests/files/struct12.gno diff --git a/tests/files/struct13_native.gno b/gnovm/tests/files/struct13_native.gno similarity index 100% rename from tests/files/struct13_native.gno rename to gnovm/tests/files/struct13_native.gno diff --git a/tests/files/struct13_stdlibs.gno b/gnovm/tests/files/struct13_stdlibs.gno similarity index 100% rename from tests/files/struct13_stdlibs.gno rename to gnovm/tests/files/struct13_stdlibs.gno diff --git a/tests/files/struct14.gno b/gnovm/tests/files/struct14.gno similarity index 100% rename from tests/files/struct14.gno rename to gnovm/tests/files/struct14.gno diff --git a/tests/files/struct16.gno b/gnovm/tests/files/struct16.gno similarity index 100% rename from tests/files/struct16.gno rename to gnovm/tests/files/struct16.gno diff --git a/tests/files/struct17.gno b/gnovm/tests/files/struct17.gno similarity index 100% rename from tests/files/struct17.gno rename to gnovm/tests/files/struct17.gno diff --git a/tests/files/struct19.gno b/gnovm/tests/files/struct19.gno similarity index 100% rename from tests/files/struct19.gno rename to gnovm/tests/files/struct19.gno diff --git a/tests/files/struct2.gno b/gnovm/tests/files/struct2.gno similarity index 100% rename from tests/files/struct2.gno rename to gnovm/tests/files/struct2.gno diff --git a/tests/files/struct20.gno b/gnovm/tests/files/struct20.gno similarity index 100% rename from tests/files/struct20.gno rename to gnovm/tests/files/struct20.gno diff --git a/tests/files/struct21.gno b/gnovm/tests/files/struct21.gno similarity index 100% rename from tests/files/struct21.gno rename to gnovm/tests/files/struct21.gno diff --git a/tests/files/struct22.gno b/gnovm/tests/files/struct22.gno similarity index 100% rename from tests/files/struct22.gno rename to gnovm/tests/files/struct22.gno diff --git a/tests/files/struct24.gno b/gnovm/tests/files/struct24.gno similarity index 100% rename from tests/files/struct24.gno rename to gnovm/tests/files/struct24.gno diff --git a/tests/files/struct25.gno b/gnovm/tests/files/struct25.gno similarity index 100% rename from tests/files/struct25.gno rename to gnovm/tests/files/struct25.gno diff --git a/tests/files/struct26.gno b/gnovm/tests/files/struct26.gno similarity index 100% rename from tests/files/struct26.gno rename to gnovm/tests/files/struct26.gno diff --git a/tests/files/struct27.gno b/gnovm/tests/files/struct27.gno similarity index 100% rename from tests/files/struct27.gno rename to gnovm/tests/files/struct27.gno diff --git a/tests/files/struct28b.gno b/gnovm/tests/files/struct28b.gno similarity index 100% rename from tests/files/struct28b.gno rename to gnovm/tests/files/struct28b.gno diff --git a/tests/files/struct29.gno b/gnovm/tests/files/struct29.gno similarity index 100% rename from tests/files/struct29.gno rename to gnovm/tests/files/struct29.gno diff --git a/tests/files/struct3.gno b/gnovm/tests/files/struct3.gno similarity index 100% rename from tests/files/struct3.gno rename to gnovm/tests/files/struct3.gno diff --git a/tests/files/struct30.gno b/gnovm/tests/files/struct30.gno similarity index 100% rename from tests/files/struct30.gno rename to gnovm/tests/files/struct30.gno diff --git a/tests/files/struct31.gno b/gnovm/tests/files/struct31.gno similarity index 100% rename from tests/files/struct31.gno rename to gnovm/tests/files/struct31.gno diff --git a/tests/files/struct32.gno b/gnovm/tests/files/struct32.gno similarity index 100% rename from tests/files/struct32.gno rename to gnovm/tests/files/struct32.gno diff --git a/tests/files/struct33.gno b/gnovm/tests/files/struct33.gno similarity index 100% rename from tests/files/struct33.gno rename to gnovm/tests/files/struct33.gno diff --git a/tests/files/struct34.gno b/gnovm/tests/files/struct34.gno similarity index 100% rename from tests/files/struct34.gno rename to gnovm/tests/files/struct34.gno diff --git a/tests/files/struct35.gno b/gnovm/tests/files/struct35.gno similarity index 100% rename from tests/files/struct35.gno rename to gnovm/tests/files/struct35.gno diff --git a/tests/files/struct36.gno b/gnovm/tests/files/struct36.gno similarity index 100% rename from tests/files/struct36.gno rename to gnovm/tests/files/struct36.gno diff --git a/tests/files/struct37.gno b/gnovm/tests/files/struct37.gno similarity index 100% rename from tests/files/struct37.gno rename to gnovm/tests/files/struct37.gno diff --git a/tests/files/struct38.gno b/gnovm/tests/files/struct38.gno similarity index 100% rename from tests/files/struct38.gno rename to gnovm/tests/files/struct38.gno diff --git a/tests/files/struct39.gno b/gnovm/tests/files/struct39.gno similarity index 100% rename from tests/files/struct39.gno rename to gnovm/tests/files/struct39.gno diff --git a/tests/files/struct4.gno b/gnovm/tests/files/struct4.gno similarity index 100% rename from tests/files/struct4.gno rename to gnovm/tests/files/struct4.gno diff --git a/tests/files/struct40.gno b/gnovm/tests/files/struct40.gno similarity index 100% rename from tests/files/struct40.gno rename to gnovm/tests/files/struct40.gno diff --git a/tests/files/struct41.gno b/gnovm/tests/files/struct41.gno similarity index 100% rename from tests/files/struct41.gno rename to gnovm/tests/files/struct41.gno diff --git a/tests/files/struct42.gno b/gnovm/tests/files/struct42.gno similarity index 100% rename from tests/files/struct42.gno rename to gnovm/tests/files/struct42.gno diff --git a/tests/files/struct43.gno b/gnovm/tests/files/struct43.gno similarity index 100% rename from tests/files/struct43.gno rename to gnovm/tests/files/struct43.gno diff --git a/tests/files/struct44.gno b/gnovm/tests/files/struct44.gno similarity index 100% rename from tests/files/struct44.gno rename to gnovm/tests/files/struct44.gno diff --git a/tests/files/struct45.gno b/gnovm/tests/files/struct45.gno similarity index 100% rename from tests/files/struct45.gno rename to gnovm/tests/files/struct45.gno diff --git a/tests/files/struct46.gno b/gnovm/tests/files/struct46.gno similarity index 100% rename from tests/files/struct46.gno rename to gnovm/tests/files/struct46.gno diff --git a/tests/files/struct47.gno b/gnovm/tests/files/struct47.gno similarity index 100% rename from tests/files/struct47.gno rename to gnovm/tests/files/struct47.gno diff --git a/tests/files/struct48.gno b/gnovm/tests/files/struct48.gno similarity index 100% rename from tests/files/struct48.gno rename to gnovm/tests/files/struct48.gno diff --git a/tests/files/struct49.gno b/gnovm/tests/files/struct49.gno similarity index 100% rename from tests/files/struct49.gno rename to gnovm/tests/files/struct49.gno diff --git a/tests/files/struct5.gno b/gnovm/tests/files/struct5.gno similarity index 100% rename from tests/files/struct5.gno rename to gnovm/tests/files/struct5.gno diff --git a/tests/files/struct50b.gno b/gnovm/tests/files/struct50b.gno similarity index 100% rename from tests/files/struct50b.gno rename to gnovm/tests/files/struct50b.gno diff --git a/tests/files/struct52b.gno b/gnovm/tests/files/struct52b.gno similarity index 100% rename from tests/files/struct52b.gno rename to gnovm/tests/files/struct52b.gno diff --git a/tests/files/struct53b.gno b/gnovm/tests/files/struct53b.gno similarity index 100% rename from tests/files/struct53b.gno rename to gnovm/tests/files/struct53b.gno diff --git a/tests/files/struct54.gno b/gnovm/tests/files/struct54.gno similarity index 100% rename from tests/files/struct54.gno rename to gnovm/tests/files/struct54.gno diff --git a/tests/files/struct56.gno b/gnovm/tests/files/struct56.gno similarity index 100% rename from tests/files/struct56.gno rename to gnovm/tests/files/struct56.gno diff --git a/tests/files/struct57.gno b/gnovm/tests/files/struct57.gno similarity index 100% rename from tests/files/struct57.gno rename to gnovm/tests/files/struct57.gno diff --git a/tests/files/struct6.gno b/gnovm/tests/files/struct6.gno similarity index 100% rename from tests/files/struct6.gno rename to gnovm/tests/files/struct6.gno diff --git a/tests/files/struct7.gno b/gnovm/tests/files/struct7.gno similarity index 100% rename from tests/files/struct7.gno rename to gnovm/tests/files/struct7.gno diff --git a/tests/files/struct8.gno b/gnovm/tests/files/struct8.gno similarity index 100% rename from tests/files/struct8.gno rename to gnovm/tests/files/struct8.gno diff --git a/tests/files/struct9.gno b/gnovm/tests/files/struct9.gno similarity index 100% rename from tests/files/struct9.gno rename to gnovm/tests/files/struct9.gno diff --git a/tests/files/switch.gno b/gnovm/tests/files/switch.gno similarity index 100% rename from tests/files/switch.gno rename to gnovm/tests/files/switch.gno diff --git a/tests/files/switch0.gno b/gnovm/tests/files/switch0.gno similarity index 100% rename from tests/files/switch0.gno rename to gnovm/tests/files/switch0.gno diff --git a/tests/files/switch1.gno b/gnovm/tests/files/switch1.gno similarity index 100% rename from tests/files/switch1.gno rename to gnovm/tests/files/switch1.gno diff --git a/tests/files/switch10.gno b/gnovm/tests/files/switch10.gno similarity index 100% rename from tests/files/switch10.gno rename to gnovm/tests/files/switch10.gno diff --git a/tests/files/switch11.gno b/gnovm/tests/files/switch11.gno similarity index 100% rename from tests/files/switch11.gno rename to gnovm/tests/files/switch11.gno diff --git a/tests/files/switch12.gno b/gnovm/tests/files/switch12.gno similarity index 100% rename from tests/files/switch12.gno rename to gnovm/tests/files/switch12.gno diff --git a/tests/files/switch13.gno b/gnovm/tests/files/switch13.gno similarity index 100% rename from tests/files/switch13.gno rename to gnovm/tests/files/switch13.gno diff --git a/tests/files/switch14.gno b/gnovm/tests/files/switch14.gno similarity index 100% rename from tests/files/switch14.gno rename to gnovm/tests/files/switch14.gno diff --git a/tests/files/switch15.gno b/gnovm/tests/files/switch15.gno similarity index 100% rename from tests/files/switch15.gno rename to gnovm/tests/files/switch15.gno diff --git a/tests/files/switch16.gno b/gnovm/tests/files/switch16.gno similarity index 100% rename from tests/files/switch16.gno rename to gnovm/tests/files/switch16.gno diff --git a/tests/files/switch17.gno b/gnovm/tests/files/switch17.gno similarity index 100% rename from tests/files/switch17.gno rename to gnovm/tests/files/switch17.gno diff --git a/tests/files/switch18.gno b/gnovm/tests/files/switch18.gno similarity index 100% rename from tests/files/switch18.gno rename to gnovm/tests/files/switch18.gno diff --git a/tests/files/switch19.gno b/gnovm/tests/files/switch19.gno similarity index 100% rename from tests/files/switch19.gno rename to gnovm/tests/files/switch19.gno diff --git a/tests/files/switch2.gno b/gnovm/tests/files/switch2.gno similarity index 100% rename from tests/files/switch2.gno rename to gnovm/tests/files/switch2.gno diff --git a/tests/files/switch20.gno b/gnovm/tests/files/switch20.gno similarity index 100% rename from tests/files/switch20.gno rename to gnovm/tests/files/switch20.gno diff --git a/tests/files/switch21.gno b/gnovm/tests/files/switch21.gno similarity index 100% rename from tests/files/switch21.gno rename to gnovm/tests/files/switch21.gno diff --git a/tests/files/switch22.gno b/gnovm/tests/files/switch22.gno similarity index 100% rename from tests/files/switch22.gno rename to gnovm/tests/files/switch22.gno diff --git a/tests/files/switch23.gno b/gnovm/tests/files/switch23.gno similarity index 100% rename from tests/files/switch23.gno rename to gnovm/tests/files/switch23.gno diff --git a/tests/files/switch24.gno b/gnovm/tests/files/switch24.gno similarity index 100% rename from tests/files/switch24.gno rename to gnovm/tests/files/switch24.gno diff --git a/tests/files/switch25.gno b/gnovm/tests/files/switch25.gno similarity index 100% rename from tests/files/switch25.gno rename to gnovm/tests/files/switch25.gno diff --git a/tests/files/switch26.gno b/gnovm/tests/files/switch26.gno similarity index 100% rename from tests/files/switch26.gno rename to gnovm/tests/files/switch26.gno diff --git a/tests/files/switch27.gno b/gnovm/tests/files/switch27.gno similarity index 100% rename from tests/files/switch27.gno rename to gnovm/tests/files/switch27.gno diff --git a/tests/files/switch28.gno b/gnovm/tests/files/switch28.gno similarity index 100% rename from tests/files/switch28.gno rename to gnovm/tests/files/switch28.gno diff --git a/tests/files/switch29.gno b/gnovm/tests/files/switch29.gno similarity index 100% rename from tests/files/switch29.gno rename to gnovm/tests/files/switch29.gno diff --git a/tests/files/switch3.gno b/gnovm/tests/files/switch3.gno similarity index 100% rename from tests/files/switch3.gno rename to gnovm/tests/files/switch3.gno diff --git a/tests/files/switch30.gno b/gnovm/tests/files/switch30.gno similarity index 100% rename from tests/files/switch30.gno rename to gnovm/tests/files/switch30.gno diff --git a/tests/files/switch31.gno b/gnovm/tests/files/switch31.gno similarity index 100% rename from tests/files/switch31.gno rename to gnovm/tests/files/switch31.gno diff --git a/tests/files/switch32.gno b/gnovm/tests/files/switch32.gno similarity index 100% rename from tests/files/switch32.gno rename to gnovm/tests/files/switch32.gno diff --git a/tests/files/switch33.gno b/gnovm/tests/files/switch33.gno similarity index 100% rename from tests/files/switch33.gno rename to gnovm/tests/files/switch33.gno diff --git a/tests/files/switch34.gno b/gnovm/tests/files/switch34.gno similarity index 100% rename from tests/files/switch34.gno rename to gnovm/tests/files/switch34.gno diff --git a/tests/files/switch35.gno b/gnovm/tests/files/switch35.gno similarity index 100% rename from tests/files/switch35.gno rename to gnovm/tests/files/switch35.gno diff --git a/tests/files/switch36.gno b/gnovm/tests/files/switch36.gno similarity index 100% rename from tests/files/switch36.gno rename to gnovm/tests/files/switch36.gno diff --git a/tests/files/switch37.gno b/gnovm/tests/files/switch37.gno similarity index 100% rename from tests/files/switch37.gno rename to gnovm/tests/files/switch37.gno diff --git a/tests/files/switch38.gno b/gnovm/tests/files/switch38.gno similarity index 100% rename from tests/files/switch38.gno rename to gnovm/tests/files/switch38.gno diff --git a/tests/files/switch39.gno b/gnovm/tests/files/switch39.gno similarity index 100% rename from tests/files/switch39.gno rename to gnovm/tests/files/switch39.gno diff --git a/tests/files/switch4.gno b/gnovm/tests/files/switch4.gno similarity index 100% rename from tests/files/switch4.gno rename to gnovm/tests/files/switch4.gno diff --git a/tests/files/switch40.gno b/gnovm/tests/files/switch40.gno similarity index 100% rename from tests/files/switch40.gno rename to gnovm/tests/files/switch40.gno diff --git a/tests/files/switch41.gno b/gnovm/tests/files/switch41.gno similarity index 100% rename from tests/files/switch41.gno rename to gnovm/tests/files/switch41.gno diff --git a/tests/files/switch5.gno b/gnovm/tests/files/switch5.gno similarity index 100% rename from tests/files/switch5.gno rename to gnovm/tests/files/switch5.gno diff --git a/tests/files/switch6.gno b/gnovm/tests/files/switch6.gno similarity index 100% rename from tests/files/switch6.gno rename to gnovm/tests/files/switch6.gno diff --git a/tests/files/switch6b.gno b/gnovm/tests/files/switch6b.gno similarity index 100% rename from tests/files/switch6b.gno rename to gnovm/tests/files/switch6b.gno diff --git a/tests/files/switch6c.gno b/gnovm/tests/files/switch6c.gno similarity index 100% rename from tests/files/switch6c.gno rename to gnovm/tests/files/switch6c.gno diff --git a/tests/files/switch7.gno b/gnovm/tests/files/switch7.gno similarity index 100% rename from tests/files/switch7.gno rename to gnovm/tests/files/switch7.gno diff --git a/tests/files/switch8.gno b/gnovm/tests/files/switch8.gno similarity index 100% rename from tests/files/switch8.gno rename to gnovm/tests/files/switch8.gno diff --git a/tests/files/switch8b.gno b/gnovm/tests/files/switch8b.gno similarity index 100% rename from tests/files/switch8b.gno rename to gnovm/tests/files/switch8b.gno diff --git a/tests/files/switch8c.gno b/gnovm/tests/files/switch8c.gno similarity index 100% rename from tests/files/switch8c.gno rename to gnovm/tests/files/switch8c.gno diff --git a/tests/files/switch9.gno b/gnovm/tests/files/switch9.gno similarity index 100% rename from tests/files/switch9.gno rename to gnovm/tests/files/switch9.gno diff --git a/tests/files/time0_native.gno b/gnovm/tests/files/time0_native.gno similarity index 100% rename from tests/files/time0_native.gno rename to gnovm/tests/files/time0_native.gno diff --git a/tests/files/time0_stdlibs.gno b/gnovm/tests/files/time0_stdlibs.gno similarity index 100% rename from tests/files/time0_stdlibs.gno rename to gnovm/tests/files/time0_stdlibs.gno diff --git a/tests/files/time11_native.gno b/gnovm/tests/files/time11_native.gno similarity index 100% rename from tests/files/time11_native.gno rename to gnovm/tests/files/time11_native.gno diff --git a/tests/files/time11_stdlibs.gno b/gnovm/tests/files/time11_stdlibs.gno similarity index 100% rename from tests/files/time11_stdlibs.gno rename to gnovm/tests/files/time11_stdlibs.gno diff --git a/tests/files/time12_native.gno b/gnovm/tests/files/time12_native.gno similarity index 100% rename from tests/files/time12_native.gno rename to gnovm/tests/files/time12_native.gno diff --git a/tests/files/time12_stdlibs.gno b/gnovm/tests/files/time12_stdlibs.gno similarity index 100% rename from tests/files/time12_stdlibs.gno rename to gnovm/tests/files/time12_stdlibs.gno diff --git a/tests/files/time13_native.gno b/gnovm/tests/files/time13_native.gno similarity index 100% rename from tests/files/time13_native.gno rename to gnovm/tests/files/time13_native.gno diff --git a/tests/files/time13_stdlibs.gno b/gnovm/tests/files/time13_stdlibs.gno similarity index 100% rename from tests/files/time13_stdlibs.gno rename to gnovm/tests/files/time13_stdlibs.gno diff --git a/tests/files/time14_native.gno b/gnovm/tests/files/time14_native.gno similarity index 100% rename from tests/files/time14_native.gno rename to gnovm/tests/files/time14_native.gno diff --git a/tests/files/time14_stdlibs.gno b/gnovm/tests/files/time14_stdlibs.gno similarity index 100% rename from tests/files/time14_stdlibs.gno rename to gnovm/tests/files/time14_stdlibs.gno diff --git a/tests/files/time15.gno b/gnovm/tests/files/time15.gno similarity index 100% rename from tests/files/time15.gno rename to gnovm/tests/files/time15.gno diff --git a/tests/files/time1_native.gno b/gnovm/tests/files/time1_native.gno similarity index 100% rename from tests/files/time1_native.gno rename to gnovm/tests/files/time1_native.gno diff --git a/tests/files/time1_stdlibs.gno b/gnovm/tests/files/time1_stdlibs.gno similarity index 100% rename from tests/files/time1_stdlibs.gno rename to gnovm/tests/files/time1_stdlibs.gno diff --git a/tests/files/time2_native.gno b/gnovm/tests/files/time2_native.gno similarity index 100% rename from tests/files/time2_native.gno rename to gnovm/tests/files/time2_native.gno diff --git a/tests/files/time2_stdlibs.gno b/gnovm/tests/files/time2_stdlibs.gno similarity index 100% rename from tests/files/time2_stdlibs.gno rename to gnovm/tests/files/time2_stdlibs.gno diff --git a/tests/files/time3_native.gno b/gnovm/tests/files/time3_native.gno similarity index 100% rename from tests/files/time3_native.gno rename to gnovm/tests/files/time3_native.gno diff --git a/tests/files/time3_stdlibs.gno b/gnovm/tests/files/time3_stdlibs.gno similarity index 100% rename from tests/files/time3_stdlibs.gno rename to gnovm/tests/files/time3_stdlibs.gno diff --git a/tests/files/time4_native.gno b/gnovm/tests/files/time4_native.gno similarity index 100% rename from tests/files/time4_native.gno rename to gnovm/tests/files/time4_native.gno diff --git a/tests/files/time4_stdlibs.gno b/gnovm/tests/files/time4_stdlibs.gno similarity index 100% rename from tests/files/time4_stdlibs.gno rename to gnovm/tests/files/time4_stdlibs.gno diff --git a/tests/files/time6_native.gno b/gnovm/tests/files/time6_native.gno similarity index 100% rename from tests/files/time6_native.gno rename to gnovm/tests/files/time6_native.gno diff --git a/tests/files/time6_stdlibs.gno b/gnovm/tests/files/time6_stdlibs.gno similarity index 100% rename from tests/files/time6_stdlibs.gno rename to gnovm/tests/files/time6_stdlibs.gno diff --git a/tests/files/time7_native.gno b/gnovm/tests/files/time7_native.gno similarity index 100% rename from tests/files/time7_native.gno rename to gnovm/tests/files/time7_native.gno diff --git a/tests/files/time7_stdlibs.gno b/gnovm/tests/files/time7_stdlibs.gno similarity index 100% rename from tests/files/time7_stdlibs.gno rename to gnovm/tests/files/time7_stdlibs.gno diff --git a/tests/files/time8.gno b/gnovm/tests/files/time8.gno similarity index 100% rename from tests/files/time8.gno rename to gnovm/tests/files/time8.gno diff --git a/tests/files/time9_native.gno b/gnovm/tests/files/time9_native.gno similarity index 100% rename from tests/files/time9_native.gno rename to gnovm/tests/files/time9_native.gno diff --git a/tests/files/time9_stdlibs.gno b/gnovm/tests/files/time9_stdlibs.gno similarity index 100% rename from tests/files/time9_stdlibs.gno rename to gnovm/tests/files/time9_stdlibs.gno diff --git a/tests/files/type0.gno b/gnovm/tests/files/type0.gno similarity index 100% rename from tests/files/type0.gno rename to gnovm/tests/files/type0.gno diff --git a/tests/files/type1.gno b/gnovm/tests/files/type1.gno similarity index 100% rename from tests/files/type1.gno rename to gnovm/tests/files/type1.gno diff --git a/tests/files/type11.gno b/gnovm/tests/files/type11.gno similarity index 100% rename from tests/files/type11.gno rename to gnovm/tests/files/type11.gno diff --git a/tests/files/type12.gno b/gnovm/tests/files/type12.gno similarity index 100% rename from tests/files/type12.gno rename to gnovm/tests/files/type12.gno diff --git a/tests/files/type13.gno b/gnovm/tests/files/type13.gno similarity index 100% rename from tests/files/type13.gno rename to gnovm/tests/files/type13.gno diff --git a/tests/files/type14.gno b/gnovm/tests/files/type14.gno similarity index 100% rename from tests/files/type14.gno rename to gnovm/tests/files/type14.gno diff --git a/tests/files/type15.gno b/gnovm/tests/files/type15.gno similarity index 100% rename from tests/files/type15.gno rename to gnovm/tests/files/type15.gno diff --git a/tests/files/type16.gno b/gnovm/tests/files/type16.gno similarity index 100% rename from tests/files/type16.gno rename to gnovm/tests/files/type16.gno diff --git a/tests/files/type17.gno b/gnovm/tests/files/type17.gno similarity index 100% rename from tests/files/type17.gno rename to gnovm/tests/files/type17.gno diff --git a/tests/files/type18.gno b/gnovm/tests/files/type18.gno similarity index 100% rename from tests/files/type18.gno rename to gnovm/tests/files/type18.gno diff --git a/tests/files/type19.gno b/gnovm/tests/files/type19.gno similarity index 100% rename from tests/files/type19.gno rename to gnovm/tests/files/type19.gno diff --git a/tests/files/type20.gno b/gnovm/tests/files/type20.gno similarity index 100% rename from tests/files/type20.gno rename to gnovm/tests/files/type20.gno diff --git a/tests/files/type22.gno b/gnovm/tests/files/type22.gno similarity index 100% rename from tests/files/type22.gno rename to gnovm/tests/files/type22.gno diff --git a/tests/files/type23b.gno b/gnovm/tests/files/type23b.gno similarity index 100% rename from tests/files/type23b.gno rename to gnovm/tests/files/type23b.gno diff --git a/tests/files/type24b.gno b/gnovm/tests/files/type24b.gno similarity index 100% rename from tests/files/type24b.gno rename to gnovm/tests/files/type24b.gno diff --git a/tests/files/type2_native.gno b/gnovm/tests/files/type2_native.gno similarity index 100% rename from tests/files/type2_native.gno rename to gnovm/tests/files/type2_native.gno diff --git a/tests/files/type2_stdlibs.gno b/gnovm/tests/files/type2_stdlibs.gno similarity index 100% rename from tests/files/type2_stdlibs.gno rename to gnovm/tests/files/type2_stdlibs.gno diff --git a/tests/files/type3.gno b/gnovm/tests/files/type3.gno similarity index 100% rename from tests/files/type3.gno rename to gnovm/tests/files/type3.gno diff --git a/tests/files/type30.gno b/gnovm/tests/files/type30.gno similarity index 100% rename from tests/files/type30.gno rename to gnovm/tests/files/type30.gno diff --git a/tests/files/type31.gno b/gnovm/tests/files/type31.gno similarity index 100% rename from tests/files/type31.gno rename to gnovm/tests/files/type31.gno diff --git a/tests/files/type32.gno b/gnovm/tests/files/type32.gno similarity index 100% rename from tests/files/type32.gno rename to gnovm/tests/files/type32.gno diff --git a/tests/files/type7.gno b/gnovm/tests/files/type7.gno similarity index 100% rename from tests/files/type7.gno rename to gnovm/tests/files/type7.gno diff --git a/tests/files/type8.gno b/gnovm/tests/files/type8.gno similarity index 100% rename from tests/files/type8.gno rename to gnovm/tests/files/type8.gno diff --git a/tests/files/unary.gno b/gnovm/tests/files/unary.gno similarity index 100% rename from tests/files/unary.gno rename to gnovm/tests/files/unary.gno diff --git a/tests/files/unary1.gno b/gnovm/tests/files/unary1.gno similarity index 100% rename from tests/files/unary1.gno rename to gnovm/tests/files/unary1.gno diff --git a/tests/files/untyped0.gno b/gnovm/tests/files/untyped0.gno similarity index 100% rename from tests/files/untyped0.gno rename to gnovm/tests/files/untyped0.gno diff --git a/tests/files/untyped1.gno b/gnovm/tests/files/untyped1.gno similarity index 100% rename from tests/files/untyped1.gno rename to gnovm/tests/files/untyped1.gno diff --git a/tests/files/var.gno b/gnovm/tests/files/var.gno similarity index 100% rename from tests/files/var.gno rename to gnovm/tests/files/var.gno diff --git a/tests/files/var10.gno b/gnovm/tests/files/var10.gno similarity index 100% rename from tests/files/var10.gno rename to gnovm/tests/files/var10.gno diff --git a/tests/files/var11.gno b/gnovm/tests/files/var11.gno similarity index 100% rename from tests/files/var11.gno rename to gnovm/tests/files/var11.gno diff --git a/tests/files/var12.gno b/gnovm/tests/files/var12.gno similarity index 100% rename from tests/files/var12.gno rename to gnovm/tests/files/var12.gno diff --git a/tests/files/var13.gno b/gnovm/tests/files/var13.gno similarity index 100% rename from tests/files/var13.gno rename to gnovm/tests/files/var13.gno diff --git a/tests/files/var14.gno b/gnovm/tests/files/var14.gno similarity index 100% rename from tests/files/var14.gno rename to gnovm/tests/files/var14.gno diff --git a/tests/files/var15.gno b/gnovm/tests/files/var15.gno similarity index 100% rename from tests/files/var15.gno rename to gnovm/tests/files/var15.gno diff --git a/tests/files/var16.gno b/gnovm/tests/files/var16.gno similarity index 100% rename from tests/files/var16.gno rename to gnovm/tests/files/var16.gno diff --git a/tests/files/var17.gno b/gnovm/tests/files/var17.gno similarity index 100% rename from tests/files/var17.gno rename to gnovm/tests/files/var17.gno diff --git a/tests/files/var2.gno b/gnovm/tests/files/var2.gno similarity index 100% rename from tests/files/var2.gno rename to gnovm/tests/files/var2.gno diff --git a/tests/files/var3.gno b/gnovm/tests/files/var3.gno similarity index 100% rename from tests/files/var3.gno rename to gnovm/tests/files/var3.gno diff --git a/tests/files/var4.gno b/gnovm/tests/files/var4.gno similarity index 100% rename from tests/files/var4.gno rename to gnovm/tests/files/var4.gno diff --git a/tests/files/var5.gno b/gnovm/tests/files/var5.gno similarity index 100% rename from tests/files/var5.gno rename to gnovm/tests/files/var5.gno diff --git a/tests/files/var6.gno b/gnovm/tests/files/var6.gno similarity index 100% rename from tests/files/var6.gno rename to gnovm/tests/files/var6.gno diff --git a/tests/files/var7.gno b/gnovm/tests/files/var7.gno similarity index 100% rename from tests/files/var7.gno rename to gnovm/tests/files/var7.gno diff --git a/tests/files/var9.gno b/gnovm/tests/files/var9.gno similarity index 100% rename from tests/files/var9.gno rename to gnovm/tests/files/var9.gno diff --git a/tests/files/variadic.gno b/gnovm/tests/files/variadic.gno similarity index 100% rename from tests/files/variadic.gno rename to gnovm/tests/files/variadic.gno diff --git a/tests/files/variadic0.gno b/gnovm/tests/files/variadic0.gno similarity index 100% rename from tests/files/variadic0.gno rename to gnovm/tests/files/variadic0.gno diff --git a/tests/files/variadic1.gno b/gnovm/tests/files/variadic1.gno similarity index 100% rename from tests/files/variadic1.gno rename to gnovm/tests/files/variadic1.gno diff --git a/tests/files/variadic2.gno b/gnovm/tests/files/variadic2.gno similarity index 100% rename from tests/files/variadic2.gno rename to gnovm/tests/files/variadic2.gno diff --git a/tests/files/variadic3.gno b/gnovm/tests/files/variadic3.gno similarity index 100% rename from tests/files/variadic3.gno rename to gnovm/tests/files/variadic3.gno diff --git a/tests/files/variadic4.gno b/gnovm/tests/files/variadic4.gno similarity index 100% rename from tests/files/variadic4.gno rename to gnovm/tests/files/variadic4.gno diff --git a/tests/files/variadic5.gno b/gnovm/tests/files/variadic5.gno similarity index 100% rename from tests/files/variadic5.gno rename to gnovm/tests/files/variadic5.gno diff --git a/tests/files/variadic6.gno b/gnovm/tests/files/variadic6.gno similarity index 100% rename from tests/files/variadic6.gno rename to gnovm/tests/files/variadic6.gno diff --git a/tests/files/variadic9.gno b/gnovm/tests/files/variadic9.gno similarity index 100% rename from tests/files/variadic9.gno rename to gnovm/tests/files/variadic9.gno diff --git a/tests/files/xfactor_long.gno b/gnovm/tests/files/xfactor_long.gno similarity index 100% rename from tests/files/xfactor_long.gno rename to gnovm/tests/files/xfactor_long.gno diff --git a/tests/files/xfib_long.gno b/gnovm/tests/files/xfib_long.gno similarity index 100% rename from tests/files/xfib_long.gno rename to gnovm/tests/files/xfib_long.gno diff --git a/tests/files/zavltree.gno b/gnovm/tests/files/zavltree.gno similarity index 100% rename from tests/files/zavltree.gno rename to gnovm/tests/files/zavltree.gno diff --git a/tests/files/zavltree0.gno b/gnovm/tests/files/zavltree0.gno similarity index 100% rename from tests/files/zavltree0.gno rename to gnovm/tests/files/zavltree0.gno diff --git a/tests/files/zavltree1.gno b/gnovm/tests/files/zavltree1.gno similarity index 100% rename from tests/files/zavltree1.gno rename to gnovm/tests/files/zavltree1.gno diff --git a/tests/files/zrealm0.gno b/gnovm/tests/files/zrealm0.gno similarity index 100% rename from tests/files/zrealm0.gno rename to gnovm/tests/files/zrealm0.gno diff --git a/tests/files/zrealm1.gno b/gnovm/tests/files/zrealm1.gno similarity index 100% rename from tests/files/zrealm1.gno rename to gnovm/tests/files/zrealm1.gno diff --git a/tests/files/zrealm10.gno b/gnovm/tests/files/zrealm10.gno similarity index 100% rename from tests/files/zrealm10.gno rename to gnovm/tests/files/zrealm10.gno diff --git a/tests/files/zrealm11.gno b/gnovm/tests/files/zrealm11.gno similarity index 100% rename from tests/files/zrealm11.gno rename to gnovm/tests/files/zrealm11.gno diff --git a/tests/files/zrealm12.gno b/gnovm/tests/files/zrealm12.gno similarity index 100% rename from tests/files/zrealm12.gno rename to gnovm/tests/files/zrealm12.gno diff --git a/tests/files/zrealm2.gno b/gnovm/tests/files/zrealm2.gno similarity index 100% rename from tests/files/zrealm2.gno rename to gnovm/tests/files/zrealm2.gno diff --git a/tests/files/zrealm3.gno b/gnovm/tests/files/zrealm3.gno similarity index 100% rename from tests/files/zrealm3.gno rename to gnovm/tests/files/zrealm3.gno diff --git a/tests/files/zrealm4.gno b/gnovm/tests/files/zrealm4.gno similarity index 100% rename from tests/files/zrealm4.gno rename to gnovm/tests/files/zrealm4.gno diff --git a/tests/files/zrealm5.gno b/gnovm/tests/files/zrealm5.gno similarity index 100% rename from tests/files/zrealm5.gno rename to gnovm/tests/files/zrealm5.gno diff --git a/tests/files/zrealm6.gno b/gnovm/tests/files/zrealm6.gno similarity index 100% rename from tests/files/zrealm6.gno rename to gnovm/tests/files/zrealm6.gno diff --git a/tests/files/zrealm7.gno b/gnovm/tests/files/zrealm7.gno similarity index 100% rename from tests/files/zrealm7.gno rename to gnovm/tests/files/zrealm7.gno diff --git a/tests/files/zrealm8.gno b/gnovm/tests/files/zrealm8.gno similarity index 100% rename from tests/files/zrealm8.gno rename to gnovm/tests/files/zrealm8.gno diff --git a/tests/files/zrealm9.gno b/gnovm/tests/files/zrealm9.gno similarity index 100% rename from tests/files/zrealm9.gno rename to gnovm/tests/files/zrealm9.gno diff --git a/tests/files/zrealm_avl0.gno b/gnovm/tests/files/zrealm_avl0.gno similarity index 100% rename from tests/files/zrealm_avl0.gno rename to gnovm/tests/files/zrealm_avl0.gno diff --git a/tests/files/zrealm_avl1.gno b/gnovm/tests/files/zrealm_avl1.gno similarity index 100% rename from tests/files/zrealm_avl1.gno rename to gnovm/tests/files/zrealm_avl1.gno diff --git a/tests/files/zrealm_avl2.gno b/gnovm/tests/files/zrealm_avl2.gno similarity index 100% rename from tests/files/zrealm_avl2.gno rename to gnovm/tests/files/zrealm_avl2.gno diff --git a/tests/files/zrealm_const.gno b/gnovm/tests/files/zrealm_const.gno similarity index 100% rename from tests/files/zrealm_const.gno rename to gnovm/tests/files/zrealm_const.gno diff --git a/tests/files/zrealm_crossrealm0.gno b/gnovm/tests/files/zrealm_crossrealm0.gno similarity index 100% rename from tests/files/zrealm_crossrealm0.gno rename to gnovm/tests/files/zrealm_crossrealm0.gno diff --git a/tests/files/zrealm_crossrealm1.gno b/gnovm/tests/files/zrealm_crossrealm1.gno similarity index 100% rename from tests/files/zrealm_crossrealm1.gno rename to gnovm/tests/files/zrealm_crossrealm1.gno diff --git a/tests/files/zrealm_crossrealm10.gno b/gnovm/tests/files/zrealm_crossrealm10.gno similarity index 100% rename from tests/files/zrealm_crossrealm10.gno rename to gnovm/tests/files/zrealm_crossrealm10.gno diff --git a/tests/files/zrealm_crossrealm2.gno b/gnovm/tests/files/zrealm_crossrealm2.gno similarity index 100% rename from tests/files/zrealm_crossrealm2.gno rename to gnovm/tests/files/zrealm_crossrealm2.gno diff --git a/tests/files/zrealm_crossrealm3.gno b/gnovm/tests/files/zrealm_crossrealm3.gno similarity index 100% rename from tests/files/zrealm_crossrealm3.gno rename to gnovm/tests/files/zrealm_crossrealm3.gno diff --git a/tests/files/zrealm_crossrealm4.gno b/gnovm/tests/files/zrealm_crossrealm4.gno similarity index 100% rename from tests/files/zrealm_crossrealm4.gno rename to gnovm/tests/files/zrealm_crossrealm4.gno diff --git a/tests/files/zrealm_crossrealm5.gno b/gnovm/tests/files/zrealm_crossrealm5.gno similarity index 100% rename from tests/files/zrealm_crossrealm5.gno rename to gnovm/tests/files/zrealm_crossrealm5.gno diff --git a/tests/files/zrealm_crossrealm6.gno b/gnovm/tests/files/zrealm_crossrealm6.gno similarity index 100% rename from tests/files/zrealm_crossrealm6.gno rename to gnovm/tests/files/zrealm_crossrealm6.gno diff --git a/tests/files/zrealm_crossrealm7.gno b/gnovm/tests/files/zrealm_crossrealm7.gno similarity index 100% rename from tests/files/zrealm_crossrealm7.gno rename to gnovm/tests/files/zrealm_crossrealm7.gno diff --git a/tests/files/zrealm_crossrealm8.gno b/gnovm/tests/files/zrealm_crossrealm8.gno similarity index 100% rename from tests/files/zrealm_crossrealm8.gno rename to gnovm/tests/files/zrealm_crossrealm8.gno diff --git a/tests/files/zrealm_crossrealm9.gno b/gnovm/tests/files/zrealm_crossrealm9.gno similarity index 100% rename from tests/files/zrealm_crossrealm9.gno rename to gnovm/tests/files/zrealm_crossrealm9.gno diff --git a/tests/files/zrealm_example.gno b/gnovm/tests/files/zrealm_example.gno similarity index 100% rename from tests/files/zrealm_example.gno rename to gnovm/tests/files/zrealm_example.gno diff --git a/tests/files/zrealm_map0.gno b/gnovm/tests/files/zrealm_map0.gno similarity index 100% rename from tests/files/zrealm_map0.gno rename to gnovm/tests/files/zrealm_map0.gno diff --git a/tests/files/zrealm_std0.gno b/gnovm/tests/files/zrealm_std0.gno similarity index 100% rename from tests/files/zrealm_std0.gno rename to gnovm/tests/files/zrealm_std0.gno diff --git a/tests/files/zrealm_std1.gno b/gnovm/tests/files/zrealm_std1.gno similarity index 100% rename from tests/files/zrealm_std1.gno rename to gnovm/tests/files/zrealm_std1.gno diff --git a/tests/files/zrealm_std2.gno b/gnovm/tests/files/zrealm_std2.gno similarity index 100% rename from tests/files/zrealm_std2.gno rename to gnovm/tests/files/zrealm_std2.gno diff --git a/tests/files/zrealm_std3.gno b/gnovm/tests/files/zrealm_std3.gno similarity index 100% rename from tests/files/zrealm_std3.gno rename to gnovm/tests/files/zrealm_std3.gno diff --git a/tests/files/zrealm_std4.gno b/gnovm/tests/files/zrealm_std4.gno similarity index 100% rename from tests/files/zrealm_std4.gno rename to gnovm/tests/files/zrealm_std4.gno diff --git a/tests/files/zrealm_std5.gno b/gnovm/tests/files/zrealm_std5.gno similarity index 100% rename from tests/files/zrealm_std5.gno rename to gnovm/tests/files/zrealm_std5.gno diff --git a/tests/files/zrealm_tests0.gno b/gnovm/tests/files/zrealm_tests0.gno similarity index 100% rename from tests/files/zrealm_tests0.gno rename to gnovm/tests/files/zrealm_tests0.gno diff --git a/tests/files/zrealm_testutils0.gno b/gnovm/tests/files/zrealm_testutils0.gno similarity index 100% rename from tests/files/zrealm_testutils0.gno rename to gnovm/tests/files/zrealm_testutils0.gno diff --git a/tests/files/zregexp_stdlibs.gno b/gnovm/tests/files/zregexp_stdlibs.gno similarity index 100% rename from tests/files/zregexp_stdlibs.gno rename to gnovm/tests/files/zregexp_stdlibs.gno diff --git a/tests/files/zsolitaire_long.gno b/gnovm/tests/files/zsolitaire_long.gno similarity index 100% rename from tests/files/zsolitaire_long.gno rename to gnovm/tests/files/zsolitaire_long.gno diff --git a/tests/imports.go b/gnovm/tests/imports.go similarity index 97% rename from tests/imports.go rename to gnovm/tests/imports.go index 305c2244008..30a272a9989 100644 --- a/tests/imports.go +++ b/gnovm/tests/imports.go @@ -39,15 +39,15 @@ import ( "time" "unicode/utf8" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - gno "github.com/gnolang/gno/pkgs/gnolang" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/iavl" - stypes "github.com/gnolang/gno/pkgs/store/types" - "github.com/gnolang/gno/stdlibs" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/gnovm/stdlibs" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/iavl" + stypes "github.com/gnolang/gno/tm2/pkg/store/types" ) type importMode uint64 @@ -94,7 +94,7 @@ func TestStore(rootDir, filesPath string, stdin io.Reader, stdout, stderr io.Wri // if stdlibs package is preferred , try to load it first. if mode == ImportModeStdlibsOnly || mode == ImportModeStdlibsPreferred { - stdlibPath := filepath.Join(rootDir, "stdlibs", pkgPath) + stdlibPath := filepath.Join(rootDir, "gnovm", "stdlibs", pkgPath) if osm.DirExists(stdlibPath) { memPkg := gno.ReadMemPackage(stdlibPath, pkgPath) m2 := gno.NewMachineWithOptions(gno.MachineOptions{ @@ -408,7 +408,7 @@ func TestStore(rootDir, filesPath string, stdin io.Reader, stdout, stderr io.Wri // if native package is preferred, try to load stdlibs/* as backup. if mode == ImportModeNativePreferred { - stdlibPath := filepath.Join(rootDir, "stdlibs", pkgPath) + stdlibPath := filepath.Join(rootDir, "gnovm", "stdlibs", pkgPath) if osm.DirExists(stdlibPath) { memPkg := gno.ReadMemPackage(stdlibPath, pkgPath) m2 := gno.NewMachineWithOptions(gno.MachineOptions{ diff --git a/tests/integ/empty-dir/.gitkeep b/gnovm/tests/integ/empty-dir/.gitkeep similarity index 100% rename from tests/integ/empty-dir/.gitkeep rename to gnovm/tests/integ/empty-dir/.gitkeep diff --git a/tests/integ/empty-gno1/empty.gno b/gnovm/tests/integ/empty-gno1/empty.gno similarity index 100% rename from tests/integ/empty-gno1/empty.gno rename to gnovm/tests/integ/empty-gno1/empty.gno diff --git a/tests/integ/empty-gno2/empty.gno b/gnovm/tests/integ/empty-gno2/empty.gno similarity index 100% rename from tests/integ/empty-gno2/empty.gno rename to gnovm/tests/integ/empty-gno2/empty.gno diff --git a/tests/integ/empty-gno2/empty_test.gno b/gnovm/tests/integ/empty-gno2/empty_test.gno similarity index 100% rename from tests/integ/empty-gno2/empty_test.gno rename to gnovm/tests/integ/empty-gno2/empty_test.gno diff --git a/tests/integ/empty-gno3/empty.gno b/gnovm/tests/integ/empty-gno3/empty.gno similarity index 100% rename from tests/integ/empty-gno3/empty.gno rename to gnovm/tests/integ/empty-gno3/empty.gno diff --git a/tests/integ/empty-gno3/empty_filetest.gno b/gnovm/tests/integ/empty-gno3/empty_filetest.gno similarity index 100% rename from tests/integ/empty-gno3/empty_filetest.gno rename to gnovm/tests/integ/empty-gno3/empty_filetest.gno diff --git a/tests/integ/empty-gnomod/gno.mod b/gnovm/tests/integ/empty-gnomod/gno.mod similarity index 100% rename from tests/integ/empty-gnomod/gno.mod rename to gnovm/tests/integ/empty-gnomod/gno.mod diff --git a/tests/integ/failing1/failing.gno b/gnovm/tests/integ/failing1/failing.gno similarity index 100% rename from tests/integ/failing1/failing.gno rename to gnovm/tests/integ/failing1/failing.gno diff --git a/tests/integ/failing1/failing_test.gno b/gnovm/tests/integ/failing1/failing_test.gno similarity index 100% rename from tests/integ/failing1/failing_test.gno rename to gnovm/tests/integ/failing1/failing_test.gno diff --git a/tests/integ/failing2/failing.gno b/gnovm/tests/integ/failing2/failing.gno similarity index 100% rename from tests/integ/failing2/failing.gno rename to gnovm/tests/integ/failing2/failing.gno diff --git a/tests/integ/failing2/failing_filetest.gno b/gnovm/tests/integ/failing2/failing_filetest.gno similarity index 100% rename from tests/integ/failing2/failing_filetest.gno rename to gnovm/tests/integ/failing2/failing_filetest.gno diff --git a/tests/integ/invalid-module-name/gno.mod b/gnovm/tests/integ/invalid-module-name/gno.mod similarity index 100% rename from tests/integ/invalid-module-name/gno.mod rename to gnovm/tests/integ/invalid-module-name/gno.mod diff --git a/tests/integ/invalid-module-version1/gno.mod b/gnovm/tests/integ/invalid-module-version1/gno.mod similarity index 100% rename from tests/integ/invalid-module-version1/gno.mod rename to gnovm/tests/integ/invalid-module-version1/gno.mod diff --git a/tests/integ/invalid-module-version2/gno.mod b/gnovm/tests/integ/invalid-module-version2/gno.mod similarity index 100% rename from tests/integ/invalid-module-version2/gno.mod rename to gnovm/tests/integ/invalid-module-version2/gno.mod diff --git a/tests/integ/minimalist-gno1/minim.gno b/gnovm/tests/integ/minimalist-gno1/minim.gno similarity index 100% rename from tests/integ/minimalist-gno1/minim.gno rename to gnovm/tests/integ/minimalist-gno1/minim.gno diff --git a/tests/integ/minimalist-gno2/minim.gno b/gnovm/tests/integ/minimalist-gno2/minim.gno similarity index 100% rename from tests/integ/minimalist-gno2/minim.gno rename to gnovm/tests/integ/minimalist-gno2/minim.gno diff --git a/tests/integ/minimalist-gno2/minim_test.gno b/gnovm/tests/integ/minimalist-gno2/minim_test.gno similarity index 100% rename from tests/integ/minimalist-gno2/minim_test.gno rename to gnovm/tests/integ/minimalist-gno2/minim_test.gno diff --git a/tests/integ/minimalist-gno3/minim.gno b/gnovm/tests/integ/minimalist-gno3/minim.gno similarity index 100% rename from tests/integ/minimalist-gno3/minim.gno rename to gnovm/tests/integ/minimalist-gno3/minim.gno diff --git a/tests/integ/minimalist-gno3/minim_filetest.gno b/gnovm/tests/integ/minimalist-gno3/minim_filetest.gno similarity index 100% rename from tests/integ/minimalist-gno3/minim_filetest.gno rename to gnovm/tests/integ/minimalist-gno3/minim_filetest.gno diff --git a/tests/integ/minimalist-gnomod/gno.mod b/gnovm/tests/integ/minimalist-gnomod/gno.mod similarity index 100% rename from tests/integ/minimalist-gnomod/gno.mod rename to gnovm/tests/integ/minimalist-gnomod/gno.mod diff --git a/tests/integ/replace-with-dir/gno.mod b/gnovm/tests/integ/replace-with-dir/gno.mod similarity index 100% rename from tests/integ/replace-with-dir/gno.mod rename to gnovm/tests/integ/replace-with-dir/gno.mod diff --git a/tests/integ/replace-with-invalid-module/gno.mod b/gnovm/tests/integ/replace-with-invalid-module/gno.mod similarity index 100% rename from tests/integ/replace-with-invalid-module/gno.mod rename to gnovm/tests/integ/replace-with-invalid-module/gno.mod diff --git a/tests/integ/replace-with-module/gno.mod b/gnovm/tests/integ/replace-with-module/gno.mod similarity index 100% rename from tests/integ/replace-with-module/gno.mod rename to gnovm/tests/integ/replace-with-module/gno.mod diff --git a/tests/integ/require-invalid-module/gno.mod b/gnovm/tests/integ/require-invalid-module/gno.mod similarity index 100% rename from tests/integ/require-invalid-module/gno.mod rename to gnovm/tests/integ/require-invalid-module/gno.mod diff --git a/tests/integ/require-remote-module/gno.mod b/gnovm/tests/integ/require-remote-module/gno.mod similarity index 100% rename from tests/integ/require-remote-module/gno.mod rename to gnovm/tests/integ/require-remote-module/gno.mod diff --git a/tests/integ/require-remote-module/import_avl.gno b/gnovm/tests/integ/require-remote-module/import_avl.gno similarity index 100% rename from tests/integ/require-remote-module/import_avl.gno rename to gnovm/tests/integ/require-remote-module/import_avl.gno diff --git a/tests/integ/run-main/main.gno b/gnovm/tests/integ/run-main/main.gno similarity index 100% rename from tests/integ/run-main/main.gno rename to gnovm/tests/integ/run-main/main.gno diff --git a/tests/integ/run-namedpkg/main.gno b/gnovm/tests/integ/run-namedpkg/main.gno similarity index 100% rename from tests/integ/run-namedpkg/main.gno rename to gnovm/tests/integ/run-namedpkg/main.gno diff --git a/tests/integ/valid1/valid.gno b/gnovm/tests/integ/valid1/valid.gno similarity index 100% rename from tests/integ/valid1/valid.gno rename to gnovm/tests/integ/valid1/valid.gno diff --git a/tests/integ/valid1/valid_test.gno b/gnovm/tests/integ/valid1/valid_test.gno similarity index 100% rename from tests/integ/valid1/valid_test.gno rename to gnovm/tests/integ/valid1/valid_test.gno diff --git a/tests/integ/valid2/valid.gno b/gnovm/tests/integ/valid2/valid.gno similarity index 100% rename from tests/integ/valid2/valid.gno rename to gnovm/tests/integ/valid2/valid.gno diff --git a/tests/integ/valid2/valid_filetest.gno b/gnovm/tests/integ/valid2/valid_filetest.gno similarity index 100% rename from tests/integ/valid2/valid_filetest.gno rename to gnovm/tests/integ/valid2/valid_filetest.gno diff --git a/tests/package_test.go b/gnovm/tests/package_test.go similarity index 89% rename from tests/package_test.go rename to gnovm/tests/package_test.go index 5420a0ed881..34c34dfcbf1 100644 --- a/tests/package_test.go +++ b/gnovm/tests/package_test.go @@ -13,14 +13,14 @@ import ( // "go/build" - gno "github.com/gnolang/gno/pkgs/gnolang" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" ) func TestPackages(t *testing.T) { // find all packages with *_test.gno files. rootDirs := []string{ filepath.Join("..", "stdlibs"), - filepath.Join("..", "examples"), + filepath.Join("..", "..", "examples"), } testDirs := map[string]string{} // aggregate here, pkgPath -> dir pkgPaths := []string{} @@ -65,7 +65,8 @@ func runPackageTest(t *testing.T, dir string, path string) { // stdout := new(bytes.Buffer) stdout := os.Stdout stderr := new(bytes.Buffer) - store := TestStore("..", path, stdin, stdout, stderr, ImportModeStdlibsOnly) + rootDir := filepath.Join("..", "..") + store := TestStore(rootDir, path, stdin, stdout, stderr, ImportModeStdlibsOnly) store.SetLogStoreOps(true) m := gno.NewMachineWithOptions(gno.MachineOptions{ PkgPath: "test", diff --git a/tests/selector_test.go b/gnovm/tests/selector_test.go similarity index 100% rename from tests/selector_test.go rename to gnovm/tests/selector_test.go diff --git a/gnoland/assets/GNOland-TwitterBanner1500x500.png b/misc/assets/GNOland-TwitterBanner1500x500.png similarity index 100% rename from gnoland/assets/GNOland-TwitterBanner1500x500.png rename to misc/assets/GNOland-TwitterBanner1500x500.png diff --git a/gnoland/assets/GNOland-TwitterProfile590x590.png b/misc/assets/GNOland-TwitterProfile590x590.png similarity index 100% rename from gnoland/assets/GNOland-TwitterProfile590x590.png rename to misc/assets/GNOland-TwitterProfile590x590.png diff --git a/gnoland/assets/gno.land_2022_Brand_Guidelines.pdf b/misc/assets/gno.land_2022_Brand_Guidelines.pdf similarity index 100% rename from gnoland/assets/gno.land_2022_Brand_Guidelines.pdf rename to misc/assets/gno.land_2022_Brand_Guidelines.pdf diff --git a/misc/devdeps/Makefile b/misc/devdeps/Makefile index aca7c0f07c0..54df62cc031 100644 --- a/misc/devdeps/Makefile +++ b/misc/devdeps/Makefile @@ -1,3 +1,3 @@ install: go install mvdan.cc/gofumpt - go install golang.org/x/tools/gopls + go install google.golang.org/protobuf/cmd/protoc-gen-go diff --git a/misc/devdeps/deps.go b/misc/devdeps/deps.go index 4b0c279dbe6..6be8701e31f 100644 --- a/misc/devdeps/deps.go +++ b/misc/devdeps/deps.go @@ -15,4 +15,7 @@ import ( // required for formatting, linting, pls. _ "golang.org/x/tools/gopls" _ "mvdan.cc/gofumpt" + + // protoc, genproto + _ "google.golang.org/protobuf/cmd/protoc-gen-go" ) diff --git a/misc/devdeps/go.mod b/misc/devdeps/go.mod index c09d99214eb..3b70c0143be 100644 --- a/misc/devdeps/go.mod +++ b/misc/devdeps/go.mod @@ -27,6 +27,7 @@ require ( golang.org/x/tools v0.2.0 // indirect golang.org/x/vuln v0.0.0-20221025230227-995372c58a16 // indirect golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect honnef.co/go/tools v0.3.3 // indirect moul.io/banner v1.0.1 // indirect diff --git a/misc/devdeps/go.sum b/misc/devdeps/go.sum index a759310bddc..40b8a4b900b 100644 --- a/misc/devdeps/go.sum +++ b/misc/devdeps/go.sum @@ -17,8 +17,10 @@ github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmdtest v0.4.0/go.mod h1:apVn/GCasLZUVpAJ6oWAuyP7Ne7CEsQbTnc0plM3m+o= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= @@ -173,6 +175,9 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/misc/docker-build-stages.sh b/misc/docker-build-stages.sh index ac392e4fe7c..ea94322465c 100644 --- a/misc/docker-build-stages.sh +++ b/misc/docker-build-stages.sh @@ -9,7 +9,7 @@ set -x docker build --target=gnoland-slim -t ghcr.io/gnoland/gno/gnoland-slim "$ROOTDIR" docker build --target=gnokey-slim -t ghcr.io/gnoland/gno/gnokey-slim "$ROOTDIR" -docker build --target=gnodev-slim -t ghcr.io/gnoland/gno/gnodev-slim "$ROOTDIR" +docker build --target=gno-slim -t ghcr.io/gnoland/gno/gno-slim "$ROOTDIR" docker build --target=gnofaucet-slim -t ghcr.io/gnoland/gno/gnofaucet-slim "$ROOTDIR" docker build --target=gnoweb-slim -t ghcr.io/gnoland/gno/gnoweb-slim "$ROOTDIR" docker build -t ghcr.io/gnoland/gno "$ROOTDIR" diff --git a/docker-compose.yml b/misc/docker-compose/docker-compose.yml similarity index 92% rename from docker-compose.yml rename to misc/docker-compose/docker-compose.yml index 441934d6324..373cba5f513 100644 --- a/docker-compose.yml +++ b/misc/docker-compose/docker-compose.yml @@ -4,7 +4,7 @@ services: container_name: gnoland-node build: context: . - dockerfile: Dockerfile + dockerfile: ../..Dockerfile environment: - LOG_LEVEL=4 command: [ "gnoland" ] diff --git a/tests/docker-integration/README.md b/misc/docker-integration/README.md similarity index 100% rename from tests/docker-integration/README.md rename to misc/docker-integration/README.md diff --git a/tests/docker-integration/integration.go b/misc/docker-integration/integration.go similarity index 100% rename from tests/docker-integration/integration.go rename to misc/docker-integration/integration.go diff --git a/tests/docker-integration/integration_test.go b/misc/docker-integration/integration_test.go similarity index 100% rename from tests/docker-integration/integration_test.go rename to misc/docker-integration/integration_test.go diff --git a/cmd/genproto/genproto.go b/misc/genproto/genproto.go similarity index 52% rename from cmd/genproto/genproto.go rename to misc/genproto/genproto.go index 332b69ddf2c..69103a1bba6 100644 --- a/cmd/genproto/genproto.go +++ b/misc/genproto/genproto.go @@ -5,27 +5,27 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/genproto" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/genproto" + "github.com/gnolang/gno/tm2/pkg/commands" // TODO: move these out. - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/blockchain" - "github.com/gnolang/gno/pkgs/bft/consensus" - ctypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/mempool" - btypes "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/hd" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/crypto/multisig" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/sdk/bank" - "github.com/gnolang/gno/pkgs/sdk/vm" - "github.com/gnolang/gno/pkgs/std" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/blockchain" + "github.com/gnolang/gno/tm2/pkg/bft/consensus" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/mempool" + btypes "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/hd" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/crypto/multisig" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk/bank" + "github.com/gnolang/gno/tm2/pkg/sdk/vm" + "github.com/gnolang/gno/tm2/pkg/std" ) func main() { diff --git a/cmd/goscan/goscan.go b/misc/goscan/goscan.go similarity index 96% rename from cmd/goscan/goscan.go rename to misc/goscan/goscan.go index 5a375a1cc3b..405381742cf 100644 --- a/cmd/goscan/goscan.go +++ b/misc/goscan/goscan.go @@ -9,7 +9,7 @@ import ( "os" "github.com/davecgh/go-spew/spew" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" ) func main() { diff --git a/misc/logos/misc_test.go b/misc/logos/misc_test.go index 83b1a97c9a8..df8b994b66b 100644 --- a/misc/logos/misc_test.go +++ b/misc/logos/misc_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" require "github.com/jaekwon/testify/require" ) diff --git a/pkgs/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule/types.proto b/pkgs/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule/types.proto deleted file mode 100644 index 46464fa28b4..00000000000 --- a/pkgs/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule/types.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; -package submodule; - -option go_package = "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule/pb"; - -// imports -import "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2/types.proto"; - -// messages -message StructSM { - sint64 FieldA = 1; - string FieldB = 2; - submodule2.StructSM2 FieldC = 3; -} \ No newline at end of file diff --git a/pkgs/amino/genproto/example/submodule/submodule.proto b/pkgs/amino/genproto/example/submodule/submodule.proto deleted file mode 100644 index eda9c6cc1a0..00000000000 --- a/pkgs/amino/genproto/example/submodule/submodule.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; -package submodule; - -option go_package = "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule/pb"; - -// imports -import "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2/submodule2.proto"; - -// messages -message StructSM { - sint64 FieldA = 1; - string FieldB = 2; - submodule2.StructSM2 FieldC = 3; -} \ No newline at end of file diff --git a/pkgs/amino/tests/pb/tests.pb.go b/pkgs/amino/tests/pb/tests.pb.go deleted file mode 100644 index 633432728a5..00000000000 --- a/pkgs/amino/tests/pb/tests.pb.go +++ /dev/null @@ -1,5569 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.27.1 -// protoc v3.19.4 -// source: tests.proto - -package pb - -import ( - reflect "reflect" - sync "sync" - - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - anypb "google.golang.org/protobuf/types/known/anypb" - durationpb "google.golang.org/protobuf/types/known/durationpb" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// messages -type EmptyStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *EmptyStruct) Reset() { - *x = EmptyStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *EmptyStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*EmptyStruct) ProtoMessage() {} - -func (x *EmptyStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use EmptyStruct.ProtoReflect.Descriptor instead. -func (*EmptyStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{0} -} - -type PrimitivesStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8 int32 `protobuf:"zigzag32,1,opt,name=Int8,proto3" json:"Int8,omitempty"` - Int16 int32 `protobuf:"zigzag32,2,opt,name=Int16,proto3" json:"Int16,omitempty"` - Int32 int32 `protobuf:"zigzag32,3,opt,name=Int32,proto3" json:"Int32,omitempty"` - Int32Fixed int32 `protobuf:"fixed32,4,opt,name=Int32Fixed,proto3" json:"Int32Fixed,omitempty"` - Int64 int64 `protobuf:"zigzag64,5,opt,name=Int64,proto3" json:"Int64,omitempty"` - Int64Fixed int64 `protobuf:"fixed64,6,opt,name=Int64Fixed,proto3" json:"Int64Fixed,omitempty"` - Int int64 `protobuf:"zigzag64,7,opt,name=Int,proto3" json:"Int,omitempty"` - Byte uint32 `protobuf:"varint,8,opt,name=Byte,proto3" json:"Byte,omitempty"` - Uint8 uint32 `protobuf:"varint,9,opt,name=Uint8,proto3" json:"Uint8,omitempty"` - Uint16 uint32 `protobuf:"varint,10,opt,name=Uint16,proto3" json:"Uint16,omitempty"` - Uint32 uint32 `protobuf:"varint,11,opt,name=Uint32,proto3" json:"Uint32,omitempty"` - Uint32Fixed uint32 `protobuf:"fixed32,12,opt,name=Uint32Fixed,proto3" json:"Uint32Fixed,omitempty"` - Uint64 uint64 `protobuf:"varint,13,opt,name=Uint64,proto3" json:"Uint64,omitempty"` - Uint64Fixed uint64 `protobuf:"fixed64,14,opt,name=Uint64Fixed,proto3" json:"Uint64Fixed,omitempty"` - Uint uint64 `protobuf:"varint,15,opt,name=Uint,proto3" json:"Uint,omitempty"` - Str string `protobuf:"bytes,16,opt,name=Str,proto3" json:"Str,omitempty"` - Bytes []byte `protobuf:"bytes,17,opt,name=Bytes,proto3" json:"Bytes,omitempty"` - Time *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=Time,proto3" json:"Time,omitempty"` - Duration *durationpb.Duration `protobuf:"bytes,19,opt,name=Duration,proto3" json:"Duration,omitempty"` - Empty *EmptyStruct `protobuf:"bytes,20,opt,name=Empty,proto3" json:"Empty,omitempty"` -} - -func (x *PrimitivesStruct) Reset() { - *x = PrimitivesStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PrimitivesStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PrimitivesStruct) ProtoMessage() {} - -func (x *PrimitivesStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PrimitivesStruct.ProtoReflect.Descriptor instead. -func (*PrimitivesStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{1} -} - -func (x *PrimitivesStruct) GetInt8() int32 { - if x != nil { - return x.Int8 - } - return 0 -} - -func (x *PrimitivesStruct) GetInt16() int32 { - if x != nil { - return x.Int16 - } - return 0 -} - -func (x *PrimitivesStruct) GetInt32() int32 { - if x != nil { - return x.Int32 - } - return 0 -} - -func (x *PrimitivesStruct) GetInt32Fixed() int32 { - if x != nil { - return x.Int32Fixed - } - return 0 -} - -func (x *PrimitivesStruct) GetInt64() int64 { - if x != nil { - return x.Int64 - } - return 0 -} - -func (x *PrimitivesStruct) GetInt64Fixed() int64 { - if x != nil { - return x.Int64Fixed - } - return 0 -} - -func (x *PrimitivesStruct) GetInt() int64 { - if x != nil { - return x.Int - } - return 0 -} - -func (x *PrimitivesStruct) GetByte() uint32 { - if x != nil { - return x.Byte - } - return 0 -} - -func (x *PrimitivesStruct) GetUint8() uint32 { - if x != nil { - return x.Uint8 - } - return 0 -} - -func (x *PrimitivesStruct) GetUint16() uint32 { - if x != nil { - return x.Uint16 - } - return 0 -} - -func (x *PrimitivesStruct) GetUint32() uint32 { - if x != nil { - return x.Uint32 - } - return 0 -} - -func (x *PrimitivesStruct) GetUint32Fixed() uint32 { - if x != nil { - return x.Uint32Fixed - } - return 0 -} - -func (x *PrimitivesStruct) GetUint64() uint64 { - if x != nil { - return x.Uint64 - } - return 0 -} - -func (x *PrimitivesStruct) GetUint64Fixed() uint64 { - if x != nil { - return x.Uint64Fixed - } - return 0 -} - -func (x *PrimitivesStruct) GetUint() uint64 { - if x != nil { - return x.Uint - } - return 0 -} - -func (x *PrimitivesStruct) GetStr() string { - if x != nil { - return x.Str - } - return "" -} - -func (x *PrimitivesStruct) GetBytes() []byte { - if x != nil { - return x.Bytes - } - return nil -} - -func (x *PrimitivesStruct) GetTime() *timestamppb.Timestamp { - if x != nil { - return x.Time - } - return nil -} - -func (x *PrimitivesStruct) GetDuration() *durationpb.Duration { - if x != nil { - return x.Duration - } - return nil -} - -func (x *PrimitivesStruct) GetEmpty() *EmptyStruct { - if x != nil { - return x.Empty - } - return nil -} - -type ShortArraysStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TimeAr []*timestamppb.Timestamp `protobuf:"bytes,1,rep,name=TimeAr,proto3" json:"TimeAr,omitempty"` - DurationAr []*durationpb.Duration `protobuf:"bytes,2,rep,name=DurationAr,proto3" json:"DurationAr,omitempty"` -} - -func (x *ShortArraysStruct) Reset() { - *x = ShortArraysStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ShortArraysStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ShortArraysStruct) ProtoMessage() {} - -func (x *ShortArraysStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ShortArraysStruct.ProtoReflect.Descriptor instead. -func (*ShortArraysStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{2} -} - -func (x *ShortArraysStruct) GetTimeAr() []*timestamppb.Timestamp { - if x != nil { - return x.TimeAr - } - return nil -} - -func (x *ShortArraysStruct) GetDurationAr() []*durationpb.Duration { - if x != nil { - return x.DurationAr - } - return nil -} - -type ArraysStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8Ar []int32 `protobuf:"zigzag32,1,rep,packed,name=Int8Ar,proto3" json:"Int8Ar,omitempty"` - Int16Ar []int32 `protobuf:"zigzag32,2,rep,packed,name=Int16Ar,proto3" json:"Int16Ar,omitempty"` - Int32Ar []int32 `protobuf:"zigzag32,3,rep,packed,name=Int32Ar,proto3" json:"Int32Ar,omitempty"` - Int32FixedAr []int32 `protobuf:"fixed32,4,rep,packed,name=Int32FixedAr,proto3" json:"Int32FixedAr,omitempty"` - Int64Ar []int64 `protobuf:"zigzag64,5,rep,packed,name=Int64Ar,proto3" json:"Int64Ar,omitempty"` - Int64FixedAr []int64 `protobuf:"fixed64,6,rep,packed,name=Int64FixedAr,proto3" json:"Int64FixedAr,omitempty"` - IntAr []int64 `protobuf:"zigzag64,7,rep,packed,name=IntAr,proto3" json:"IntAr,omitempty"` - ByteAr []byte `protobuf:"bytes,8,opt,name=ByteAr,proto3" json:"ByteAr,omitempty"` - Uint8Ar []byte `protobuf:"bytes,9,opt,name=Uint8Ar,proto3" json:"Uint8Ar,omitempty"` - Uint16Ar []uint32 `protobuf:"varint,10,rep,packed,name=Uint16Ar,proto3" json:"Uint16Ar,omitempty"` - Uint32Ar []uint32 `protobuf:"varint,11,rep,packed,name=Uint32Ar,proto3" json:"Uint32Ar,omitempty"` - Uint32FixedAr []uint32 `protobuf:"fixed32,12,rep,packed,name=Uint32FixedAr,proto3" json:"Uint32FixedAr,omitempty"` - Uint64Ar []uint64 `protobuf:"varint,13,rep,packed,name=Uint64Ar,proto3" json:"Uint64Ar,omitempty"` - Uint64FixedAr []uint64 `protobuf:"fixed64,14,rep,packed,name=Uint64FixedAr,proto3" json:"Uint64FixedAr,omitempty"` - UintAr []uint64 `protobuf:"varint,15,rep,packed,name=UintAr,proto3" json:"UintAr,omitempty"` - StrAr []string `protobuf:"bytes,16,rep,name=StrAr,proto3" json:"StrAr,omitempty"` - BytesAr [][]byte `protobuf:"bytes,17,rep,name=BytesAr,proto3" json:"BytesAr,omitempty"` - TimeAr []*timestamppb.Timestamp `protobuf:"bytes,18,rep,name=TimeAr,proto3" json:"TimeAr,omitempty"` - DurationAr []*durationpb.Duration `protobuf:"bytes,19,rep,name=DurationAr,proto3" json:"DurationAr,omitempty"` - EmptyAr []*EmptyStruct `protobuf:"bytes,20,rep,name=EmptyAr,proto3" json:"EmptyAr,omitempty"` -} - -func (x *ArraysStruct) Reset() { - *x = ArraysStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ArraysStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ArraysStruct) ProtoMessage() {} - -func (x *ArraysStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ArraysStruct.ProtoReflect.Descriptor instead. -func (*ArraysStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{3} -} - -func (x *ArraysStruct) GetInt8Ar() []int32 { - if x != nil { - return x.Int8Ar - } - return nil -} - -func (x *ArraysStruct) GetInt16Ar() []int32 { - if x != nil { - return x.Int16Ar - } - return nil -} - -func (x *ArraysStruct) GetInt32Ar() []int32 { - if x != nil { - return x.Int32Ar - } - return nil -} - -func (x *ArraysStruct) GetInt32FixedAr() []int32 { - if x != nil { - return x.Int32FixedAr - } - return nil -} - -func (x *ArraysStruct) GetInt64Ar() []int64 { - if x != nil { - return x.Int64Ar - } - return nil -} - -func (x *ArraysStruct) GetInt64FixedAr() []int64 { - if x != nil { - return x.Int64FixedAr - } - return nil -} - -func (x *ArraysStruct) GetIntAr() []int64 { - if x != nil { - return x.IntAr - } - return nil -} - -func (x *ArraysStruct) GetByteAr() []byte { - if x != nil { - return x.ByteAr - } - return nil -} - -func (x *ArraysStruct) GetUint8Ar() []byte { - if x != nil { - return x.Uint8Ar - } - return nil -} - -func (x *ArraysStruct) GetUint16Ar() []uint32 { - if x != nil { - return x.Uint16Ar - } - return nil -} - -func (x *ArraysStruct) GetUint32Ar() []uint32 { - if x != nil { - return x.Uint32Ar - } - return nil -} - -func (x *ArraysStruct) GetUint32FixedAr() []uint32 { - if x != nil { - return x.Uint32FixedAr - } - return nil -} - -func (x *ArraysStruct) GetUint64Ar() []uint64 { - if x != nil { - return x.Uint64Ar - } - return nil -} - -func (x *ArraysStruct) GetUint64FixedAr() []uint64 { - if x != nil { - return x.Uint64FixedAr - } - return nil -} - -func (x *ArraysStruct) GetUintAr() []uint64 { - if x != nil { - return x.UintAr - } - return nil -} - -func (x *ArraysStruct) GetStrAr() []string { - if x != nil { - return x.StrAr - } - return nil -} - -func (x *ArraysStruct) GetBytesAr() [][]byte { - if x != nil { - return x.BytesAr - } - return nil -} - -func (x *ArraysStruct) GetTimeAr() []*timestamppb.Timestamp { - if x != nil { - return x.TimeAr - } - return nil -} - -func (x *ArraysStruct) GetDurationAr() []*durationpb.Duration { - if x != nil { - return x.DurationAr - } - return nil -} - -func (x *ArraysStruct) GetEmptyAr() []*EmptyStruct { - if x != nil { - return x.EmptyAr - } - return nil -} - -type ArraysArraysStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8ArAr []*TESTS_Int8List `protobuf:"bytes,1,rep,name=Int8ArAr,proto3" json:"Int8ArAr,omitempty"` - Int16ArAr []*TESTS_Int16List `protobuf:"bytes,2,rep,name=Int16ArAr,proto3" json:"Int16ArAr,omitempty"` - Int32ArAr []*TESTS_Int32ValueList `protobuf:"bytes,3,rep,name=Int32ArAr,proto3" json:"Int32ArAr,omitempty"` - Int32FixedArAr []*TESTS_Fixed32Int32ValueList `protobuf:"bytes,4,rep,name=Int32FixedArAr,proto3" json:"Int32FixedArAr,omitempty"` - Int64ArAr []*TESTS_Int64ValueList `protobuf:"bytes,5,rep,name=Int64ArAr,proto3" json:"Int64ArAr,omitempty"` - Int64FixedArAr []*TESTS_Fixed64Int64ValueList `protobuf:"bytes,6,rep,name=Int64FixedArAr,proto3" json:"Int64FixedArAr,omitempty"` - IntArAr []*TESTS_Int64ValueList `protobuf:"bytes,7,rep,name=IntArAr,proto3" json:"IntArAr,omitempty"` - ByteArAr [][]byte `protobuf:"bytes,8,rep,name=ByteArAr,proto3" json:"ByteArAr,omitempty"` - Uint8ArAr [][]byte `protobuf:"bytes,9,rep,name=Uint8ArAr,proto3" json:"Uint8ArAr,omitempty"` - Uint16ArAr []*TESTS_UInt16List `protobuf:"bytes,10,rep,name=Uint16ArAr,proto3" json:"Uint16ArAr,omitempty"` - Uint32ArAr []*TESTS_UInt32ValueList `protobuf:"bytes,11,rep,name=Uint32ArAr,proto3" json:"Uint32ArAr,omitempty"` - Uint32FixedArAr []*TESTS_Fixed32UInt32ValueList `protobuf:"bytes,12,rep,name=Uint32FixedArAr,proto3" json:"Uint32FixedArAr,omitempty"` - Uint64ArAr []*TESTS_UInt64ValueList `protobuf:"bytes,13,rep,name=Uint64ArAr,proto3" json:"Uint64ArAr,omitempty"` - Uint64FixedArAr []*TESTS_Fixed64UInt64ValueList `protobuf:"bytes,14,rep,name=Uint64FixedArAr,proto3" json:"Uint64FixedArAr,omitempty"` - UintArAr []*TESTS_UInt64ValueList `protobuf:"bytes,15,rep,name=UintArAr,proto3" json:"UintArAr,omitempty"` - StrArAr []*TESTS_StringValueList `protobuf:"bytes,16,rep,name=StrArAr,proto3" json:"StrArAr,omitempty"` - BytesArAr []*TESTS_BytesList `protobuf:"bytes,17,rep,name=BytesArAr,proto3" json:"BytesArAr,omitempty"` - TimeArAr []*TESTS_TimestampList `protobuf:"bytes,18,rep,name=TimeArAr,proto3" json:"TimeArAr,omitempty"` - DurationArAr []*TESTS_DurationList `protobuf:"bytes,19,rep,name=DurationArAr,proto3" json:"DurationArAr,omitempty"` - EmptyArAr []*TESTS_EmptyStructList `protobuf:"bytes,20,rep,name=EmptyArAr,proto3" json:"EmptyArAr,omitempty"` -} - -func (x *ArraysArraysStruct) Reset() { - *x = ArraysArraysStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ArraysArraysStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ArraysArraysStruct) ProtoMessage() {} - -func (x *ArraysArraysStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ArraysArraysStruct.ProtoReflect.Descriptor instead. -func (*ArraysArraysStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{4} -} - -func (x *ArraysArraysStruct) GetInt8ArAr() []*TESTS_Int8List { - if x != nil { - return x.Int8ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetInt16ArAr() []*TESTS_Int16List { - if x != nil { - return x.Int16ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetInt32ArAr() []*TESTS_Int32ValueList { - if x != nil { - return x.Int32ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetInt32FixedArAr() []*TESTS_Fixed32Int32ValueList { - if x != nil { - return x.Int32FixedArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetInt64ArAr() []*TESTS_Int64ValueList { - if x != nil { - return x.Int64ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetInt64FixedArAr() []*TESTS_Fixed64Int64ValueList { - if x != nil { - return x.Int64FixedArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetIntArAr() []*TESTS_Int64ValueList { - if x != nil { - return x.IntArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetByteArAr() [][]byte { - if x != nil { - return x.ByteArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetUint8ArAr() [][]byte { - if x != nil { - return x.Uint8ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetUint16ArAr() []*TESTS_UInt16List { - if x != nil { - return x.Uint16ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetUint32ArAr() []*TESTS_UInt32ValueList { - if x != nil { - return x.Uint32ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetUint32FixedArAr() []*TESTS_Fixed32UInt32ValueList { - if x != nil { - return x.Uint32FixedArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetUint64ArAr() []*TESTS_UInt64ValueList { - if x != nil { - return x.Uint64ArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetUint64FixedArAr() []*TESTS_Fixed64UInt64ValueList { - if x != nil { - return x.Uint64FixedArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetUintArAr() []*TESTS_UInt64ValueList { - if x != nil { - return x.UintArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetStrArAr() []*TESTS_StringValueList { - if x != nil { - return x.StrArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetBytesArAr() []*TESTS_BytesList { - if x != nil { - return x.BytesArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetTimeArAr() []*TESTS_TimestampList { - if x != nil { - return x.TimeArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetDurationArAr() []*TESTS_DurationList { - if x != nil { - return x.DurationArAr - } - return nil -} - -func (x *ArraysArraysStruct) GetEmptyArAr() []*TESTS_EmptyStructList { - if x != nil { - return x.EmptyArAr - } - return nil -} - -type SlicesStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8Sl []int32 `protobuf:"zigzag32,1,rep,packed,name=Int8Sl,proto3" json:"Int8Sl,omitempty"` - Int16Sl []int32 `protobuf:"zigzag32,2,rep,packed,name=Int16Sl,proto3" json:"Int16Sl,omitempty"` - Int32Sl []int32 `protobuf:"zigzag32,3,rep,packed,name=Int32Sl,proto3" json:"Int32Sl,omitempty"` - Int32FixedSl []int32 `protobuf:"fixed32,4,rep,packed,name=Int32FixedSl,proto3" json:"Int32FixedSl,omitempty"` - Int64Sl []int64 `protobuf:"zigzag64,5,rep,packed,name=Int64Sl,proto3" json:"Int64Sl,omitempty"` - Int64FixedSl []int64 `protobuf:"fixed64,6,rep,packed,name=Int64FixedSl,proto3" json:"Int64FixedSl,omitempty"` - IntSl []int64 `protobuf:"zigzag64,7,rep,packed,name=IntSl,proto3" json:"IntSl,omitempty"` - ByteSl []byte `protobuf:"bytes,8,opt,name=ByteSl,proto3" json:"ByteSl,omitempty"` - Uint8Sl []byte `protobuf:"bytes,9,opt,name=Uint8Sl,proto3" json:"Uint8Sl,omitempty"` - Uint16Sl []uint32 `protobuf:"varint,10,rep,packed,name=Uint16Sl,proto3" json:"Uint16Sl,omitempty"` - Uint32Sl []uint32 `protobuf:"varint,11,rep,packed,name=Uint32Sl,proto3" json:"Uint32Sl,omitempty"` - Uint32FixedSl []uint32 `protobuf:"fixed32,12,rep,packed,name=Uint32FixedSl,proto3" json:"Uint32FixedSl,omitempty"` - Uint64Sl []uint64 `protobuf:"varint,13,rep,packed,name=Uint64Sl,proto3" json:"Uint64Sl,omitempty"` - Uint64FixedSl []uint64 `protobuf:"fixed64,14,rep,packed,name=Uint64FixedSl,proto3" json:"Uint64FixedSl,omitempty"` - UintSl []uint64 `protobuf:"varint,15,rep,packed,name=UintSl,proto3" json:"UintSl,omitempty"` - StrSl []string `protobuf:"bytes,16,rep,name=StrSl,proto3" json:"StrSl,omitempty"` - BytesSl [][]byte `protobuf:"bytes,17,rep,name=BytesSl,proto3" json:"BytesSl,omitempty"` - TimeSl []*timestamppb.Timestamp `protobuf:"bytes,18,rep,name=TimeSl,proto3" json:"TimeSl,omitempty"` - DurationSl []*durationpb.Duration `protobuf:"bytes,19,rep,name=DurationSl,proto3" json:"DurationSl,omitempty"` - EmptySl []*EmptyStruct `protobuf:"bytes,20,rep,name=EmptySl,proto3" json:"EmptySl,omitempty"` -} - -func (x *SlicesStruct) Reset() { - *x = SlicesStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SlicesStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SlicesStruct) ProtoMessage() {} - -func (x *SlicesStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SlicesStruct.ProtoReflect.Descriptor instead. -func (*SlicesStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{5} -} - -func (x *SlicesStruct) GetInt8Sl() []int32 { - if x != nil { - return x.Int8Sl - } - return nil -} - -func (x *SlicesStruct) GetInt16Sl() []int32 { - if x != nil { - return x.Int16Sl - } - return nil -} - -func (x *SlicesStruct) GetInt32Sl() []int32 { - if x != nil { - return x.Int32Sl - } - return nil -} - -func (x *SlicesStruct) GetInt32FixedSl() []int32 { - if x != nil { - return x.Int32FixedSl - } - return nil -} - -func (x *SlicesStruct) GetInt64Sl() []int64 { - if x != nil { - return x.Int64Sl - } - return nil -} - -func (x *SlicesStruct) GetInt64FixedSl() []int64 { - if x != nil { - return x.Int64FixedSl - } - return nil -} - -func (x *SlicesStruct) GetIntSl() []int64 { - if x != nil { - return x.IntSl - } - return nil -} - -func (x *SlicesStruct) GetByteSl() []byte { - if x != nil { - return x.ByteSl - } - return nil -} - -func (x *SlicesStruct) GetUint8Sl() []byte { - if x != nil { - return x.Uint8Sl - } - return nil -} - -func (x *SlicesStruct) GetUint16Sl() []uint32 { - if x != nil { - return x.Uint16Sl - } - return nil -} - -func (x *SlicesStruct) GetUint32Sl() []uint32 { - if x != nil { - return x.Uint32Sl - } - return nil -} - -func (x *SlicesStruct) GetUint32FixedSl() []uint32 { - if x != nil { - return x.Uint32FixedSl - } - return nil -} - -func (x *SlicesStruct) GetUint64Sl() []uint64 { - if x != nil { - return x.Uint64Sl - } - return nil -} - -func (x *SlicesStruct) GetUint64FixedSl() []uint64 { - if x != nil { - return x.Uint64FixedSl - } - return nil -} - -func (x *SlicesStruct) GetUintSl() []uint64 { - if x != nil { - return x.UintSl - } - return nil -} - -func (x *SlicesStruct) GetStrSl() []string { - if x != nil { - return x.StrSl - } - return nil -} - -func (x *SlicesStruct) GetBytesSl() [][]byte { - if x != nil { - return x.BytesSl - } - return nil -} - -func (x *SlicesStruct) GetTimeSl() []*timestamppb.Timestamp { - if x != nil { - return x.TimeSl - } - return nil -} - -func (x *SlicesStruct) GetDurationSl() []*durationpb.Duration { - if x != nil { - return x.DurationSl - } - return nil -} - -func (x *SlicesStruct) GetEmptySl() []*EmptyStruct { - if x != nil { - return x.EmptySl - } - return nil -} - -type SlicesSlicesStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8SlSl []*TESTS_Int8List `protobuf:"bytes,1,rep,name=Int8SlSl,proto3" json:"Int8SlSl,omitempty"` - Int16SlSl []*TESTS_Int16List `protobuf:"bytes,2,rep,name=Int16SlSl,proto3" json:"Int16SlSl,omitempty"` - Int32SlSl []*TESTS_Int32ValueList `protobuf:"bytes,3,rep,name=Int32SlSl,proto3" json:"Int32SlSl,omitempty"` - Int32FixedSlSl []*TESTS_Fixed32Int32ValueList `protobuf:"bytes,4,rep,name=Int32FixedSlSl,proto3" json:"Int32FixedSlSl,omitempty"` - Int64SlSl []*TESTS_Int64ValueList `protobuf:"bytes,5,rep,name=Int64SlSl,proto3" json:"Int64SlSl,omitempty"` - Int64FixedSlSl []*TESTS_Fixed64Int64ValueList `protobuf:"bytes,6,rep,name=Int64FixedSlSl,proto3" json:"Int64FixedSlSl,omitempty"` - IntSlSl []*TESTS_Int64ValueList `protobuf:"bytes,7,rep,name=IntSlSl,proto3" json:"IntSlSl,omitempty"` - ByteSlSl [][]byte `protobuf:"bytes,8,rep,name=ByteSlSl,proto3" json:"ByteSlSl,omitempty"` - Uint8SlSl [][]byte `protobuf:"bytes,9,rep,name=Uint8SlSl,proto3" json:"Uint8SlSl,omitempty"` - Uint16SlSl []*TESTS_UInt16List `protobuf:"bytes,10,rep,name=Uint16SlSl,proto3" json:"Uint16SlSl,omitempty"` - Uint32SlSl []*TESTS_UInt32ValueList `protobuf:"bytes,11,rep,name=Uint32SlSl,proto3" json:"Uint32SlSl,omitempty"` - Uint32FixedSlSl []*TESTS_Fixed32UInt32ValueList `protobuf:"bytes,12,rep,name=Uint32FixedSlSl,proto3" json:"Uint32FixedSlSl,omitempty"` - Uint64SlSl []*TESTS_UInt64ValueList `protobuf:"bytes,13,rep,name=Uint64SlSl,proto3" json:"Uint64SlSl,omitempty"` - Uint64FixedSlSl []*TESTS_Fixed64UInt64ValueList `protobuf:"bytes,14,rep,name=Uint64FixedSlSl,proto3" json:"Uint64FixedSlSl,omitempty"` - UintSlSl []*TESTS_UInt64ValueList `protobuf:"bytes,15,rep,name=UintSlSl,proto3" json:"UintSlSl,omitempty"` - StrSlSl []*TESTS_StringValueList `protobuf:"bytes,16,rep,name=StrSlSl,proto3" json:"StrSlSl,omitempty"` - BytesSlSl []*TESTS_BytesList `protobuf:"bytes,17,rep,name=BytesSlSl,proto3" json:"BytesSlSl,omitempty"` - TimeSlSl []*TESTS_TimestampList `protobuf:"bytes,18,rep,name=TimeSlSl,proto3" json:"TimeSlSl,omitempty"` - DurationSlSl []*TESTS_DurationList `protobuf:"bytes,19,rep,name=DurationSlSl,proto3" json:"DurationSlSl,omitempty"` - EmptySlSl []*TESTS_EmptyStructList `protobuf:"bytes,20,rep,name=EmptySlSl,proto3" json:"EmptySlSl,omitempty"` -} - -func (x *SlicesSlicesStruct) Reset() { - *x = SlicesSlicesStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SlicesSlicesStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SlicesSlicesStruct) ProtoMessage() {} - -func (x *SlicesSlicesStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SlicesSlicesStruct.ProtoReflect.Descriptor instead. -func (*SlicesSlicesStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{6} -} - -func (x *SlicesSlicesStruct) GetInt8SlSl() []*TESTS_Int8List { - if x != nil { - return x.Int8SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetInt16SlSl() []*TESTS_Int16List { - if x != nil { - return x.Int16SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetInt32SlSl() []*TESTS_Int32ValueList { - if x != nil { - return x.Int32SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetInt32FixedSlSl() []*TESTS_Fixed32Int32ValueList { - if x != nil { - return x.Int32FixedSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetInt64SlSl() []*TESTS_Int64ValueList { - if x != nil { - return x.Int64SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetInt64FixedSlSl() []*TESTS_Fixed64Int64ValueList { - if x != nil { - return x.Int64FixedSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetIntSlSl() []*TESTS_Int64ValueList { - if x != nil { - return x.IntSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetByteSlSl() [][]byte { - if x != nil { - return x.ByteSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetUint8SlSl() [][]byte { - if x != nil { - return x.Uint8SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetUint16SlSl() []*TESTS_UInt16List { - if x != nil { - return x.Uint16SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetUint32SlSl() []*TESTS_UInt32ValueList { - if x != nil { - return x.Uint32SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetUint32FixedSlSl() []*TESTS_Fixed32UInt32ValueList { - if x != nil { - return x.Uint32FixedSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetUint64SlSl() []*TESTS_UInt64ValueList { - if x != nil { - return x.Uint64SlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetUint64FixedSlSl() []*TESTS_Fixed64UInt64ValueList { - if x != nil { - return x.Uint64FixedSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetUintSlSl() []*TESTS_UInt64ValueList { - if x != nil { - return x.UintSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetStrSlSl() []*TESTS_StringValueList { - if x != nil { - return x.StrSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetBytesSlSl() []*TESTS_BytesList { - if x != nil { - return x.BytesSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetTimeSlSl() []*TESTS_TimestampList { - if x != nil { - return x.TimeSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetDurationSlSl() []*TESTS_DurationList { - if x != nil { - return x.DurationSlSl - } - return nil -} - -func (x *SlicesSlicesStruct) GetEmptySlSl() []*TESTS_EmptyStructList { - if x != nil { - return x.EmptySlSl - } - return nil -} - -type PointersStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8Pt int32 `protobuf:"zigzag32,1,opt,name=Int8Pt,proto3" json:"Int8Pt,omitempty"` - Int16Pt int32 `protobuf:"zigzag32,2,opt,name=Int16Pt,proto3" json:"Int16Pt,omitempty"` - Int32Pt int32 `protobuf:"zigzag32,3,opt,name=Int32Pt,proto3" json:"Int32Pt,omitempty"` - Int32FixedPt int32 `protobuf:"fixed32,4,opt,name=Int32FixedPt,proto3" json:"Int32FixedPt,omitempty"` - Int64Pt int64 `protobuf:"zigzag64,5,opt,name=Int64Pt,proto3" json:"Int64Pt,omitempty"` - Int64FixedPt int64 `protobuf:"fixed64,6,opt,name=Int64FixedPt,proto3" json:"Int64FixedPt,omitempty"` - IntPt int64 `protobuf:"zigzag64,7,opt,name=IntPt,proto3" json:"IntPt,omitempty"` - BytePt uint32 `protobuf:"varint,8,opt,name=BytePt,proto3" json:"BytePt,omitempty"` - Uint8Pt uint32 `protobuf:"varint,9,opt,name=Uint8Pt,proto3" json:"Uint8Pt,omitempty"` - Uint16Pt uint32 `protobuf:"varint,10,opt,name=Uint16Pt,proto3" json:"Uint16Pt,omitempty"` - Uint32Pt uint32 `protobuf:"varint,11,opt,name=Uint32Pt,proto3" json:"Uint32Pt,omitempty"` - Uint32FixedPt uint32 `protobuf:"fixed32,12,opt,name=Uint32FixedPt,proto3" json:"Uint32FixedPt,omitempty"` - Uint64Pt uint64 `protobuf:"varint,13,opt,name=Uint64Pt,proto3" json:"Uint64Pt,omitempty"` - Uint64FixedPt uint64 `protobuf:"fixed64,14,opt,name=Uint64FixedPt,proto3" json:"Uint64FixedPt,omitempty"` - UintPt uint64 `protobuf:"varint,15,opt,name=UintPt,proto3" json:"UintPt,omitempty"` - StrPt string `protobuf:"bytes,16,opt,name=StrPt,proto3" json:"StrPt,omitempty"` - BytesPt []byte `protobuf:"bytes,17,opt,name=BytesPt,proto3" json:"BytesPt,omitempty"` - TimePt *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=TimePt,proto3" json:"TimePt,omitempty"` - DurationPt *durationpb.Duration `protobuf:"bytes,19,opt,name=DurationPt,proto3" json:"DurationPt,omitempty"` - EmptyPt *EmptyStruct `protobuf:"bytes,20,opt,name=EmptyPt,proto3" json:"EmptyPt,omitempty"` -} - -func (x *PointersStruct) Reset() { - *x = PointersStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PointersStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PointersStruct) ProtoMessage() {} - -func (x *PointersStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PointersStruct.ProtoReflect.Descriptor instead. -func (*PointersStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{7} -} - -func (x *PointersStruct) GetInt8Pt() int32 { - if x != nil { - return x.Int8Pt - } - return 0 -} - -func (x *PointersStruct) GetInt16Pt() int32 { - if x != nil { - return x.Int16Pt - } - return 0 -} - -func (x *PointersStruct) GetInt32Pt() int32 { - if x != nil { - return x.Int32Pt - } - return 0 -} - -func (x *PointersStruct) GetInt32FixedPt() int32 { - if x != nil { - return x.Int32FixedPt - } - return 0 -} - -func (x *PointersStruct) GetInt64Pt() int64 { - if x != nil { - return x.Int64Pt - } - return 0 -} - -func (x *PointersStruct) GetInt64FixedPt() int64 { - if x != nil { - return x.Int64FixedPt - } - return 0 -} - -func (x *PointersStruct) GetIntPt() int64 { - if x != nil { - return x.IntPt - } - return 0 -} - -func (x *PointersStruct) GetBytePt() uint32 { - if x != nil { - return x.BytePt - } - return 0 -} - -func (x *PointersStruct) GetUint8Pt() uint32 { - if x != nil { - return x.Uint8Pt - } - return 0 -} - -func (x *PointersStruct) GetUint16Pt() uint32 { - if x != nil { - return x.Uint16Pt - } - return 0 -} - -func (x *PointersStruct) GetUint32Pt() uint32 { - if x != nil { - return x.Uint32Pt - } - return 0 -} - -func (x *PointersStruct) GetUint32FixedPt() uint32 { - if x != nil { - return x.Uint32FixedPt - } - return 0 -} - -func (x *PointersStruct) GetUint64Pt() uint64 { - if x != nil { - return x.Uint64Pt - } - return 0 -} - -func (x *PointersStruct) GetUint64FixedPt() uint64 { - if x != nil { - return x.Uint64FixedPt - } - return 0 -} - -func (x *PointersStruct) GetUintPt() uint64 { - if x != nil { - return x.UintPt - } - return 0 -} - -func (x *PointersStruct) GetStrPt() string { - if x != nil { - return x.StrPt - } - return "" -} - -func (x *PointersStruct) GetBytesPt() []byte { - if x != nil { - return x.BytesPt - } - return nil -} - -func (x *PointersStruct) GetTimePt() *timestamppb.Timestamp { - if x != nil { - return x.TimePt - } - return nil -} - -func (x *PointersStruct) GetDurationPt() *durationpb.Duration { - if x != nil { - return x.DurationPt - } - return nil -} - -func (x *PointersStruct) GetEmptyPt() *EmptyStruct { - if x != nil { - return x.EmptyPt - } - return nil -} - -type PointerSlicesStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8PtSl []int32 `protobuf:"zigzag32,1,rep,packed,name=Int8PtSl,proto3" json:"Int8PtSl,omitempty"` - Int16PtSl []int32 `protobuf:"zigzag32,2,rep,packed,name=Int16PtSl,proto3" json:"Int16PtSl,omitempty"` - Int32PtSl []int32 `protobuf:"zigzag32,3,rep,packed,name=Int32PtSl,proto3" json:"Int32PtSl,omitempty"` - Int32FixedPtSl []int32 `protobuf:"fixed32,4,rep,packed,name=Int32FixedPtSl,proto3" json:"Int32FixedPtSl,omitempty"` - Int64PtSl []int64 `protobuf:"zigzag64,5,rep,packed,name=Int64PtSl,proto3" json:"Int64PtSl,omitempty"` - Int64FixedPtSl []int64 `protobuf:"fixed64,6,rep,packed,name=Int64FixedPtSl,proto3" json:"Int64FixedPtSl,omitempty"` - IntPtSl []int64 `protobuf:"zigzag64,7,rep,packed,name=IntPtSl,proto3" json:"IntPtSl,omitempty"` - BytePtSl []byte `protobuf:"bytes,8,opt,name=BytePtSl,proto3" json:"BytePtSl,omitempty"` - Uint8PtSl []byte `protobuf:"bytes,9,opt,name=Uint8PtSl,proto3" json:"Uint8PtSl,omitempty"` - Uint16PtSl []uint32 `protobuf:"varint,10,rep,packed,name=Uint16PtSl,proto3" json:"Uint16PtSl,omitempty"` - Uint32PtSl []uint32 `protobuf:"varint,11,rep,packed,name=Uint32PtSl,proto3" json:"Uint32PtSl,omitempty"` - Uint32FixedPtSl []uint32 `protobuf:"fixed32,12,rep,packed,name=Uint32FixedPtSl,proto3" json:"Uint32FixedPtSl,omitempty"` - Uint64PtSl []uint64 `protobuf:"varint,13,rep,packed,name=Uint64PtSl,proto3" json:"Uint64PtSl,omitempty"` - Uint64FixedPtSl []uint64 `protobuf:"fixed64,14,rep,packed,name=Uint64FixedPtSl,proto3" json:"Uint64FixedPtSl,omitempty"` - UintPtSl []uint64 `protobuf:"varint,15,rep,packed,name=UintPtSl,proto3" json:"UintPtSl,omitempty"` - StrPtSl []string `protobuf:"bytes,16,rep,name=StrPtSl,proto3" json:"StrPtSl,omitempty"` - BytesPtSl [][]byte `protobuf:"bytes,17,rep,name=BytesPtSl,proto3" json:"BytesPtSl,omitempty"` - TimePtSl []*timestamppb.Timestamp `protobuf:"bytes,18,rep,name=TimePtSl,proto3" json:"TimePtSl,omitempty"` - DurationPtSl []*durationpb.Duration `protobuf:"bytes,19,rep,name=DurationPtSl,proto3" json:"DurationPtSl,omitempty"` - EmptyPtSl []*EmptyStruct `protobuf:"bytes,20,rep,name=EmptyPtSl,proto3" json:"EmptyPtSl,omitempty"` -} - -func (x *PointerSlicesStruct) Reset() { - *x = PointerSlicesStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PointerSlicesStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PointerSlicesStruct) ProtoMessage() {} - -func (x *PointerSlicesStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PointerSlicesStruct.ProtoReflect.Descriptor instead. -func (*PointerSlicesStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{8} -} - -func (x *PointerSlicesStruct) GetInt8PtSl() []int32 { - if x != nil { - return x.Int8PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetInt16PtSl() []int32 { - if x != nil { - return x.Int16PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetInt32PtSl() []int32 { - if x != nil { - return x.Int32PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetInt32FixedPtSl() []int32 { - if x != nil { - return x.Int32FixedPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetInt64PtSl() []int64 { - if x != nil { - return x.Int64PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetInt64FixedPtSl() []int64 { - if x != nil { - return x.Int64FixedPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetIntPtSl() []int64 { - if x != nil { - return x.IntPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetBytePtSl() []byte { - if x != nil { - return x.BytePtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetUint8PtSl() []byte { - if x != nil { - return x.Uint8PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetUint16PtSl() []uint32 { - if x != nil { - return x.Uint16PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetUint32PtSl() []uint32 { - if x != nil { - return x.Uint32PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetUint32FixedPtSl() []uint32 { - if x != nil { - return x.Uint32FixedPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetUint64PtSl() []uint64 { - if x != nil { - return x.Uint64PtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetUint64FixedPtSl() []uint64 { - if x != nil { - return x.Uint64FixedPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetUintPtSl() []uint64 { - if x != nil { - return x.UintPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetStrPtSl() []string { - if x != nil { - return x.StrPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetBytesPtSl() [][]byte { - if x != nil { - return x.BytesPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetTimePtSl() []*timestamppb.Timestamp { - if x != nil { - return x.TimePtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetDurationPtSl() []*durationpb.Duration { - if x != nil { - return x.DurationPtSl - } - return nil -} - -func (x *PointerSlicesStruct) GetEmptyPtSl() []*EmptyStruct { - if x != nil { - return x.EmptyPtSl - } - return nil -} - -type ComplexSt struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - PrField *PrimitivesStruct `protobuf:"bytes,1,opt,name=PrField,proto3" json:"PrField,omitempty"` - ArField *ArraysStruct `protobuf:"bytes,2,opt,name=ArField,proto3" json:"ArField,omitempty"` - SlField *SlicesStruct `protobuf:"bytes,3,opt,name=SlField,proto3" json:"SlField,omitempty"` - PtField *PointersStruct `protobuf:"bytes,4,opt,name=PtField,proto3" json:"PtField,omitempty"` -} - -func (x *ComplexSt) Reset() { - *x = ComplexSt{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ComplexSt) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ComplexSt) ProtoMessage() {} - -func (x *ComplexSt) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ComplexSt.ProtoReflect.Descriptor instead. -func (*ComplexSt) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{9} -} - -func (x *ComplexSt) GetPrField() *PrimitivesStruct { - if x != nil { - return x.PrField - } - return nil -} - -func (x *ComplexSt) GetArField() *ArraysStruct { - if x != nil { - return x.ArField - } - return nil -} - -func (x *ComplexSt) GetSlField() *SlicesStruct { - if x != nil { - return x.SlField - } - return nil -} - -func (x *ComplexSt) GetPtField() *PointersStruct { - if x != nil { - return x.PtField - } - return nil -} - -type EmbeddedSt1 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - PrimitivesStruct *PrimitivesStruct `protobuf:"bytes,1,opt,name=PrimitivesStruct,proto3" json:"PrimitivesStruct,omitempty"` -} - -func (x *EmbeddedSt1) Reset() { - *x = EmbeddedSt1{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *EmbeddedSt1) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*EmbeddedSt1) ProtoMessage() {} - -func (x *EmbeddedSt1) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use EmbeddedSt1.ProtoReflect.Descriptor instead. -func (*EmbeddedSt1) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{10} -} - -func (x *EmbeddedSt1) GetPrimitivesStruct() *PrimitivesStruct { - if x != nil { - return x.PrimitivesStruct - } - return nil -} - -type EmbeddedSt2 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - PrimitivesStruct *PrimitivesStruct `protobuf:"bytes,1,opt,name=PrimitivesStruct,proto3" json:"PrimitivesStruct,omitempty"` - ArraysStruct *ArraysStruct `protobuf:"bytes,2,opt,name=ArraysStruct,proto3" json:"ArraysStruct,omitempty"` - SlicesStruct *SlicesStruct `protobuf:"bytes,3,opt,name=SlicesStruct,proto3" json:"SlicesStruct,omitempty"` - PointersStruct *PointersStruct `protobuf:"bytes,4,opt,name=PointersStruct,proto3" json:"PointersStruct,omitempty"` -} - -func (x *EmbeddedSt2) Reset() { - *x = EmbeddedSt2{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *EmbeddedSt2) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*EmbeddedSt2) ProtoMessage() {} - -func (x *EmbeddedSt2) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use EmbeddedSt2.ProtoReflect.Descriptor instead. -func (*EmbeddedSt2) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{11} -} - -func (x *EmbeddedSt2) GetPrimitivesStruct() *PrimitivesStruct { - if x != nil { - return x.PrimitivesStruct - } - return nil -} - -func (x *EmbeddedSt2) GetArraysStruct() *ArraysStruct { - if x != nil { - return x.ArraysStruct - } - return nil -} - -func (x *EmbeddedSt2) GetSlicesStruct() *SlicesStruct { - if x != nil { - return x.SlicesStruct - } - return nil -} - -func (x *EmbeddedSt2) GetPointersStruct() *PointersStruct { - if x != nil { - return x.PointersStruct - } - return nil -} - -type EmbeddedSt3 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - PrimitivesStruct *PrimitivesStruct `protobuf:"bytes,1,opt,name=PrimitivesStruct,proto3" json:"PrimitivesStruct,omitempty"` - ArraysStruct *ArraysStruct `protobuf:"bytes,2,opt,name=ArraysStruct,proto3" json:"ArraysStruct,omitempty"` - SlicesStruct *SlicesStruct `protobuf:"bytes,3,opt,name=SlicesStruct,proto3" json:"SlicesStruct,omitempty"` - PointersStruct *PointersStruct `protobuf:"bytes,4,opt,name=PointersStruct,proto3" json:"PointersStruct,omitempty"` - EmptyStruct *EmptyStruct `protobuf:"bytes,5,opt,name=EmptyStruct,proto3" json:"EmptyStruct,omitempty"` -} - -func (x *EmbeddedSt3) Reset() { - *x = EmbeddedSt3{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *EmbeddedSt3) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*EmbeddedSt3) ProtoMessage() {} - -func (x *EmbeddedSt3) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use EmbeddedSt3.ProtoReflect.Descriptor instead. -func (*EmbeddedSt3) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{12} -} - -func (x *EmbeddedSt3) GetPrimitivesStruct() *PrimitivesStruct { - if x != nil { - return x.PrimitivesStruct - } - return nil -} - -func (x *EmbeddedSt3) GetArraysStruct() *ArraysStruct { - if x != nil { - return x.ArraysStruct - } - return nil -} - -func (x *EmbeddedSt3) GetSlicesStruct() *SlicesStruct { - if x != nil { - return x.SlicesStruct - } - return nil -} - -func (x *EmbeddedSt3) GetPointersStruct() *PointersStruct { - if x != nil { - return x.PointersStruct - } - return nil -} - -func (x *EmbeddedSt3) GetEmptyStruct() *EmptyStruct { - if x != nil { - return x.EmptyStruct - } - return nil -} - -type EmbeddedSt4 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Foo1 int64 `protobuf:"zigzag64,1,opt,name=Foo1,proto3" json:"Foo1,omitempty"` - PrimitivesStruct *PrimitivesStruct `protobuf:"bytes,2,opt,name=PrimitivesStruct,proto3" json:"PrimitivesStruct,omitempty"` - Foo2 string `protobuf:"bytes,3,opt,name=Foo2,proto3" json:"Foo2,omitempty"` - ArraysStructField *ArraysStruct `protobuf:"bytes,4,opt,name=ArraysStructField,proto3" json:"ArraysStructField,omitempty"` - Foo3 []byte `protobuf:"bytes,5,opt,name=Foo3,proto3" json:"Foo3,omitempty"` - SlicesStruct *SlicesStruct `protobuf:"bytes,6,opt,name=SlicesStruct,proto3" json:"SlicesStruct,omitempty"` - Foo4 bool `protobuf:"varint,7,opt,name=Foo4,proto3" json:"Foo4,omitempty"` - PointersStructField *PointersStruct `protobuf:"bytes,8,opt,name=PointersStructField,proto3" json:"PointersStructField,omitempty"` - Foo5 uint64 `protobuf:"varint,9,opt,name=Foo5,proto3" json:"Foo5,omitempty"` -} - -func (x *EmbeddedSt4) Reset() { - *x = EmbeddedSt4{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *EmbeddedSt4) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*EmbeddedSt4) ProtoMessage() {} - -func (x *EmbeddedSt4) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use EmbeddedSt4.ProtoReflect.Descriptor instead. -func (*EmbeddedSt4) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{13} -} - -func (x *EmbeddedSt4) GetFoo1() int64 { - if x != nil { - return x.Foo1 - } - return 0 -} - -func (x *EmbeddedSt4) GetPrimitivesStruct() *PrimitivesStruct { - if x != nil { - return x.PrimitivesStruct - } - return nil -} - -func (x *EmbeddedSt4) GetFoo2() string { - if x != nil { - return x.Foo2 - } - return "" -} - -func (x *EmbeddedSt4) GetArraysStructField() *ArraysStruct { - if x != nil { - return x.ArraysStructField - } - return nil -} - -func (x *EmbeddedSt4) GetFoo3() []byte { - if x != nil { - return x.Foo3 - } - return nil -} - -func (x *EmbeddedSt4) GetSlicesStruct() *SlicesStruct { - if x != nil { - return x.SlicesStruct - } - return nil -} - -func (x *EmbeddedSt4) GetFoo4() bool { - if x != nil { - return x.Foo4 - } - return false -} - -func (x *EmbeddedSt4) GetPointersStructField() *PointersStruct { - if x != nil { - return x.PointersStructField - } - return nil -} - -func (x *EmbeddedSt4) GetFoo5() uint64 { - if x != nil { - return x.Foo5 - } - return 0 -} - -type EmbeddedSt5NameOverride struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Foo1 int64 `protobuf:"zigzag64,1,opt,name=Foo1,proto3" json:"Foo1,omitempty"` - PrimitivesStruct *PrimitivesStruct `protobuf:"bytes,2,opt,name=PrimitivesStruct,proto3" json:"PrimitivesStruct,omitempty"` - Foo2 string `protobuf:"bytes,3,opt,name=Foo2,proto3" json:"Foo2,omitempty"` - ArraysStructField *ArraysStruct `protobuf:"bytes,4,opt,name=ArraysStructField,proto3" json:"ArraysStructField,omitempty"` - Foo3 []byte `protobuf:"bytes,5,opt,name=Foo3,proto3" json:"Foo3,omitempty"` - SlicesStruct *SlicesStruct `protobuf:"bytes,6,opt,name=SlicesStruct,proto3" json:"SlicesStruct,omitempty"` - Foo4 bool `protobuf:"varint,7,opt,name=Foo4,proto3" json:"Foo4,omitempty"` - PointersStructField *PointersStruct `protobuf:"bytes,8,opt,name=PointersStructField,proto3" json:"PointersStructField,omitempty"` - Foo5 uint64 `protobuf:"varint,9,opt,name=Foo5,proto3" json:"Foo5,omitempty"` -} - -func (x *EmbeddedSt5NameOverride) Reset() { - *x = EmbeddedSt5NameOverride{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *EmbeddedSt5NameOverride) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*EmbeddedSt5NameOverride) ProtoMessage() {} - -func (x *EmbeddedSt5NameOverride) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use EmbeddedSt5NameOverride.ProtoReflect.Descriptor instead. -func (*EmbeddedSt5NameOverride) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{14} -} - -func (x *EmbeddedSt5NameOverride) GetFoo1() int64 { - if x != nil { - return x.Foo1 - } - return 0 -} - -func (x *EmbeddedSt5NameOverride) GetPrimitivesStruct() *PrimitivesStruct { - if x != nil { - return x.PrimitivesStruct - } - return nil -} - -func (x *EmbeddedSt5NameOverride) GetFoo2() string { - if x != nil { - return x.Foo2 - } - return "" -} - -func (x *EmbeddedSt5NameOverride) GetArraysStructField() *ArraysStruct { - if x != nil { - return x.ArraysStructField - } - return nil -} - -func (x *EmbeddedSt5NameOverride) GetFoo3() []byte { - if x != nil { - return x.Foo3 - } - return nil -} - -func (x *EmbeddedSt5NameOverride) GetSlicesStruct() *SlicesStruct { - if x != nil { - return x.SlicesStruct - } - return nil -} - -func (x *EmbeddedSt5NameOverride) GetFoo4() bool { - if x != nil { - return x.Foo4 - } - return false -} - -func (x *EmbeddedSt5NameOverride) GetPointersStructField() *PointersStruct { - if x != nil { - return x.PointersStructField - } - return nil -} - -func (x *EmbeddedSt5NameOverride) GetFoo5() uint64 { - if x != nil { - return x.Foo5 - } - return 0 -} - -type AminoMarshalerStruct1 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - C int64 `protobuf:"zigzag64,1,opt,name=C,proto3" json:"C,omitempty"` - D int64 `protobuf:"zigzag64,2,opt,name=D,proto3" json:"D,omitempty"` -} - -func (x *AminoMarshalerStruct1) Reset() { - *x = AminoMarshalerStruct1{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AminoMarshalerStruct1) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AminoMarshalerStruct1) ProtoMessage() {} - -func (x *AminoMarshalerStruct1) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AminoMarshalerStruct1.ProtoReflect.Descriptor instead. -func (*AminoMarshalerStruct1) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{15} -} - -func (x *AminoMarshalerStruct1) GetC() int64 { - if x != nil { - return x.C - } - return 0 -} - -func (x *AminoMarshalerStruct1) GetD() int64 { - if x != nil { - return x.D - } - return 0 -} - -type ReprStruct1 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - C int64 `protobuf:"zigzag64,1,opt,name=C,proto3" json:"C,omitempty"` - D int64 `protobuf:"zigzag64,2,opt,name=D,proto3" json:"D,omitempty"` -} - -func (x *ReprStruct1) Reset() { - *x = ReprStruct1{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ReprStruct1) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ReprStruct1) ProtoMessage() {} - -func (x *ReprStruct1) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ReprStruct1.ProtoReflect.Descriptor instead. -func (*ReprStruct1) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{16} -} - -func (x *ReprStruct1) GetC() int64 { - if x != nil { - return x.C - } - return 0 -} - -func (x *ReprStruct1) GetD() int64 { - if x != nil { - return x.D - } - return 0 -} - -type AminoMarshalerStruct2 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*ReprElem2 `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *AminoMarshalerStruct2) Reset() { - *x = AminoMarshalerStruct2{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AminoMarshalerStruct2) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AminoMarshalerStruct2) ProtoMessage() {} - -func (x *AminoMarshalerStruct2) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AminoMarshalerStruct2.ProtoReflect.Descriptor instead. -func (*AminoMarshalerStruct2) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{17} -} - -func (x *AminoMarshalerStruct2) GetValue() []*ReprElem2 { - if x != nil { - return x.Value - } - return nil -} - -type ReprElem2 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"` - Value *anypb.Any `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *ReprElem2) Reset() { - *x = ReprElem2{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ReprElem2) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ReprElem2) ProtoMessage() {} - -func (x *ReprElem2) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ReprElem2.ProtoReflect.Descriptor instead. -func (*ReprElem2) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{18} -} - -func (x *ReprElem2) GetKey() string { - if x != nil { - return x.Key - } - return "" -} - -func (x *ReprElem2) GetValue() *anypb.Any { - if x != nil { - return x.Value - } - return nil -} - -type AminoMarshalerStruct3 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value int32 `protobuf:"zigzag32,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *AminoMarshalerStruct3) Reset() { - *x = AminoMarshalerStruct3{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AminoMarshalerStruct3) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AminoMarshalerStruct3) ProtoMessage() {} - -func (x *AminoMarshalerStruct3) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AminoMarshalerStruct3.ProtoReflect.Descriptor instead. -func (*AminoMarshalerStruct3) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{19} -} - -func (x *AminoMarshalerStruct3) GetValue() int32 { - if x != nil { - return x.Value - } - return 0 -} - -type AminoMarshalerInt4 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - A int32 `protobuf:"zigzag32,1,opt,name=A,proto3" json:"A,omitempty"` -} - -func (x *AminoMarshalerInt4) Reset() { - *x = AminoMarshalerInt4{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AminoMarshalerInt4) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AminoMarshalerInt4) ProtoMessage() {} - -func (x *AminoMarshalerInt4) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AminoMarshalerInt4.ProtoReflect.Descriptor instead. -func (*AminoMarshalerInt4) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{20} -} - -func (x *AminoMarshalerInt4) GetA() int32 { - if x != nil { - return x.A - } - return 0 -} - -type AminoMarshalerInt5 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value string `protobuf:"bytes,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *AminoMarshalerInt5) Reset() { - *x = AminoMarshalerInt5{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AminoMarshalerInt5) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AminoMarshalerInt5) ProtoMessage() {} - -func (x *AminoMarshalerInt5) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AminoMarshalerInt5.ProtoReflect.Descriptor instead. -func (*AminoMarshalerInt5) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{21} -} - -func (x *AminoMarshalerInt5) GetValue() string { - if x != nil { - return x.Value - } - return "" -} - -type AminoMarshalerStruct6 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*AminoMarshalerStruct1 `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *AminoMarshalerStruct6) Reset() { - *x = AminoMarshalerStruct6{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AminoMarshalerStruct6) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AminoMarshalerStruct6) ProtoMessage() {} - -func (x *AminoMarshalerStruct6) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AminoMarshalerStruct6.ProtoReflect.Descriptor instead. -func (*AminoMarshalerStruct6) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{22} -} - -func (x *AminoMarshalerStruct6) GetValue() []*AminoMarshalerStruct1 { - if x != nil { - return x.Value - } - return nil -} - -type AminoMarshalerStruct7 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []byte `protobuf:"bytes,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *AminoMarshalerStruct7) Reset() { - *x = AminoMarshalerStruct7{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AminoMarshalerStruct7) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AminoMarshalerStruct7) ProtoMessage() {} - -func (x *AminoMarshalerStruct7) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AminoMarshalerStruct7.ProtoReflect.Descriptor instead. -func (*AminoMarshalerStruct7) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{23} -} - -func (x *AminoMarshalerStruct7) GetValue() []byte { - if x != nil { - return x.Value - } - return nil -} - -type ReprElem7 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value uint32 `protobuf:"varint,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *ReprElem7) Reset() { - *x = ReprElem7{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ReprElem7) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ReprElem7) ProtoMessage() {} - -func (x *ReprElem7) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ReprElem7.ProtoReflect.Descriptor instead. -func (*ReprElem7) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{24} -} - -func (x *ReprElem7) GetValue() uint32 { - if x != nil { - return x.Value - } - return 0 -} - -type IntDef struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value int64 `protobuf:"zigzag64,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *IntDef) Reset() { - *x = IntDef{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *IntDef) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*IntDef) ProtoMessage() {} - -func (x *IntDef) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use IntDef.ProtoReflect.Descriptor instead. -func (*IntDef) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{25} -} - -func (x *IntDef) GetValue() int64 { - if x != nil { - return x.Value - } - return 0 -} - -type IntAr struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int64 `protobuf:"zigzag64,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *IntAr) Reset() { - *x = IntAr{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *IntAr) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*IntAr) ProtoMessage() {} - -func (x *IntAr) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use IntAr.ProtoReflect.Descriptor instead. -func (*IntAr) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{26} -} - -func (x *IntAr) GetValue() []int64 { - if x != nil { - return x.Value - } - return nil -} - -type IntSl struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int64 `protobuf:"zigzag64,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *IntSl) Reset() { - *x = IntSl{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *IntSl) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*IntSl) ProtoMessage() {} - -func (x *IntSl) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use IntSl.ProtoReflect.Descriptor instead. -func (*IntSl) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{27} -} - -func (x *IntSl) GetValue() []int64 { - if x != nil { - return x.Value - } - return nil -} - -type ByteAr struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []byte `protobuf:"bytes,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *ByteAr) Reset() { - *x = ByteAr{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ByteAr) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ByteAr) ProtoMessage() {} - -func (x *ByteAr) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ByteAr.ProtoReflect.Descriptor instead. -func (*ByteAr) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{28} -} - -func (x *ByteAr) GetValue() []byte { - if x != nil { - return x.Value - } - return nil -} - -type ByteSl struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []byte `protobuf:"bytes,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *ByteSl) Reset() { - *x = ByteSl{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ByteSl) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ByteSl) ProtoMessage() {} - -func (x *ByteSl) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ByteSl.ProtoReflect.Descriptor instead. -func (*ByteSl) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{29} -} - -func (x *ByteSl) GetValue() []byte { - if x != nil { - return x.Value - } - return nil -} - -type PrimitivesStructDef struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Int8 int32 `protobuf:"zigzag32,1,opt,name=Int8,proto3" json:"Int8,omitempty"` - Int16 int32 `protobuf:"zigzag32,2,opt,name=Int16,proto3" json:"Int16,omitempty"` - Int32 int32 `protobuf:"zigzag32,3,opt,name=Int32,proto3" json:"Int32,omitempty"` - Int32Fixed int32 `protobuf:"fixed32,4,opt,name=Int32Fixed,proto3" json:"Int32Fixed,omitempty"` - Int64 int64 `protobuf:"zigzag64,5,opt,name=Int64,proto3" json:"Int64,omitempty"` - Int64Fixed int64 `protobuf:"fixed64,6,opt,name=Int64Fixed,proto3" json:"Int64Fixed,omitempty"` - Int int64 `protobuf:"zigzag64,7,opt,name=Int,proto3" json:"Int,omitempty"` - Byte uint32 `protobuf:"varint,8,opt,name=Byte,proto3" json:"Byte,omitempty"` - Uint8 uint32 `protobuf:"varint,9,opt,name=Uint8,proto3" json:"Uint8,omitempty"` - Uint16 uint32 `protobuf:"varint,10,opt,name=Uint16,proto3" json:"Uint16,omitempty"` - Uint32 uint32 `protobuf:"varint,11,opt,name=Uint32,proto3" json:"Uint32,omitempty"` - Uint32Fixed uint32 `protobuf:"fixed32,12,opt,name=Uint32Fixed,proto3" json:"Uint32Fixed,omitempty"` - Uint64 uint64 `protobuf:"varint,13,opt,name=Uint64,proto3" json:"Uint64,omitempty"` - Uint64Fixed uint64 `protobuf:"fixed64,14,opt,name=Uint64Fixed,proto3" json:"Uint64Fixed,omitempty"` - Uint uint64 `protobuf:"varint,15,opt,name=Uint,proto3" json:"Uint,omitempty"` - Str string `protobuf:"bytes,16,opt,name=Str,proto3" json:"Str,omitempty"` - Bytes []byte `protobuf:"bytes,17,opt,name=Bytes,proto3" json:"Bytes,omitempty"` - Time *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=Time,proto3" json:"Time,omitempty"` - Duration *durationpb.Duration `protobuf:"bytes,19,opt,name=Duration,proto3" json:"Duration,omitempty"` - Empty *EmptyStruct `protobuf:"bytes,20,opt,name=Empty,proto3" json:"Empty,omitempty"` -} - -func (x *PrimitivesStructDef) Reset() { - *x = PrimitivesStructDef{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[30] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PrimitivesStructDef) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PrimitivesStructDef) ProtoMessage() {} - -func (x *PrimitivesStructDef) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[30] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PrimitivesStructDef.ProtoReflect.Descriptor instead. -func (*PrimitivesStructDef) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{30} -} - -func (x *PrimitivesStructDef) GetInt8() int32 { - if x != nil { - return x.Int8 - } - return 0 -} - -func (x *PrimitivesStructDef) GetInt16() int32 { - if x != nil { - return x.Int16 - } - return 0 -} - -func (x *PrimitivesStructDef) GetInt32() int32 { - if x != nil { - return x.Int32 - } - return 0 -} - -func (x *PrimitivesStructDef) GetInt32Fixed() int32 { - if x != nil { - return x.Int32Fixed - } - return 0 -} - -func (x *PrimitivesStructDef) GetInt64() int64 { - if x != nil { - return x.Int64 - } - return 0 -} - -func (x *PrimitivesStructDef) GetInt64Fixed() int64 { - if x != nil { - return x.Int64Fixed - } - return 0 -} - -func (x *PrimitivesStructDef) GetInt() int64 { - if x != nil { - return x.Int - } - return 0 -} - -func (x *PrimitivesStructDef) GetByte() uint32 { - if x != nil { - return x.Byte - } - return 0 -} - -func (x *PrimitivesStructDef) GetUint8() uint32 { - if x != nil { - return x.Uint8 - } - return 0 -} - -func (x *PrimitivesStructDef) GetUint16() uint32 { - if x != nil { - return x.Uint16 - } - return 0 -} - -func (x *PrimitivesStructDef) GetUint32() uint32 { - if x != nil { - return x.Uint32 - } - return 0 -} - -func (x *PrimitivesStructDef) GetUint32Fixed() uint32 { - if x != nil { - return x.Uint32Fixed - } - return 0 -} - -func (x *PrimitivesStructDef) GetUint64() uint64 { - if x != nil { - return x.Uint64 - } - return 0 -} - -func (x *PrimitivesStructDef) GetUint64Fixed() uint64 { - if x != nil { - return x.Uint64Fixed - } - return 0 -} - -func (x *PrimitivesStructDef) GetUint() uint64 { - if x != nil { - return x.Uint - } - return 0 -} - -func (x *PrimitivesStructDef) GetStr() string { - if x != nil { - return x.Str - } - return "" -} - -func (x *PrimitivesStructDef) GetBytes() []byte { - if x != nil { - return x.Bytes - } - return nil -} - -func (x *PrimitivesStructDef) GetTime() *timestamppb.Timestamp { - if x != nil { - return x.Time - } - return nil -} - -func (x *PrimitivesStructDef) GetDuration() *durationpb.Duration { - if x != nil { - return x.Duration - } - return nil -} - -func (x *PrimitivesStructDef) GetEmpty() *EmptyStruct { - if x != nil { - return x.Empty - } - return nil -} - -type PrimitivesStructSl struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*PrimitivesStruct `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *PrimitivesStructSl) Reset() { - *x = PrimitivesStructSl{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PrimitivesStructSl) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PrimitivesStructSl) ProtoMessage() {} - -func (x *PrimitivesStructSl) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[31] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PrimitivesStructSl.ProtoReflect.Descriptor instead. -func (*PrimitivesStructSl) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{31} -} - -func (x *PrimitivesStructSl) GetValue() []*PrimitivesStruct { - if x != nil { - return x.Value - } - return nil -} - -type PrimitivesStructAr struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*PrimitivesStruct `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *PrimitivesStructAr) Reset() { - *x = PrimitivesStructAr{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[32] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PrimitivesStructAr) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PrimitivesStructAr) ProtoMessage() {} - -func (x *PrimitivesStructAr) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[32] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PrimitivesStructAr.ProtoReflect.Descriptor instead. -func (*PrimitivesStructAr) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{32} -} - -func (x *PrimitivesStructAr) GetValue() []*PrimitivesStruct { - if x != nil { - return x.Value - } - return nil -} - -type Concrete1 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *Concrete1) Reset() { - *x = Concrete1{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[33] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Concrete1) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Concrete1) ProtoMessage() {} - -func (x *Concrete1) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[33] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Concrete1.ProtoReflect.Descriptor instead. -func (*Concrete1) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{33} -} - -type Concrete2 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *Concrete2) Reset() { - *x = Concrete2{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Concrete2) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Concrete2) ProtoMessage() {} - -func (x *Concrete2) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Concrete2.ProtoReflect.Descriptor instead. -func (*Concrete2) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{34} -} - -type ConcreteTypeDef struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []byte `protobuf:"bytes,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *ConcreteTypeDef) Reset() { - *x = ConcreteTypeDef{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[35] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ConcreteTypeDef) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ConcreteTypeDef) ProtoMessage() {} - -func (x *ConcreteTypeDef) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[35] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ConcreteTypeDef.ProtoReflect.Descriptor instead. -func (*ConcreteTypeDef) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{35} -} - -func (x *ConcreteTypeDef) GetValue() []byte { - if x != nil { - return x.Value - } - return nil -} - -type ConcreteWrappedBytes struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []byte `protobuf:"bytes,1,opt,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *ConcreteWrappedBytes) Reset() { - *x = ConcreteWrappedBytes{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[36] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ConcreteWrappedBytes) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ConcreteWrappedBytes) ProtoMessage() {} - -func (x *ConcreteWrappedBytes) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[36] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ConcreteWrappedBytes.ProtoReflect.Descriptor instead. -func (*ConcreteWrappedBytes) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{36} -} - -func (x *ConcreteWrappedBytes) GetValue() []byte { - if x != nil { - return x.Value - } - return nil -} - -type InterfaceFieldsStruct struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - F1 *anypb.Any `protobuf:"bytes,1,opt,name=F1,proto3" json:"F1,omitempty"` - F2 *anypb.Any `protobuf:"bytes,2,opt,name=F2,proto3" json:"F2,omitempty"` - F3 *anypb.Any `protobuf:"bytes,3,opt,name=F3,proto3" json:"F3,omitempty"` - F4 *anypb.Any `protobuf:"bytes,4,opt,name=F4,proto3" json:"F4,omitempty"` -} - -func (x *InterfaceFieldsStruct) Reset() { - *x = InterfaceFieldsStruct{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[37] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *InterfaceFieldsStruct) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*InterfaceFieldsStruct) ProtoMessage() {} - -func (x *InterfaceFieldsStruct) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[37] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use InterfaceFieldsStruct.ProtoReflect.Descriptor instead. -func (*InterfaceFieldsStruct) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{37} -} - -func (x *InterfaceFieldsStruct) GetF1() *anypb.Any { - if x != nil { - return x.F1 - } - return nil -} - -func (x *InterfaceFieldsStruct) GetF2() *anypb.Any { - if x != nil { - return x.F2 - } - return nil -} - -func (x *InterfaceFieldsStruct) GetF3() *anypb.Any { - if x != nil { - return x.F3 - } - return nil -} - -func (x *InterfaceFieldsStruct) GetF4() *anypb.Any { - if x != nil { - return x.F4 - } - return nil -} - -type TESTS_BytesList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value [][]byte `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_BytesList) Reset() { - *x = TESTS_BytesList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[38] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_BytesList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_BytesList) ProtoMessage() {} - -func (x *TESTS_BytesList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[38] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_BytesList.ProtoReflect.Descriptor instead. -func (*TESTS_BytesList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{38} -} - -func (x *TESTS_BytesList) GetValue() [][]byte { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_BytesListList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*TESTS_BytesList `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_BytesListList) Reset() { - *x = TESTS_BytesListList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_BytesListList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_BytesListList) ProtoMessage() {} - -func (x *TESTS_BytesListList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[39] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_BytesListList.ProtoReflect.Descriptor instead. -func (*TESTS_BytesListList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{39} -} - -func (x *TESTS_BytesListList) GetValue() []*TESTS_BytesList { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_DurationList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*durationpb.Duration `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_DurationList) Reset() { - *x = TESTS_DurationList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_DurationList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_DurationList) ProtoMessage() {} - -func (x *TESTS_DurationList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[40] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_DurationList.ProtoReflect.Descriptor instead. -func (*TESTS_DurationList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{40} -} - -func (x *TESTS_DurationList) GetValue() []*durationpb.Duration { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_EmptyStructList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*EmptyStruct `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_EmptyStructList) Reset() { - *x = TESTS_EmptyStructList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[41] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_EmptyStructList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_EmptyStructList) ProtoMessage() {} - -func (x *TESTS_EmptyStructList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[41] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_EmptyStructList.ProtoReflect.Descriptor instead. -func (*TESTS_EmptyStructList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{41} -} - -func (x *TESTS_EmptyStructList) GetValue() []*EmptyStruct { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Fixed32Int32ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int32 `protobuf:"fixed32,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Fixed32Int32ValueList) Reset() { - *x = TESTS_Fixed32Int32ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[42] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Fixed32Int32ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Fixed32Int32ValueList) ProtoMessage() {} - -func (x *TESTS_Fixed32Int32ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[42] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Fixed32Int32ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_Fixed32Int32ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{42} -} - -func (x *TESTS_Fixed32Int32ValueList) GetValue() []int32 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Fixed32UInt32ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []uint32 `protobuf:"fixed32,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Fixed32UInt32ValueList) Reset() { - *x = TESTS_Fixed32UInt32ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[43] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Fixed32UInt32ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Fixed32UInt32ValueList) ProtoMessage() {} - -func (x *TESTS_Fixed32UInt32ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[43] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Fixed32UInt32ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_Fixed32UInt32ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{43} -} - -func (x *TESTS_Fixed32UInt32ValueList) GetValue() []uint32 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Fixed64Int64ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int64 `protobuf:"fixed64,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Fixed64Int64ValueList) Reset() { - *x = TESTS_Fixed64Int64ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[44] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Fixed64Int64ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Fixed64Int64ValueList) ProtoMessage() {} - -func (x *TESTS_Fixed64Int64ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[44] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Fixed64Int64ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_Fixed64Int64ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{44} -} - -func (x *TESTS_Fixed64Int64ValueList) GetValue() []int64 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Fixed64UInt64ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []uint64 `protobuf:"fixed64,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Fixed64UInt64ValueList) Reset() { - *x = TESTS_Fixed64UInt64ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[45] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Fixed64UInt64ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Fixed64UInt64ValueList) ProtoMessage() {} - -func (x *TESTS_Fixed64UInt64ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[45] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Fixed64UInt64ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_Fixed64UInt64ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{45} -} - -func (x *TESTS_Fixed64UInt64ValueList) GetValue() []uint64 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Int16List struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int32 `protobuf:"zigzag32,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Int16List) Reset() { - *x = TESTS_Int16List{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[46] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Int16List) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Int16List) ProtoMessage() {} - -func (x *TESTS_Int16List) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[46] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Int16List.ProtoReflect.Descriptor instead. -func (*TESTS_Int16List) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{46} -} - -func (x *TESTS_Int16List) GetValue() []int32 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Int32ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int32 `protobuf:"zigzag32,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Int32ValueList) Reset() { - *x = TESTS_Int32ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[47] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Int32ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Int32ValueList) ProtoMessage() {} - -func (x *TESTS_Int32ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[47] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Int32ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_Int32ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{47} -} - -func (x *TESTS_Int32ValueList) GetValue() []int32 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Int64ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int64 `protobuf:"zigzag64,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Int64ValueList) Reset() { - *x = TESTS_Int64ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[48] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Int64ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Int64ValueList) ProtoMessage() {} - -func (x *TESTS_Int64ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[48] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Int64ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_Int64ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{48} -} - -func (x *TESTS_Int64ValueList) GetValue() []int64 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_Int8List struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []int32 `protobuf:"zigzag32,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_Int8List) Reset() { - *x = TESTS_Int8List{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[49] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_Int8List) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_Int8List) ProtoMessage() {} - -func (x *TESTS_Int8List) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[49] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_Int8List.ProtoReflect.Descriptor instead. -func (*TESTS_Int8List) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{49} -} - -func (x *TESTS_Int8List) GetValue() []int32 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_StringValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []string `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_StringValueList) Reset() { - *x = TESTS_StringValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[50] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_StringValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_StringValueList) ProtoMessage() {} - -func (x *TESTS_StringValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[50] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_StringValueList.ProtoReflect.Descriptor instead. -func (*TESTS_StringValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{50} -} - -func (x *TESTS_StringValueList) GetValue() []string { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_TimestampList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []*timestamppb.Timestamp `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_TimestampList) Reset() { - *x = TESTS_TimestampList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[51] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_TimestampList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_TimestampList) ProtoMessage() {} - -func (x *TESTS_TimestampList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[51] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_TimestampList.ProtoReflect.Descriptor instead. -func (*TESTS_TimestampList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{51} -} - -func (x *TESTS_TimestampList) GetValue() []*timestamppb.Timestamp { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_UInt16List struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []uint32 `protobuf:"varint,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_UInt16List) Reset() { - *x = TESTS_UInt16List{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[52] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_UInt16List) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_UInt16List) ProtoMessage() {} - -func (x *TESTS_UInt16List) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[52] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_UInt16List.ProtoReflect.Descriptor instead. -func (*TESTS_UInt16List) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{52} -} - -func (x *TESTS_UInt16List) GetValue() []uint32 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_UInt32ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []uint32 `protobuf:"varint,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_UInt32ValueList) Reset() { - *x = TESTS_UInt32ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[53] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_UInt32ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_UInt32ValueList) ProtoMessage() {} - -func (x *TESTS_UInt32ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[53] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_UInt32ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_UInt32ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{53} -} - -func (x *TESTS_UInt32ValueList) GetValue() []uint32 { - if x != nil { - return x.Value - } - return nil -} - -type TESTS_UInt64ValueList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Value []uint64 `protobuf:"varint,1,rep,packed,name=Value,proto3" json:"Value,omitempty"` -} - -func (x *TESTS_UInt64ValueList) Reset() { - *x = TESTS_UInt64ValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_tests_proto_msgTypes[54] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TESTS_UInt64ValueList) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TESTS_UInt64ValueList) ProtoMessage() {} - -func (x *TESTS_UInt64ValueList) ProtoReflect() protoreflect.Message { - mi := &file_tests_proto_msgTypes[54] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TESTS_UInt64ValueList.ProtoReflect.Descriptor instead. -func (*TESTS_UInt64ValueList) Descriptor() ([]byte, []int) { - return file_tests_proto_rawDescGZIP(), []int{54} -} - -func (x *TESTS_UInt64ValueList) GetValue() []uint64 { - if x != nil { - return x.Value - } - return nil -} - -var File_tests_proto protoreflect.FileDescriptor - -var file_tests_proto_rawDesc = []byte{ - 0x0a, 0x0b, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x0d, 0x0a, 0x0b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x22, - 0xbd, 0x04, 0x0a, 0x10, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x49, 0x6e, 0x74, 0x38, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x11, 0x52, 0x04, 0x49, 0x6e, 0x74, 0x38, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x31, - 0x36, 0x18, 0x02, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x12, 0x14, - 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, 0x49, - 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, - 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x0a, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, - 0x69, 0x78, 0x65, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x12, 0x52, 0x05, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x49, 0x6e, - 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x10, 0x52, 0x0a, - 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x49, 0x6e, - 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x12, 0x52, 0x03, 0x49, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, - 0x42, 0x79, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x42, 0x79, 0x74, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x05, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x12, 0x16, - 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, - 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x20, 0x0a, 0x0b, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, - 0x46, 0x69, 0x78, 0x65, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0b, 0x55, 0x69, 0x6e, - 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, - 0x36, 0x34, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, - 0x12, 0x20, 0x0a, 0x0b, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x18, - 0x0e, 0x20, 0x01, 0x28, 0x06, 0x52, 0x0b, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, - 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x55, 0x69, 0x6e, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x04, 0x55, 0x69, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x53, 0x74, 0x72, 0x18, 0x10, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x53, 0x74, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x42, 0x79, 0x74, 0x65, - 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x2e, - 0x0a, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, - 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x35, - 0x0a, 0x08, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x44, 0x75, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x18, 0x14, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, - 0x82, 0x01, 0x0a, 0x11, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x32, 0x0a, 0x06, 0x54, 0x69, 0x6d, 0x65, 0x41, 0x72, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x52, 0x06, 0x54, 0x69, 0x6d, 0x65, 0x41, 0x72, 0x12, 0x39, 0x0a, 0x0a, 0x44, 0x75, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x41, 0x72, 0x22, 0x89, 0x05, 0x0a, 0x0c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x6e, 0x74, 0x38, 0x41, 0x72, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x11, 0x52, 0x06, 0x49, 0x6e, 0x74, 0x38, 0x41, 0x72, 0x12, 0x18, 0x0a, - 0x07, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x41, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x11, 0x52, 0x07, - 0x49, 0x6e, 0x74, 0x31, 0x36, 0x41, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x33, 0x32, - 0x41, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x11, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x41, - 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, - 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0f, 0x52, 0x0c, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x41, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x41, 0x72, - 0x18, 0x05, 0x20, 0x03, 0x28, 0x12, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x41, 0x72, 0x12, - 0x22, 0x0a, 0x0c, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, 0x18, - 0x06, 0x20, 0x03, 0x28, 0x10, 0x52, 0x0c, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, - 0x64, 0x41, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x41, 0x72, 0x18, 0x07, 0x20, 0x03, - 0x28, 0x12, 0x52, 0x05, 0x49, 0x6e, 0x74, 0x41, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x79, 0x74, - 0x65, 0x41, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x42, 0x79, 0x74, 0x65, 0x41, - 0x72, 0x12, 0x18, 0x0a, 0x07, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x41, 0x72, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x07, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x41, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x55, - 0x69, 0x6e, 0x74, 0x31, 0x36, 0x41, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x08, 0x55, - 0x69, 0x6e, 0x74, 0x31, 0x36, 0x41, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x33, - 0x32, 0x41, 0x72, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x33, - 0x32, 0x41, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, - 0x65, 0x64, 0x41, 0x72, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x07, 0x52, 0x0d, 0x55, 0x69, 0x6e, 0x74, - 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x69, 0x6e, - 0x74, 0x36, 0x34, 0x41, 0x72, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x04, 0x52, 0x08, 0x55, 0x69, 0x6e, - 0x74, 0x36, 0x34, 0x41, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, - 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x06, 0x52, 0x0d, 0x55, 0x69, - 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x55, - 0x69, 0x6e, 0x74, 0x41, 0x72, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x04, 0x52, 0x06, 0x55, 0x69, 0x6e, - 0x74, 0x41, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x72, 0x41, 0x72, 0x18, 0x10, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x05, 0x53, 0x74, 0x72, 0x41, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x42, 0x79, 0x74, - 0x65, 0x73, 0x41, 0x72, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x07, 0x42, 0x79, 0x74, 0x65, - 0x73, 0x41, 0x72, 0x12, 0x32, 0x0a, 0x06, 0x54, 0x69, 0x6d, 0x65, 0x41, 0x72, 0x18, 0x12, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, - 0x06, 0x54, 0x69, 0x6d, 0x65, 0x41, 0x72, 0x12, 0x39, 0x0a, 0x0a, 0x44, 0x75, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x41, 0x72, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x41, 0x72, 0x12, 0x2c, 0x0a, 0x07, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x18, 0x14, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x07, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, - 0x22, 0xaa, 0x09, 0x0a, 0x12, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79, - 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x31, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x38, 0x41, - 0x72, 0x41, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x38, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x08, 0x49, 0x6e, 0x74, 0x38, 0x41, 0x72, 0x41, 0x72, 0x12, 0x34, 0x0a, 0x09, 0x49, 0x6e, - 0x74, 0x31, 0x36, 0x41, 0x72, 0x41, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x31, - 0x36, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x09, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x41, 0x72, 0x41, 0x72, - 0x12, 0x39, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x41, 0x72, 0x41, 0x72, 0x18, 0x03, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, - 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x09, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x41, 0x72, 0x41, 0x72, 0x12, 0x4a, 0x0a, 0x0e, 0x49, - 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, 0x41, 0x72, 0x18, 0x04, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, - 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x41, 0x72, 0x41, 0x72, 0x12, 0x39, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x36, 0x34, - 0x41, 0x72, 0x41, 0x72, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x09, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x41, 0x72, - 0x41, 0x72, 0x12, 0x4a, 0x0a, 0x0e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, - 0x41, 0x72, 0x41, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, - 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0e, - 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, 0x41, 0x72, 0x12, 0x35, - 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x41, 0x72, 0x41, 0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, - 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x07, 0x49, 0x6e, - 0x74, 0x41, 0x72, 0x41, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x42, 0x79, 0x74, 0x65, 0x41, 0x72, 0x41, - 0x72, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x08, 0x42, 0x79, 0x74, 0x65, 0x41, 0x72, 0x41, - 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x41, 0x72, 0x41, 0x72, 0x18, 0x09, - 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x41, 0x72, 0x41, 0x72, 0x12, - 0x37, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x41, 0x72, 0x41, 0x72, 0x18, 0x0a, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, - 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0a, 0x55, 0x69, - 0x6e, 0x74, 0x31, 0x36, 0x41, 0x72, 0x41, 0x72, 0x12, 0x3c, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, - 0x33, 0x32, 0x41, 0x72, 0x41, 0x72, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x33, - 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, - 0x33, 0x32, 0x41, 0x72, 0x41, 0x72, 0x12, 0x4d, 0x0a, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, - 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, 0x41, 0x72, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x23, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x33, 0x32, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, - 0x64, 0x41, 0x72, 0x41, 0x72, 0x12, 0x3c, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x41, - 0x72, 0x41, 0x72, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x41, - 0x72, 0x41, 0x72, 0x12, 0x4d, 0x0a, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, - 0x65, 0x64, 0x41, 0x72, 0x41, 0x72, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, - 0x36, 0x34, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x41, 0x72, - 0x41, 0x72, 0x12, 0x38, 0x0a, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x41, 0x72, 0x41, 0x72, 0x18, 0x0f, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, - 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x41, 0x72, 0x41, 0x72, 0x12, 0x36, 0x0a, 0x07, - 0x53, 0x74, 0x72, 0x41, 0x72, 0x41, 0x72, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x53, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x07, 0x53, 0x74, 0x72, - 0x41, 0x72, 0x41, 0x72, 0x12, 0x34, 0x0a, 0x09, 0x42, 0x79, 0x74, 0x65, 0x73, 0x41, 0x72, 0x41, - 0x72, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, - 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x42, 0x79, 0x74, 0x65, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x09, 0x42, 0x79, 0x74, 0x65, 0x73, 0x41, 0x72, 0x41, 0x72, 0x12, 0x36, 0x0a, 0x08, 0x54, 0x69, - 0x6d, 0x65, 0x41, 0x72, 0x41, 0x72, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x54, 0x69, 0x6d, 0x65, 0x73, - 0x74, 0x61, 0x6d, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x08, 0x54, 0x69, 0x6d, 0x65, 0x41, 0x72, - 0x41, 0x72, 0x12, 0x3d, 0x0a, 0x0c, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x72, - 0x41, 0x72, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, - 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x0c, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x72, 0x41, - 0x72, 0x12, 0x3a, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x41, 0x72, 0x18, 0x14, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, - 0x54, 0x53, 0x5f, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x41, 0x72, 0x22, 0x89, 0x05, - 0x0a, 0x0c, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x16, - 0x0a, 0x06, 0x49, 0x6e, 0x74, 0x38, 0x53, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x11, 0x52, 0x06, - 0x49, 0x6e, 0x74, 0x38, 0x53, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x53, - 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x11, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x53, 0x6c, - 0x12, 0x18, 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x11, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x6e, - 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0f, - 0x52, 0x0c, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x12, 0x18, - 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x18, 0x05, 0x20, 0x03, 0x28, 0x12, 0x52, - 0x07, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x6e, 0x74, 0x36, - 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x10, 0x52, 0x0c, - 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x12, 0x14, 0x0a, 0x05, - 0x49, 0x6e, 0x74, 0x53, 0x6c, 0x18, 0x07, 0x20, 0x03, 0x28, 0x12, 0x52, 0x05, 0x49, 0x6e, 0x74, - 0x53, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x79, 0x74, 0x65, 0x53, 0x6c, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x06, 0x42, 0x79, 0x74, 0x65, 0x53, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x55, 0x69, - 0x6e, 0x74, 0x38, 0x53, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x55, 0x69, 0x6e, - 0x74, 0x38, 0x53, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x53, 0x6c, - 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x53, 0x6c, - 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x6c, 0x18, 0x0b, 0x20, 0x03, - 0x28, 0x0d, 0x52, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x6c, 0x12, 0x24, 0x0a, 0x0d, - 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x18, 0x0c, 0x20, - 0x03, 0x28, 0x07, 0x52, 0x0d, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, - 0x53, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x18, 0x0d, - 0x20, 0x03, 0x28, 0x04, 0x52, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x12, 0x24, - 0x0a, 0x0d, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x18, - 0x0e, 0x20, 0x03, 0x28, 0x06, 0x52, 0x0d, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, - 0x65, 0x64, 0x53, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x53, 0x6c, 0x18, 0x0f, - 0x20, 0x03, 0x28, 0x04, 0x52, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x53, 0x6c, 0x12, 0x14, 0x0a, 0x05, - 0x53, 0x74, 0x72, 0x53, 0x6c, 0x18, 0x10, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x53, 0x74, 0x72, - 0x53, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x42, 0x79, 0x74, 0x65, 0x73, 0x53, 0x6c, 0x18, 0x11, 0x20, - 0x03, 0x28, 0x0c, 0x52, 0x07, 0x42, 0x79, 0x74, 0x65, 0x73, 0x53, 0x6c, 0x12, 0x32, 0x0a, 0x06, - 0x54, 0x69, 0x6d, 0x65, 0x53, 0x6c, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, - 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x06, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x6c, - 0x12, 0x39, 0x0a, 0x0a, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x18, 0x13, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x0a, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x12, 0x2c, 0x0a, 0x07, 0x45, - 0x6d, 0x70, 0x74, 0x79, 0x53, 0x6c, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, - 0x52, 0x07, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x6c, 0x22, 0xaa, 0x09, 0x0a, 0x12, 0x53, 0x6c, - 0x69, 0x63, 0x65, 0x73, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, - 0x12, 0x31, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x38, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, - 0x5f, 0x49, 0x6e, 0x74, 0x38, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x38, 0x53, - 0x6c, 0x53, 0x6c, 0x12, 0x34, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x53, 0x6c, 0x53, 0x6c, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, - 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x09, - 0x49, 0x6e, 0x74, 0x31, 0x36, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x39, 0x0a, 0x09, 0x49, 0x6e, 0x74, - 0x33, 0x32, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x33, 0x32, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x09, 0x49, 0x6e, 0x74, 0x33, 0x32, - 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x4a, 0x0a, 0x0e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, - 0x65, 0x64, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, - 0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x0e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x53, 0x6c, - 0x12, 0x39, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, - 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x09, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x4a, 0x0a, 0x0e, 0x49, - 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, - 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x35, 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x53, 0x6c, - 0x53, 0x6c, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, - 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x1a, - 0x0a, 0x08, 0x42, 0x79, 0x74, 0x65, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0c, - 0x52, 0x08, 0x42, 0x79, 0x74, 0x65, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x55, 0x69, - 0x6e, 0x74, 0x38, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x55, - 0x69, 0x6e, 0x74, 0x38, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x37, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, - 0x31, 0x36, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x31, - 0x36, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x53, 0x6c, 0x53, - 0x6c, 0x12, 0x3c, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x6c, 0x53, 0x6c, 0x18, - 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, - 0x53, 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x6c, 0x53, 0x6c, 0x12, - 0x4d, 0x0a, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, - 0x53, 0x6c, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, - 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x55, 0x49, - 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0f, 0x55, - 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x3c, - 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x0d, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, - 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x4d, 0x0a, 0x0f, - 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x53, 0x6c, 0x18, - 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, - 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x55, 0x49, 0x6e, 0x74, 0x36, - 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0f, 0x55, 0x69, 0x6e, 0x74, - 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x38, 0x0a, 0x08, 0x55, - 0x69, 0x6e, 0x74, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, - 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x08, 0x55, 0x69, 0x6e, - 0x74, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x36, 0x0a, 0x07, 0x53, 0x74, 0x72, 0x53, 0x6c, 0x53, 0x6c, - 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, - 0x45, 0x53, 0x54, 0x53, 0x5f, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x4c, 0x69, 0x73, 0x74, 0x52, 0x07, 0x53, 0x74, 0x72, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x34, 0x0a, - 0x09, 0x42, 0x79, 0x74, 0x65, 0x73, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x42, - 0x79, 0x74, 0x65, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x09, 0x42, 0x79, 0x74, 0x65, 0x73, 0x53, - 0x6c, 0x53, 0x6c, 0x12, 0x36, 0x0a, 0x08, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x6c, 0x53, 0x6c, 0x18, - 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, - 0x53, 0x54, 0x53, 0x5f, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x08, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x3d, 0x0a, 0x0c, 0x44, - 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x13, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, - 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x0c, 0x44, 0x75, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x53, 0x6c, 0x12, 0x3a, 0x0a, 0x09, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x53, 0x6c, 0x53, 0x6c, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x09, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x53, 0x6c, 0x53, 0x6c, 0x22, 0x8b, 0x05, 0x0a, 0x0e, 0x50, 0x6f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x6e, 0x74, - 0x38, 0x50, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x06, 0x49, 0x6e, 0x74, 0x38, 0x50, - 0x74, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x50, 0x74, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x11, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x50, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x49, - 0x6e, 0x74, 0x33, 0x32, 0x50, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x07, 0x49, 0x6e, - 0x74, 0x33, 0x32, 0x50, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x50, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x0c, 0x49, 0x6e, 0x74, - 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x6e, 0x74, - 0x36, 0x34, 0x50, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x12, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x36, - 0x34, 0x50, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, - 0x64, 0x50, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x10, 0x52, 0x0c, 0x49, 0x6e, 0x74, 0x36, 0x34, - 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x50, 0x74, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x49, 0x6e, 0x74, 0x50, 0x74, 0x12, 0x16, 0x0a, - 0x06, 0x42, 0x79, 0x74, 0x65, 0x50, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x42, - 0x79, 0x74, 0x65, 0x50, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x50, 0x74, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x50, 0x74, 0x12, - 0x1a, 0x0a, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x50, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x08, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x50, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x55, - 0x69, 0x6e, 0x74, 0x33, 0x32, 0x50, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x55, - 0x69, 0x6e, 0x74, 0x33, 0x32, 0x50, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x69, 0x6e, 0x74, 0x33, - 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0d, - 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x12, 0x1a, 0x0a, - 0x08, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x50, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x08, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x50, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x69, 0x6e, - 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x06, - 0x52, 0x0d, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x12, - 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x50, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x06, 0x55, 0x69, 0x6e, 0x74, 0x50, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x72, 0x50, 0x74, - 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x53, 0x74, 0x72, 0x50, 0x74, 0x12, 0x18, 0x0a, - 0x07, 0x42, 0x79, 0x74, 0x65, 0x73, 0x50, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x50, 0x74, 0x12, 0x32, 0x0a, 0x06, 0x54, 0x69, 0x6d, 0x65, 0x50, - 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x52, 0x06, 0x54, 0x69, 0x6d, 0x65, 0x50, 0x74, 0x12, 0x39, 0x0a, 0x0a, 0x44, - 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x44, 0x75, 0x72, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x74, 0x12, 0x2c, 0x0a, 0x07, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x50, - 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, - 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x07, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x50, 0x74, 0x22, 0xe0, 0x05, 0x0a, 0x13, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, - 0x49, 0x6e, 0x74, 0x38, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x11, 0x52, 0x08, - 0x49, 0x6e, 0x74, 0x38, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x31, - 0x36, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x11, 0x52, 0x09, 0x49, 0x6e, 0x74, - 0x31, 0x36, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x50, - 0x74, 0x53, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x11, 0x52, 0x09, 0x49, 0x6e, 0x74, 0x33, 0x32, - 0x50, 0x74, 0x53, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, - 0x65, 0x64, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0f, 0x52, 0x0e, 0x49, 0x6e, - 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1c, 0x0a, 0x09, - 0x49, 0x6e, 0x74, 0x36, 0x34, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x05, 0x20, 0x03, 0x28, 0x12, 0x52, - 0x09, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x49, 0x6e, - 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x06, 0x20, 0x03, - 0x28, 0x10, 0x52, 0x0e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, - 0x53, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x6e, 0x74, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x07, 0x20, - 0x03, 0x28, 0x12, 0x52, 0x07, 0x49, 0x6e, 0x74, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1a, 0x0a, 0x08, - 0x42, 0x79, 0x74, 0x65, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, - 0x42, 0x79, 0x74, 0x65, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x55, 0x69, 0x6e, 0x74, - 0x38, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x55, 0x69, 0x6e, - 0x74, 0x38, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, - 0x50, 0x74, 0x53, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, - 0x31, 0x36, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, - 0x50, 0x74, 0x53, 0x6c, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, - 0x33, 0x32, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, - 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x07, 0x52, - 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x53, 0x6c, - 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x0d, - 0x20, 0x03, 0x28, 0x04, 0x52, 0x0a, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x50, 0x74, 0x53, 0x6c, - 0x12, 0x28, 0x0a, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, - 0x74, 0x53, 0x6c, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x06, 0x52, 0x0f, 0x55, 0x69, 0x6e, 0x74, 0x36, - 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x69, - 0x6e, 0x74, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x04, 0x52, 0x08, 0x55, 0x69, - 0x6e, 0x74, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x74, 0x72, 0x50, 0x74, 0x53, - 0x6c, 0x18, 0x10, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x53, 0x74, 0x72, 0x50, 0x74, 0x53, 0x6c, - 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x79, 0x74, 0x65, 0x73, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x11, 0x20, - 0x03, 0x28, 0x0c, 0x52, 0x09, 0x42, 0x79, 0x74, 0x65, 0x73, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x36, - 0x0a, 0x08, 0x54, 0x69, 0x6d, 0x65, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x54, 0x69, - 0x6d, 0x65, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x3d, 0x0a, 0x0c, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x50, 0x74, 0x53, 0x6c, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, - 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x50, 0x74, 0x53, 0x6c, 0x12, 0x30, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x50, 0x74, - 0x53, 0x6c, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x09, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x50, 0x74, 0x53, 0x6c, 0x22, 0xcd, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x78, 0x53, 0x74, 0x12, 0x31, 0x0a, 0x07, 0x50, 0x72, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x50, - 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, - 0x07, 0x50, 0x72, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x2d, 0x0a, 0x07, 0x41, 0x72, 0x46, 0x69, - 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x73, 0x2e, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x07, - 0x41, 0x72, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x2d, 0x0a, 0x07, 0x53, 0x6c, 0x46, 0x69, 0x65, - 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, - 0x2e, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x07, 0x53, - 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x2f, 0x0a, 0x07, 0x50, 0x74, 0x46, 0x69, 0x65, 0x6c, - 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, - 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x07, - 0x50, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x52, 0x0a, 0x0b, 0x45, 0x6d, 0x62, 0x65, 0x64, - 0x64, 0x65, 0x64, 0x53, 0x74, 0x31, 0x12, 0x43, 0x0a, 0x10, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, - 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x17, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, - 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x10, 0x50, 0x72, 0x69, 0x6d, 0x69, - 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x22, 0x83, 0x02, 0x0a, 0x0b, - 0x45, 0x6d, 0x62, 0x65, 0x64, 0x64, 0x65, 0x64, 0x53, 0x74, 0x32, 0x12, 0x43, 0x0a, 0x10, 0x50, - 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x50, 0x72, - 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x10, - 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, - 0x12, 0x37, 0x0a, 0x0c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x41, - 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0c, 0x41, 0x72, 0x72, - 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x37, 0x0a, 0x0c, 0x53, 0x6c, 0x69, - 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x52, 0x0c, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, - 0x63, 0x74, 0x12, 0x3d, 0x0a, 0x0e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x73, 0x2e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, - 0x74, 0x52, 0x0e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, - 0x74, 0x22, 0xb9, 0x02, 0x0a, 0x0b, 0x45, 0x6d, 0x62, 0x65, 0x64, 0x64, 0x65, 0x64, 0x53, 0x74, - 0x33, 0x12, 0x43, 0x0a, 0x10, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, - 0x73, 0x74, 0x73, 0x2e, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x52, 0x10, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, - 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x37, 0x0a, 0x0c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, - 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, - 0x74, 0x52, 0x0c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, - 0x37, 0x0a, 0x0c, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x53, 0x6c, - 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0c, 0x53, 0x6c, 0x69, 0x63, - 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x3d, 0x0a, 0x0e, 0x50, 0x6f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x15, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x34, 0x0a, 0x0b, 0x45, 0x6d, 0x70, 0x74, 0x79, - 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, - 0x52, 0x0b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x22, 0xfb, 0x02, - 0x0a, 0x0b, 0x45, 0x6d, 0x62, 0x65, 0x64, 0x64, 0x65, 0x64, 0x53, 0x74, 0x34, 0x12, 0x12, 0x0a, - 0x04, 0x46, 0x6f, 0x6f, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x04, 0x46, 0x6f, 0x6f, - 0x31, 0x12, 0x43, 0x0a, 0x10, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, - 0x73, 0x74, 0x73, 0x2e, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x52, 0x10, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, - 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, 0x6f, 0x32, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x46, 0x6f, 0x6f, 0x32, 0x12, 0x41, 0x0a, 0x11, 0x41, 0x72, - 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x41, 0x72, - 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x11, 0x41, 0x72, 0x72, 0x61, - 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, - 0x04, 0x46, 0x6f, 0x6f, 0x33, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x46, 0x6f, 0x6f, - 0x33, 0x12, 0x37, 0x0a, 0x0c, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, - 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, - 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0c, 0x53, 0x6c, - 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, - 0x6f, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x46, 0x6f, 0x6f, 0x34, 0x12, 0x47, - 0x0a, 0x13, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, - 0x46, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x65, - 0x73, 0x74, 0x73, 0x2e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, - 0x63, 0x74, 0x52, 0x13, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, - 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, 0x6f, 0x35, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x46, 0x6f, 0x6f, 0x35, 0x22, 0x87, 0x03, 0x0a, 0x17, - 0x45, 0x6d, 0x62, 0x65, 0x64, 0x64, 0x65, 0x64, 0x53, 0x74, 0x35, 0x4e, 0x61, 0x6d, 0x65, 0x4f, - 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, 0x6f, 0x31, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x04, 0x46, 0x6f, 0x6f, 0x31, 0x12, 0x43, 0x0a, 0x10, 0x50, - 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x50, 0x72, - 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x10, - 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, - 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, 0x6f, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x46, 0x6f, 0x6f, 0x32, 0x12, 0x41, 0x0a, 0x11, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x52, 0x11, 0x41, 0x72, 0x72, 0x61, 0x79, 0x73, 0x53, 0x74, 0x72, 0x75, - 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, 0x6f, 0x33, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x46, 0x6f, 0x6f, 0x33, 0x12, 0x37, 0x0a, 0x0c, 0x53, - 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, - 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0c, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, 0x6f, 0x34, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x04, 0x46, 0x6f, 0x6f, 0x34, 0x12, 0x47, 0x0a, 0x13, 0x50, 0x6f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x50, 0x6f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x13, 0x50, 0x6f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x46, 0x69, 0x65, 0x6c, - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6f, 0x6f, 0x35, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x04, 0x46, 0x6f, 0x6f, 0x35, 0x22, 0x33, 0x0a, 0x15, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, - 0x72, 0x73, 0x68, 0x61, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x31, 0x12, 0x0c, - 0x0a, 0x01, 0x43, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x01, 0x43, 0x12, 0x0c, 0x0a, 0x01, - 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x01, 0x44, 0x22, 0x29, 0x0a, 0x0b, 0x52, 0x65, - 0x70, 0x72, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x31, 0x12, 0x0c, 0x0a, 0x01, 0x43, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x12, 0x52, 0x01, 0x43, 0x12, 0x0c, 0x0a, 0x01, 0x44, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x12, 0x52, 0x01, 0x44, 0x22, 0x3f, 0x0a, 0x15, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, - 0x72, 0x73, 0x68, 0x61, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x32, 0x12, 0x26, - 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x52, 0x65, 0x70, 0x72, 0x45, 0x6c, 0x65, 0x6d, 0x32, 0x52, - 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x49, 0x0a, 0x09, 0x52, 0x65, 0x70, 0x72, 0x45, 0x6c, - 0x65, 0x6d, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0x2d, 0x0a, 0x15, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, - 0x6c, 0x65, 0x72, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x33, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x22, 0x22, 0x0a, 0x12, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c, - 0x65, 0x72, 0x49, 0x6e, 0x74, 0x34, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x11, 0x52, 0x01, 0x41, 0x22, 0x2a, 0x0a, 0x12, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, 0x72, - 0x73, 0x68, 0x61, 0x6c, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x22, 0x4b, 0x0a, 0x15, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c, - 0x65, 0x72, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x36, 0x12, 0x32, 0x0a, 0x05, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, - 0x2e, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c, 0x65, 0x72, 0x53, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x31, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2d, 0x0a, - 0x15, 0x41, 0x6d, 0x69, 0x6e, 0x6f, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c, 0x65, 0x72, 0x53, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x37, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x21, 0x0a, 0x09, - 0x52, 0x65, 0x70, 0x72, 0x45, 0x6c, 0x65, 0x6d, 0x37, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, - 0x1e, 0x0a, 0x06, 0x49, 0x6e, 0x74, 0x44, 0x65, 0x66, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, - 0x1d, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x41, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x12, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1d, - 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x53, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x12, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1e, 0x0a, - 0x06, 0x42, 0x79, 0x74, 0x65, 0x41, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1e, 0x0a, - 0x06, 0x42, 0x79, 0x74, 0x65, 0x53, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xc0, 0x04, - 0x0a, 0x13, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, - 0x63, 0x74, 0x44, 0x65, 0x66, 0x12, 0x12, 0x0a, 0x04, 0x49, 0x6e, 0x74, 0x38, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x11, 0x52, 0x04, 0x49, 0x6e, 0x74, 0x38, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x74, - 0x31, 0x36, 0x18, 0x02, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x12, - 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, - 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x0a, 0x49, 0x6e, 0x74, 0x33, 0x32, - 0x46, 0x69, 0x78, 0x65, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x49, - 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x10, 0x52, - 0x0a, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x49, - 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x12, 0x52, 0x03, 0x49, 0x6e, 0x74, 0x12, 0x12, 0x0a, - 0x04, 0x42, 0x79, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x42, 0x79, 0x74, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x05, 0x55, 0x69, 0x6e, 0x74, 0x38, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x31, - 0x36, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x12, - 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x06, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x20, 0x0a, 0x0b, 0x55, 0x69, 0x6e, 0x74, 0x33, - 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0b, 0x55, 0x69, - 0x6e, 0x74, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, - 0x74, 0x36, 0x34, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x36, - 0x34, 0x12, 0x20, 0x0a, 0x0b, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x06, 0x52, 0x0b, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x55, 0x69, 0x6e, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x04, 0x55, 0x69, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x53, 0x74, 0x72, 0x18, 0x10, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x53, 0x74, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x42, 0x79, 0x74, - 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, - 0x2e, 0x0a, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x12, - 0x35, 0x0a, 0x08, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x44, 0x75, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x18, - 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, - 0x22, 0x43, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x53, 0x6c, 0x12, 0x2d, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x50, 0x72, - 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x05, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x43, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, - 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x41, 0x72, 0x12, 0x2d, 0x0a, 0x05, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x73, 0x2e, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x53, 0x74, 0x72, - 0x75, 0x63, 0x74, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x0b, 0x0a, 0x09, 0x43, 0x6f, - 0x6e, 0x63, 0x72, 0x65, 0x74, 0x65, 0x31, 0x22, 0x0b, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x63, 0x72, - 0x65, 0x74, 0x65, 0x32, 0x22, 0x27, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x63, 0x72, 0x65, 0x74, 0x65, - 0x54, 0x79, 0x70, 0x65, 0x44, 0x65, 0x66, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2c, 0x0a, - 0x14, 0x43, 0x6f, 0x6e, 0x63, 0x72, 0x65, 0x74, 0x65, 0x57, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xaf, 0x01, 0x0a, 0x15, - 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x53, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x24, 0x0a, 0x02, 0x46, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x02, 0x46, 0x31, 0x12, 0x24, 0x0a, 0x02, 0x46, - 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x02, 0x46, - 0x32, 0x12, 0x24, 0x0a, 0x02, 0x46, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x41, 0x6e, 0x79, 0x52, 0x02, 0x46, 0x33, 0x12, 0x24, 0x0a, 0x02, 0x46, 0x34, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x02, 0x46, 0x34, 0x22, 0x27, 0x0a, - 0x0f, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x42, 0x79, 0x74, 0x65, 0x73, 0x4c, 0x69, 0x73, 0x74, - 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, - 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x43, 0x0a, 0x13, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x0a, - 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x73, 0x2e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x42, 0x79, 0x74, 0x65, 0x73, - 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x45, 0x0a, 0x12, 0x54, - 0x45, 0x53, 0x54, 0x53, 0x5f, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, - 0x74, 0x12, 0x2f, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x22, 0x41, 0x0a, 0x15, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x05, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x05, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x33, 0x0a, 0x1b, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, - 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0f, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x34, 0x0a, 0x1c, 0x54, 0x45, - 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x55, 0x49, 0x6e, 0x74, 0x33, - 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x07, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x22, 0x33, 0x0a, 0x1b, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, - 0x34, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, - 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x10, 0x52, 0x05, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x34, 0x0a, 0x1c, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x46, - 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x06, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x27, 0x0a, 0x0f, 0x54, - 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x31, 0x36, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, - 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x11, 0x52, 0x05, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2c, 0x0a, 0x14, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, - 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x11, 0x52, 0x05, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x22, 0x2c, 0x0a, 0x14, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x36, - 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x12, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x22, 0x26, 0x0a, 0x0e, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x49, 0x6e, 0x74, 0x38, 0x4c, 0x69, - 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x11, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2d, 0x0a, 0x15, 0x54, 0x45, 0x53, 0x54, - 0x53, 0x5f, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, - 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x47, 0x0a, 0x13, 0x54, 0x45, 0x53, 0x54, 0x53, - 0x5f, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x30, - 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x22, 0x28, 0x0a, 0x10, 0x54, 0x45, 0x53, 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x31, 0x36, - 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0d, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2d, 0x0a, 0x15, 0x54, 0x45, - 0x53, 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, - 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0d, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2d, 0x0a, 0x15, 0x54, 0x45, 0x53, - 0x54, 0x53, 0x5f, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, - 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x04, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6e, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x67, - 0x6e, 0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x73, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x74, 0x65, - 0x73, 0x74, 0x73, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_tests_proto_rawDescOnce sync.Once - file_tests_proto_rawDescData = file_tests_proto_rawDesc -) - -func file_tests_proto_rawDescGZIP() []byte { - file_tests_proto_rawDescOnce.Do(func() { - file_tests_proto_rawDescData = protoimpl.X.CompressGZIP(file_tests_proto_rawDescData) - }) - return file_tests_proto_rawDescData -} - -var ( - file_tests_proto_msgTypes = make([]protoimpl.MessageInfo, 55) - file_tests_proto_goTypes = []interface{}{ - (*EmptyStruct)(nil), // 0: tests.EmptyStruct - (*PrimitivesStruct)(nil), // 1: tests.PrimitivesStruct - (*ShortArraysStruct)(nil), // 2: tests.ShortArraysStruct - (*ArraysStruct)(nil), // 3: tests.ArraysStruct - (*ArraysArraysStruct)(nil), // 4: tests.ArraysArraysStruct - (*SlicesStruct)(nil), // 5: tests.SlicesStruct - (*SlicesSlicesStruct)(nil), // 6: tests.SlicesSlicesStruct - (*PointersStruct)(nil), // 7: tests.PointersStruct - (*PointerSlicesStruct)(nil), // 8: tests.PointerSlicesStruct - (*ComplexSt)(nil), // 9: tests.ComplexSt - (*EmbeddedSt1)(nil), // 10: tests.EmbeddedSt1 - (*EmbeddedSt2)(nil), // 11: tests.EmbeddedSt2 - (*EmbeddedSt3)(nil), // 12: tests.EmbeddedSt3 - (*EmbeddedSt4)(nil), // 13: tests.EmbeddedSt4 - (*EmbeddedSt5NameOverride)(nil), // 14: tests.EmbeddedSt5NameOverride - (*AminoMarshalerStruct1)(nil), // 15: tests.AminoMarshalerStruct1 - (*ReprStruct1)(nil), // 16: tests.ReprStruct1 - (*AminoMarshalerStruct2)(nil), // 17: tests.AminoMarshalerStruct2 - (*ReprElem2)(nil), // 18: tests.ReprElem2 - (*AminoMarshalerStruct3)(nil), // 19: tests.AminoMarshalerStruct3 - (*AminoMarshalerInt4)(nil), // 20: tests.AminoMarshalerInt4 - (*AminoMarshalerInt5)(nil), // 21: tests.AminoMarshalerInt5 - (*AminoMarshalerStruct6)(nil), // 22: tests.AminoMarshalerStruct6 - (*AminoMarshalerStruct7)(nil), // 23: tests.AminoMarshalerStruct7 - (*ReprElem7)(nil), // 24: tests.ReprElem7 - (*IntDef)(nil), // 25: tests.IntDef - (*IntAr)(nil), // 26: tests.IntAr - (*IntSl)(nil), // 27: tests.IntSl - (*ByteAr)(nil), // 28: tests.ByteAr - (*ByteSl)(nil), // 29: tests.ByteSl - (*PrimitivesStructDef)(nil), // 30: tests.PrimitivesStructDef - (*PrimitivesStructSl)(nil), // 31: tests.PrimitivesStructSl - (*PrimitivesStructAr)(nil), // 32: tests.PrimitivesStructAr - (*Concrete1)(nil), // 33: tests.Concrete1 - (*Concrete2)(nil), // 34: tests.Concrete2 - (*ConcreteTypeDef)(nil), // 35: tests.ConcreteTypeDef - (*ConcreteWrappedBytes)(nil), // 36: tests.ConcreteWrappedBytes - (*InterfaceFieldsStruct)(nil), // 37: tests.InterfaceFieldsStruct - (*TESTS_BytesList)(nil), // 38: tests.TESTS_BytesList - (*TESTS_BytesListList)(nil), // 39: tests.TESTS_BytesListList - (*TESTS_DurationList)(nil), // 40: tests.TESTS_DurationList - (*TESTS_EmptyStructList)(nil), // 41: tests.TESTS_EmptyStructList - (*TESTS_Fixed32Int32ValueList)(nil), // 42: tests.TESTS_Fixed32Int32ValueList - (*TESTS_Fixed32UInt32ValueList)(nil), // 43: tests.TESTS_Fixed32UInt32ValueList - (*TESTS_Fixed64Int64ValueList)(nil), // 44: tests.TESTS_Fixed64Int64ValueList - (*TESTS_Fixed64UInt64ValueList)(nil), // 45: tests.TESTS_Fixed64UInt64ValueList - (*TESTS_Int16List)(nil), // 46: tests.TESTS_Int16List - (*TESTS_Int32ValueList)(nil), // 47: tests.TESTS_Int32ValueList - (*TESTS_Int64ValueList)(nil), // 48: tests.TESTS_Int64ValueList - (*TESTS_Int8List)(nil), // 49: tests.TESTS_Int8List - (*TESTS_StringValueList)(nil), // 50: tests.TESTS_StringValueList - (*TESTS_TimestampList)(nil), // 51: tests.TESTS_TimestampList - (*TESTS_UInt16List)(nil), // 52: tests.TESTS_UInt16List - (*TESTS_UInt32ValueList)(nil), // 53: tests.TESTS_UInt32ValueList - (*TESTS_UInt64ValueList)(nil), // 54: tests.TESTS_UInt64ValueList - (*timestamppb.Timestamp)(nil), // 55: google.protobuf.Timestamp - (*durationpb.Duration)(nil), // 56: google.protobuf.Duration - (*anypb.Any)(nil), // 57: google.protobuf.Any - } -) - -var file_tests_proto_depIdxs = []int32{ - 55, // 0: tests.PrimitivesStruct.Time:type_name -> google.protobuf.Timestamp - 56, // 1: tests.PrimitivesStruct.Duration:type_name -> google.protobuf.Duration - 0, // 2: tests.PrimitivesStruct.Empty:type_name -> tests.EmptyStruct - 55, // 3: tests.ShortArraysStruct.TimeAr:type_name -> google.protobuf.Timestamp - 56, // 4: tests.ShortArraysStruct.DurationAr:type_name -> google.protobuf.Duration - 55, // 5: tests.ArraysStruct.TimeAr:type_name -> google.protobuf.Timestamp - 56, // 6: tests.ArraysStruct.DurationAr:type_name -> google.protobuf.Duration - 0, // 7: tests.ArraysStruct.EmptyAr:type_name -> tests.EmptyStruct - 49, // 8: tests.ArraysArraysStruct.Int8ArAr:type_name -> tests.TESTS_Int8List - 46, // 9: tests.ArraysArraysStruct.Int16ArAr:type_name -> tests.TESTS_Int16List - 47, // 10: tests.ArraysArraysStruct.Int32ArAr:type_name -> tests.TESTS_Int32ValueList - 42, // 11: tests.ArraysArraysStruct.Int32FixedArAr:type_name -> tests.TESTS_Fixed32Int32ValueList - 48, // 12: tests.ArraysArraysStruct.Int64ArAr:type_name -> tests.TESTS_Int64ValueList - 44, // 13: tests.ArraysArraysStruct.Int64FixedArAr:type_name -> tests.TESTS_Fixed64Int64ValueList - 48, // 14: tests.ArraysArraysStruct.IntArAr:type_name -> tests.TESTS_Int64ValueList - 52, // 15: tests.ArraysArraysStruct.Uint16ArAr:type_name -> tests.TESTS_UInt16List - 53, // 16: tests.ArraysArraysStruct.Uint32ArAr:type_name -> tests.TESTS_UInt32ValueList - 43, // 17: tests.ArraysArraysStruct.Uint32FixedArAr:type_name -> tests.TESTS_Fixed32UInt32ValueList - 54, // 18: tests.ArraysArraysStruct.Uint64ArAr:type_name -> tests.TESTS_UInt64ValueList - 45, // 19: tests.ArraysArraysStruct.Uint64FixedArAr:type_name -> tests.TESTS_Fixed64UInt64ValueList - 54, // 20: tests.ArraysArraysStruct.UintArAr:type_name -> tests.TESTS_UInt64ValueList - 50, // 21: tests.ArraysArraysStruct.StrArAr:type_name -> tests.TESTS_StringValueList - 38, // 22: tests.ArraysArraysStruct.BytesArAr:type_name -> tests.TESTS_BytesList - 51, // 23: tests.ArraysArraysStruct.TimeArAr:type_name -> tests.TESTS_TimestampList - 40, // 24: tests.ArraysArraysStruct.DurationArAr:type_name -> tests.TESTS_DurationList - 41, // 25: tests.ArraysArraysStruct.EmptyArAr:type_name -> tests.TESTS_EmptyStructList - 55, // 26: tests.SlicesStruct.TimeSl:type_name -> google.protobuf.Timestamp - 56, // 27: tests.SlicesStruct.DurationSl:type_name -> google.protobuf.Duration - 0, // 28: tests.SlicesStruct.EmptySl:type_name -> tests.EmptyStruct - 49, // 29: tests.SlicesSlicesStruct.Int8SlSl:type_name -> tests.TESTS_Int8List - 46, // 30: tests.SlicesSlicesStruct.Int16SlSl:type_name -> tests.TESTS_Int16List - 47, // 31: tests.SlicesSlicesStruct.Int32SlSl:type_name -> tests.TESTS_Int32ValueList - 42, // 32: tests.SlicesSlicesStruct.Int32FixedSlSl:type_name -> tests.TESTS_Fixed32Int32ValueList - 48, // 33: tests.SlicesSlicesStruct.Int64SlSl:type_name -> tests.TESTS_Int64ValueList - 44, // 34: tests.SlicesSlicesStruct.Int64FixedSlSl:type_name -> tests.TESTS_Fixed64Int64ValueList - 48, // 35: tests.SlicesSlicesStruct.IntSlSl:type_name -> tests.TESTS_Int64ValueList - 52, // 36: tests.SlicesSlicesStruct.Uint16SlSl:type_name -> tests.TESTS_UInt16List - 53, // 37: tests.SlicesSlicesStruct.Uint32SlSl:type_name -> tests.TESTS_UInt32ValueList - 43, // 38: tests.SlicesSlicesStruct.Uint32FixedSlSl:type_name -> tests.TESTS_Fixed32UInt32ValueList - 54, // 39: tests.SlicesSlicesStruct.Uint64SlSl:type_name -> tests.TESTS_UInt64ValueList - 45, // 40: tests.SlicesSlicesStruct.Uint64FixedSlSl:type_name -> tests.TESTS_Fixed64UInt64ValueList - 54, // 41: tests.SlicesSlicesStruct.UintSlSl:type_name -> tests.TESTS_UInt64ValueList - 50, // 42: tests.SlicesSlicesStruct.StrSlSl:type_name -> tests.TESTS_StringValueList - 38, // 43: tests.SlicesSlicesStruct.BytesSlSl:type_name -> tests.TESTS_BytesList - 51, // 44: tests.SlicesSlicesStruct.TimeSlSl:type_name -> tests.TESTS_TimestampList - 40, // 45: tests.SlicesSlicesStruct.DurationSlSl:type_name -> tests.TESTS_DurationList - 41, // 46: tests.SlicesSlicesStruct.EmptySlSl:type_name -> tests.TESTS_EmptyStructList - 55, // 47: tests.PointersStruct.TimePt:type_name -> google.protobuf.Timestamp - 56, // 48: tests.PointersStruct.DurationPt:type_name -> google.protobuf.Duration - 0, // 49: tests.PointersStruct.EmptyPt:type_name -> tests.EmptyStruct - 55, // 50: tests.PointerSlicesStruct.TimePtSl:type_name -> google.protobuf.Timestamp - 56, // 51: tests.PointerSlicesStruct.DurationPtSl:type_name -> google.protobuf.Duration - 0, // 52: tests.PointerSlicesStruct.EmptyPtSl:type_name -> tests.EmptyStruct - 1, // 53: tests.ComplexSt.PrField:type_name -> tests.PrimitivesStruct - 3, // 54: tests.ComplexSt.ArField:type_name -> tests.ArraysStruct - 5, // 55: tests.ComplexSt.SlField:type_name -> tests.SlicesStruct - 7, // 56: tests.ComplexSt.PtField:type_name -> tests.PointersStruct - 1, // 57: tests.EmbeddedSt1.PrimitivesStruct:type_name -> tests.PrimitivesStruct - 1, // 58: tests.EmbeddedSt2.PrimitivesStruct:type_name -> tests.PrimitivesStruct - 3, // 59: tests.EmbeddedSt2.ArraysStruct:type_name -> tests.ArraysStruct - 5, // 60: tests.EmbeddedSt2.SlicesStruct:type_name -> tests.SlicesStruct - 7, // 61: tests.EmbeddedSt2.PointersStruct:type_name -> tests.PointersStruct - 1, // 62: tests.EmbeddedSt3.PrimitivesStruct:type_name -> tests.PrimitivesStruct - 3, // 63: tests.EmbeddedSt3.ArraysStruct:type_name -> tests.ArraysStruct - 5, // 64: tests.EmbeddedSt3.SlicesStruct:type_name -> tests.SlicesStruct - 7, // 65: tests.EmbeddedSt3.PointersStruct:type_name -> tests.PointersStruct - 0, // 66: tests.EmbeddedSt3.EmptyStruct:type_name -> tests.EmptyStruct - 1, // 67: tests.EmbeddedSt4.PrimitivesStruct:type_name -> tests.PrimitivesStruct - 3, // 68: tests.EmbeddedSt4.ArraysStructField:type_name -> tests.ArraysStruct - 5, // 69: tests.EmbeddedSt4.SlicesStruct:type_name -> tests.SlicesStruct - 7, // 70: tests.EmbeddedSt4.PointersStructField:type_name -> tests.PointersStruct - 1, // 71: tests.EmbeddedSt5NameOverride.PrimitivesStruct:type_name -> tests.PrimitivesStruct - 3, // 72: tests.EmbeddedSt5NameOverride.ArraysStructField:type_name -> tests.ArraysStruct - 5, // 73: tests.EmbeddedSt5NameOverride.SlicesStruct:type_name -> tests.SlicesStruct - 7, // 74: tests.EmbeddedSt5NameOverride.PointersStructField:type_name -> tests.PointersStruct - 18, // 75: tests.AminoMarshalerStruct2.Value:type_name -> tests.ReprElem2 - 57, // 76: tests.ReprElem2.Value:type_name -> google.protobuf.Any - 15, // 77: tests.AminoMarshalerStruct6.Value:type_name -> tests.AminoMarshalerStruct1 - 55, // 78: tests.PrimitivesStructDef.Time:type_name -> google.protobuf.Timestamp - 56, // 79: tests.PrimitivesStructDef.Duration:type_name -> google.protobuf.Duration - 0, // 80: tests.PrimitivesStructDef.Empty:type_name -> tests.EmptyStruct - 1, // 81: tests.PrimitivesStructSl.Value:type_name -> tests.PrimitivesStruct - 1, // 82: tests.PrimitivesStructAr.Value:type_name -> tests.PrimitivesStruct - 57, // 83: tests.InterfaceFieldsStruct.F1:type_name -> google.protobuf.Any - 57, // 84: tests.InterfaceFieldsStruct.F2:type_name -> google.protobuf.Any - 57, // 85: tests.InterfaceFieldsStruct.F3:type_name -> google.protobuf.Any - 57, // 86: tests.InterfaceFieldsStruct.F4:type_name -> google.protobuf.Any - 38, // 87: tests.TESTS_BytesListList.Value:type_name -> tests.TESTS_BytesList - 56, // 88: tests.TESTS_DurationList.Value:type_name -> google.protobuf.Duration - 0, // 89: tests.TESTS_EmptyStructList.Value:type_name -> tests.EmptyStruct - 55, // 90: tests.TESTS_TimestampList.Value:type_name -> google.protobuf.Timestamp - 91, // [91:91] is the sub-list for method output_type - 91, // [91:91] is the sub-list for method input_type - 91, // [91:91] is the sub-list for extension type_name - 91, // [91:91] is the sub-list for extension extendee - 0, // [0:91] is the sub-list for field type_name -} - -func init() { file_tests_proto_init() } -func file_tests_proto_init() { - if File_tests_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_tests_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmptyStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PrimitivesStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ShortArraysStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ArraysStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ArraysArraysStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SlicesStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SlicesSlicesStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PointersStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PointerSlicesStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComplexSt); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmbeddedSt1); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmbeddedSt2); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmbeddedSt3); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmbeddedSt4); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmbeddedSt5NameOverride); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AminoMarshalerStruct1); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ReprStruct1); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AminoMarshalerStruct2); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ReprElem2); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AminoMarshalerStruct3); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AminoMarshalerInt4); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AminoMarshalerInt5); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AminoMarshalerStruct6); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AminoMarshalerStruct7); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ReprElem7); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*IntDef); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*IntAr); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*IntSl); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ByteAr); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ByteSl); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PrimitivesStructDef); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PrimitivesStructSl); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PrimitivesStructAr); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Concrete1); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Concrete2); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConcreteTypeDef); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConcreteWrappedBytes); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*InterfaceFieldsStruct); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_BytesList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_BytesListList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_DurationList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_EmptyStructList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Fixed32Int32ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Fixed32UInt32ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Fixed64Int64ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Fixed64UInt64ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Int16List); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Int32ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Int64ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_Int8List); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_StringValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_TimestampList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_UInt16List); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_UInt32ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tests_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TESTS_UInt64ValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tests_proto_rawDesc, - NumEnums: 0, - NumMessages: 55, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_tests_proto_goTypes, - DependencyIndexes: file_tests_proto_depIdxs, - MessageInfos: file_tests_proto_msgTypes, - }.Build() - File_tests_proto = out.File - file_tests_proto_rawDesc = nil - file_tests_proto_goTypes = nil - file_tests_proto_depIdxs = nil -} diff --git a/pkgs/amino/tests/pbbindings.go b/pkgs/amino/tests/pbbindings.go deleted file mode 100644 index 388bcd1d168..00000000000 --- a/pkgs/amino/tests/pbbindings.go +++ /dev/null @@ -1,9451 +0,0 @@ -//nolint:stylecheck,unconvert -package tests - -import ( - time "time" - - amino "github.com/gnolang/gno/pkgs/amino" - testspb "github.com/gnolang/gno/pkgs/amino/tests/pb" - proto "google.golang.org/protobuf/proto" - anypb "google.golang.org/protobuf/types/known/anypb" - durationpb "google.golang.org/protobuf/types/known/durationpb" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" -) - -func (es EmptyStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.EmptyStruct - { - if IsEmptyStructReprEmpty(es) { - var pbov *testspb.EmptyStruct - msg = pbov - return - } - pbo = new(testspb.EmptyStruct) - } - msg = pbo - return -} - -func (es EmptyStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.EmptyStruct) - msg = pbo - return -} - -func (es *EmptyStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.EmptyStruct = msg.(*testspb.EmptyStruct) - { - if pbo != nil { - } - } - return -} - -func (es EmptyStruct) GetTypeURL() (typeURL string) { - return "/tests.EmptyStruct" -} - -func IsEmptyStructReprEmpty(goor EmptyStruct) (empty bool) { - { - empty = true - } - return -} - -func (ps PrimitivesStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.PrimitivesStruct - { - if IsPrimitivesStructReprEmpty(ps) { - var pbov *testspb.PrimitivesStruct - msg = pbov - return - } - pbo = new(testspb.PrimitivesStruct) - { - pbo.Int8 = int32(ps.Int8) - } - { - pbo.Int16 = int32(ps.Int16) - } - { - pbo.Int32 = int32(ps.Int32) - } - { - pbo.Int32Fixed = int32(ps.Int32Fixed) - } - { - pbo.Int64 = int64(ps.Int64) - } - { - pbo.Int64Fixed = int64(ps.Int64Fixed) - } - { - pbo.Int = int64(ps.Int) - } - { - pbo.Byte = uint32(ps.Byte) - } - { - pbo.Uint8 = uint32(ps.Uint8) - } - { - pbo.Uint16 = uint32(ps.Uint16) - } - { - pbo.Uint32 = uint32(ps.Uint32) - } - { - pbo.Uint32Fixed = uint32(ps.Uint32Fixed) - } - { - pbo.Uint64 = uint64(ps.Uint64) - } - { - pbo.Uint64Fixed = uint64(ps.Uint64Fixed) - } - { - pbo.Uint = uint64(ps.Uint) - } - { - pbo.Str = string(ps.Str) - } - { - goorl := len(ps.Bytes) - if goorl == 0 { - pbo.Bytes = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ps.Bytes[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.Bytes = pbos - } - } - { - if !amino.IsEmptyTime(ps.Time) { - pbo.Time = timestamppb.New(ps.Time) - } - } - { - if ps.Duration.Nanoseconds() != 0 { - pbo.Duration = durationpb.New(ps.Duration) - } - } - { - pbom := proto.Message(nil) - pbom, err = ps.Empty.ToPBMessage(cdc) - if err != nil { - return - } - pbo.Empty = pbom.(*testspb.EmptyStruct) - } - } - msg = pbo - return -} - -func (ps PrimitivesStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.PrimitivesStruct) - msg = pbo - return -} - -func (ps *PrimitivesStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.PrimitivesStruct = msg.(*testspb.PrimitivesStruct) - { - if pbo != nil { - { - (*ps).Int8 = int8(int8(pbo.Int8)) - } - { - (*ps).Int16 = int16(int16(pbo.Int16)) - } - { - (*ps).Int32 = int32(pbo.Int32) - } - { - (*ps).Int32Fixed = int32(pbo.Int32Fixed) - } - { - (*ps).Int64 = int64(pbo.Int64) - } - { - (*ps).Int64Fixed = int64(pbo.Int64Fixed) - } - { - (*ps).Int = int(int(pbo.Int)) - } - { - (*ps).Byte = uint8(uint8(pbo.Byte)) - } - { - (*ps).Uint8 = uint8(uint8(pbo.Uint8)) - } - { - (*ps).Uint16 = uint16(uint16(pbo.Uint16)) - } - { - (*ps).Uint32 = uint32(pbo.Uint32) - } - { - (*ps).Uint32Fixed = uint32(pbo.Uint32Fixed) - } - { - (*ps).Uint64 = uint64(pbo.Uint64) - } - { - (*ps).Uint64Fixed = uint64(pbo.Uint64Fixed) - } - { - (*ps).Uint = uint(uint(pbo.Uint)) - } - { - (*ps).Str = string(pbo.Str) - } - { - var pbol int = 0 - if pbo.Bytes != nil { - pbol = len(pbo.Bytes) - } - if pbol == 0 { - (*ps).Bytes = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Bytes[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*ps).Bytes = goors - } - } - { - (*ps).Time = pbo.Time.AsTime() - } - { - (*ps).Duration = pbo.Duration.AsDuration() - } - { - if pbo.Empty != nil { - err = (*ps).Empty.FromPBMessage(cdc, pbo.Empty) - if err != nil { - return - } - } - } - } - } - return -} - -func (ps PrimitivesStruct) GetTypeURL() (typeURL string) { - return "/tests.PrimitivesStruct" -} - -func IsPrimitivesStructReprEmpty(goor PrimitivesStruct) (empty bool) { - { - empty = true - { - if goor.Int8 != int8(0) { - return false - } - } - { - if goor.Int16 != int16(0) { - return false - } - } - { - if goor.Int32 != int32(0) { - return false - } - } - { - if goor.Int32Fixed != int32(0) { - return false - } - } - { - if goor.Int64 != int64(0) { - return false - } - } - { - if goor.Int64Fixed != int64(0) { - return false - } - } - { - if goor.Int != int(0) { - return false - } - } - { - if goor.Byte != uint8(0) { - return false - } - } - { - if goor.Uint8 != uint8(0) { - return false - } - } - { - if goor.Uint16 != uint16(0) { - return false - } - } - { - if goor.Uint32 != uint32(0) { - return false - } - } - { - if goor.Uint32Fixed != uint32(0) { - return false - } - } - { - if goor.Uint64 != uint64(0) { - return false - } - } - { - if goor.Uint64Fixed != uint64(0) { - return false - } - } - { - if goor.Uint != uint(0) { - return false - } - } - { - if goor.Str != string("") { - return false - } - } - { - if len(goor.Bytes) != 0 { - return false - } - } - { - if !amino.IsEmptyTime(goor.Time) { - return false - } - } - { - if goor.Duration != time.Duration(0) { - return false - } - } - { - e := IsEmptyStructReprEmpty(goor.Empty) - if e == false { - return false - } - } - } - return -} - -func (sas ShortArraysStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ShortArraysStruct - { - if IsShortArraysStructReprEmpty(sas) { - var pbov *testspb.ShortArraysStruct - msg = pbov - return - } - pbo = new(testspb.ShortArraysStruct) - { - goorl := len(sas.TimeAr) - if goorl == 0 { - pbo.TimeAr = nil - } else { - pbos := make([]*timestamppb.Timestamp, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sas.TimeAr[i] - { - if !amino.IsEmptyTime(goore) { - pbos[i] = timestamppb.New(goore) - } - } - } - } - pbo.TimeAr = pbos - } - } - { - goorl := len(sas.DurationAr) - if goorl == 0 { - pbo.DurationAr = nil - } else { - pbos := make([]*durationpb.Duration, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sas.DurationAr[i] - { - if goore.Nanoseconds() != 0 { - pbos[i] = durationpb.New(goore) - } - } - } - } - pbo.DurationAr = pbos - } - } - } - msg = pbo - return -} - -func (sas ShortArraysStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ShortArraysStruct) - msg = pbo - return -} - -func (sas *ShortArraysStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ShortArraysStruct = msg.(*testspb.ShortArraysStruct) - { - if pbo != nil { - { - goors := [0]time.Time{} - for i := 0; i < 0; i += 1 { - { - pboe := pbo.TimeAr[i] - { - pboev := pboe - goors[i] = pboev.AsTime() - } - } - } - (*sas).TimeAr = goors - } - { - goors := [0]time.Duration{} - for i := 0; i < 0; i += 1 { - { - pboe := pbo.DurationAr[i] - { - pboev := pboe - goors[i] = pboev.AsDuration() - } - } - } - (*sas).DurationAr = goors - } - } - } - return -} - -func (sas ShortArraysStruct) GetTypeURL() (typeURL string) { - return "/tests.ShortArraysStruct" -} - -func IsShortArraysStructReprEmpty(goor ShortArraysStruct) (empty bool) { - { - empty = true - { - if len(goor.TimeAr) != 0 { - return false - } - } - { - if len(goor.DurationAr) != 0 { - return false - } - } - } - return -} - -func (as ArraysStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ArraysStruct - { - if IsArraysStructReprEmpty(as) { - var pbov *testspb.ArraysStruct - msg = pbov - return - } - pbo = new(testspb.ArraysStruct) - { - goorl := len(as.Int8Ar) - if goorl == 0 { - pbo.Int8Ar = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Int8Ar[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int8Ar = pbos - } - } - { - goorl := len(as.Int16Ar) - if goorl == 0 { - pbo.Int16Ar = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Int16Ar[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int16Ar = pbos - } - } - { - goorl := len(as.Int32Ar) - if goorl == 0 { - pbo.Int32Ar = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Int32Ar[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int32Ar = pbos - } - } - { - goorl := len(as.Int32FixedAr) - if goorl == 0 { - pbo.Int32FixedAr = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Int32FixedAr[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int32FixedAr = pbos - } - } - { - goorl := len(as.Int64Ar) - if goorl == 0 { - pbo.Int64Ar = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Int64Ar[i] - { - pbos[i] = int64(goore) - } - } - } - pbo.Int64Ar = pbos - } - } - { - goorl := len(as.Int64FixedAr) - if goorl == 0 { - pbo.Int64FixedAr = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Int64FixedAr[i] - { - pbos[i] = int64(goore) - } - } - } - pbo.Int64FixedAr = pbos - } - } - { - goorl := len(as.IntAr) - if goorl == 0 { - pbo.IntAr = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.IntAr[i] - { - pbos[i] = int64(goore) - } - } - } - pbo.IntAr = pbos - } - } - { - goorl := len(as.ByteAr) - if goorl == 0 { - pbo.ByteAr = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.ByteAr[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.ByteAr = pbos - } - } - { - goorl := len(as.Uint8Ar) - if goorl == 0 { - pbo.Uint8Ar = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Uint8Ar[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.Uint8Ar = pbos - } - } - { - goorl := len(as.Uint16Ar) - if goorl == 0 { - pbo.Uint16Ar = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Uint16Ar[i] - { - pbos[i] = uint32(goore) - } - } - } - pbo.Uint16Ar = pbos - } - } - { - goorl := len(as.Uint32Ar) - if goorl == 0 { - pbo.Uint32Ar = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Uint32Ar[i] - { - pbos[i] = uint32(goore) - } - } - } - pbo.Uint32Ar = pbos - } - } - { - goorl := len(as.Uint32FixedAr) - if goorl == 0 { - pbo.Uint32FixedAr = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Uint32FixedAr[i] - { - pbos[i] = uint32(goore) - } - } - } - pbo.Uint32FixedAr = pbos - } - } - { - goorl := len(as.Uint64Ar) - if goorl == 0 { - pbo.Uint64Ar = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Uint64Ar[i] - { - pbos[i] = uint64(goore) - } - } - } - pbo.Uint64Ar = pbos - } - } - { - goorl := len(as.Uint64FixedAr) - if goorl == 0 { - pbo.Uint64FixedAr = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.Uint64FixedAr[i] - { - pbos[i] = uint64(goore) - } - } - } - pbo.Uint64FixedAr = pbos - } - } - { - goorl := len(as.UintAr) - if goorl == 0 { - pbo.UintAr = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.UintAr[i] - { - pbos[i] = uint64(goore) - } - } - } - pbo.UintAr = pbos - } - } - { - goorl := len(as.StrAr) - if goorl == 0 { - pbo.StrAr = nil - } else { - pbos := make([]string, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.StrAr[i] - { - pbos[i] = string(goore) - } - } - } - pbo.StrAr = pbos - } - } - { - goorl := len(as.BytesAr) - if goorl == 0 { - pbo.BytesAr = nil - } else { - pbos := make([][]byte, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.BytesAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint8, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = byte(goore) - } - } - } - pbos[i] = pbos1 - } - } - } - } - pbo.BytesAr = pbos - } - } - { - goorl := len(as.TimeAr) - if goorl == 0 { - pbo.TimeAr = nil - } else { - pbos := make([]*timestamppb.Timestamp, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.TimeAr[i] - { - if !amino.IsEmptyTime(goore) { - pbos[i] = timestamppb.New(goore) - } - } - } - } - pbo.TimeAr = pbos - } - } - { - goorl := len(as.DurationAr) - if goorl == 0 { - pbo.DurationAr = nil - } else { - pbos := make([]*durationpb.Duration, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.DurationAr[i] - { - if goore.Nanoseconds() != 0 { - pbos[i] = durationpb.New(goore) - } - } - } - } - pbo.DurationAr = pbos - } - } - { - goorl := len(as.EmptyAr) - if goorl == 0 { - pbo.EmptyAr = nil - } else { - pbos := make([]*testspb.EmptyStruct, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := as.EmptyAr[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos[i] = pbom.(*testspb.EmptyStruct) - } - } - } - pbo.EmptyAr = pbos - } - } - } - msg = pbo - return -} - -func (as ArraysStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ArraysStruct) - msg = pbo - return -} - -func (as *ArraysStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ArraysStruct = msg.(*testspb.ArraysStruct) - { - if pbo != nil { - { - goors := [4]int8{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Int8Ar[i] - { - pboev := pboe - goors[i] = int8(int8(pboev)) - } - } - } - (*as).Int8Ar = goors - } - { - goors := [4]int16{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Int16Ar[i] - { - pboev := pboe - goors[i] = int16(int16(pboev)) - } - } - } - (*as).Int16Ar = goors - } - { - goors := [4]int32{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Int32Ar[i] - { - pboev := pboe - goors[i] = int32(pboev) - } - } - } - (*as).Int32Ar = goors - } - { - goors := [4]int32{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Int32FixedAr[i] - { - pboev := pboe - goors[i] = int32(pboev) - } - } - } - (*as).Int32FixedAr = goors - } - { - goors := [4]int64{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Int64Ar[i] - { - pboev := pboe - goors[i] = int64(pboev) - } - } - } - (*as).Int64Ar = goors - } - { - goors := [4]int64{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Int64FixedAr[i] - { - pboev := pboe - goors[i] = int64(pboev) - } - } - } - (*as).Int64FixedAr = goors - } - { - goors := [4]int{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.IntAr[i] - { - pboev := pboe - goors[i] = int(int(pboev)) - } - } - } - (*as).IntAr = goors - } - { - goors := [4]uint8{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.ByteAr[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*as).ByteAr = goors - } - { - goors := [4]uint8{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Uint8Ar[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*as).Uint8Ar = goors - } - { - goors := [4]uint16{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Uint16Ar[i] - { - pboev := pboe - goors[i] = uint16(uint16(pboev)) - } - } - } - (*as).Uint16Ar = goors - } - { - goors := [4]uint32{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Uint32Ar[i] - { - pboev := pboe - goors[i] = uint32(pboev) - } - } - } - (*as).Uint32Ar = goors - } - { - goors := [4]uint32{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Uint32FixedAr[i] - { - pboev := pboe - goors[i] = uint32(pboev) - } - } - } - (*as).Uint32FixedAr = goors - } - { - goors := [4]uint64{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Uint64Ar[i] - { - pboev := pboe - goors[i] = uint64(pboev) - } - } - } - (*as).Uint64Ar = goors - } - { - goors := [4]uint64{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Uint64FixedAr[i] - { - pboev := pboe - goors[i] = uint64(pboev) - } - } - } - (*as).Uint64FixedAr = goors - } - { - goors := [4]uint{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.UintAr[i] - { - pboev := pboe - goors[i] = uint(uint(pboev)) - } - } - } - (*as).UintAr = goors - } - { - goors := [4]string{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.StrAr[i] - { - pboev := pboe - goors[i] = string(pboev) - } - } - } - (*as).StrAr = goors - } - { - goors := [4][]uint8{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.BytesAr[i] - { - pboev := pboe - var pbol int = 0 - if pboev != nil { - pbol = len(pboev) - } - if pbol == 0 { - goors[i] = nil - } else { - goors1 := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint8(uint8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*as).BytesAr = goors - } - { - goors := [4]time.Time{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.TimeAr[i] - { - pboev := pboe - goors[i] = pboev.AsTime() - } - } - } - (*as).TimeAr = goors - } - { - goors := [4]time.Duration{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.DurationAr[i] - { - pboev := pboe - goors[i] = pboev.AsDuration() - } - } - } - (*as).DurationAr = goors - } - { - goors := [4]EmptyStruct{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.EmptyAr[i] - { - pboev := pboe - if pboev != nil { - err = goors[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - (*as).EmptyAr = goors - } - } - } - return -} - -func (as ArraysStruct) GetTypeURL() (typeURL string) { - return "/tests.ArraysStruct" -} - -func IsArraysStructReprEmpty(goor ArraysStruct) (empty bool) { - { - empty = true - { - if len(goor.Int8Ar) != 0 { - return false - } - } - { - if len(goor.Int16Ar) != 0 { - return false - } - } - { - if len(goor.Int32Ar) != 0 { - return false - } - } - { - if len(goor.Int32FixedAr) != 0 { - return false - } - } - { - if len(goor.Int64Ar) != 0 { - return false - } - } - { - if len(goor.Int64FixedAr) != 0 { - return false - } - } - { - if len(goor.IntAr) != 0 { - return false - } - } - { - if len(goor.ByteAr) != 0 { - return false - } - } - { - if len(goor.Uint8Ar) != 0 { - return false - } - } - { - if len(goor.Uint16Ar) != 0 { - return false - } - } - { - if len(goor.Uint32Ar) != 0 { - return false - } - } - { - if len(goor.Uint32FixedAr) != 0 { - return false - } - } - { - if len(goor.Uint64Ar) != 0 { - return false - } - } - { - if len(goor.Uint64FixedAr) != 0 { - return false - } - } - { - if len(goor.UintAr) != 0 { - return false - } - } - { - if len(goor.StrAr) != 0 { - return false - } - } - { - if len(goor.BytesAr) != 0 { - return false - } - } - { - if len(goor.TimeAr) != 0 { - return false - } - } - { - if len(goor.DurationAr) != 0 { - return false - } - } - { - if len(goor.EmptyAr) != 0 { - return false - } - } - } - return -} - -func (aas ArraysArraysStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ArraysArraysStruct - { - if IsArraysArraysStructReprEmpty(aas) { - var pbov *testspb.ArraysArraysStruct - msg = pbov - return - } - pbo = new(testspb.ArraysArraysStruct) - { - goorl := len(aas.Int8ArAr) - if goorl == 0 { - pbo.Int8ArAr = nil - } else { - pbos := make([]*testspb.TESTS_Int8List, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Int8ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int8List{Value: pbos1} - } - } - } - } - pbo.Int8ArAr = pbos - } - } - { - goorl := len(aas.Int16ArAr) - if goorl == 0 { - pbo.Int16ArAr = nil - } else { - pbos := make([]*testspb.TESTS_Int16List, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Int16ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int16List{Value: pbos1} - } - } - } - } - pbo.Int16ArAr = pbos - } - } - { - goorl := len(aas.Int32ArAr) - if goorl == 0 { - pbo.Int32ArAr = nil - } else { - pbos := make([]*testspb.TESTS_Int32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Int32ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int32ValueList{Value: pbos1} - } - } - } - } - pbo.Int32ArAr = pbos - } - } - { - goorl := len(aas.Int32FixedArAr) - if goorl == 0 { - pbo.Int32FixedArAr = nil - } else { - pbos := make([]*testspb.TESTS_Fixed32Int32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Int32FixedArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed32Int32ValueList{Value: pbos1} - } - } - } - } - pbo.Int32FixedArAr = pbos - } - } - { - goorl := len(aas.Int64ArAr) - if goorl == 0 { - pbo.Int64ArAr = nil - } else { - pbos := make([]*testspb.TESTS_Int64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Int64ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int64ValueList{Value: pbos1} - } - } - } - } - pbo.Int64ArAr = pbos - } - } - { - goorl := len(aas.Int64FixedArAr) - if goorl == 0 { - pbo.Int64FixedArAr = nil - } else { - pbos := make([]*testspb.TESTS_Fixed64Int64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Int64FixedArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed64Int64ValueList{Value: pbos1} - } - } - } - } - pbo.Int64FixedArAr = pbos - } - } - { - goorl := len(aas.IntArAr) - if goorl == 0 { - pbo.IntArAr = nil - } else { - pbos := make([]*testspb.TESTS_Int64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.IntArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int64ValueList{Value: pbos1} - } - } - } - } - pbo.IntArAr = pbos - } - } - { - goorl := len(aas.ByteArAr) - if goorl == 0 { - pbo.ByteArAr = nil - } else { - pbos := make([][]byte, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.ByteArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint8, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = byte(goore) - } - } - } - pbos[i] = pbos1 - } - } - } - } - pbo.ByteArAr = pbos - } - } - { - goorl := len(aas.Uint8ArAr) - if goorl == 0 { - pbo.Uint8ArAr = nil - } else { - pbos := make([][]byte, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Uint8ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint8, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = byte(goore) - } - } - } - pbos[i] = pbos1 - } - } - } - } - pbo.Uint8ArAr = pbos - } - } - { - goorl := len(aas.Uint16ArAr) - if goorl == 0 { - pbo.Uint16ArAr = nil - } else { - pbos := make([]*testspb.TESTS_UInt16List, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Uint16ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint32(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt16List{Value: pbos1} - } - } - } - } - pbo.Uint16ArAr = pbos - } - } - { - goorl := len(aas.Uint32ArAr) - if goorl == 0 { - pbo.Uint32ArAr = nil - } else { - pbos := make([]*testspb.TESTS_UInt32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Uint32ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint32(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt32ValueList{Value: pbos1} - } - } - } - } - pbo.Uint32ArAr = pbos - } - } - { - goorl := len(aas.Uint32FixedArAr) - if goorl == 0 { - pbo.Uint32FixedArAr = nil - } else { - pbos := make([]*testspb.TESTS_Fixed32UInt32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Uint32FixedArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed32UInt32ValueList{Value: pbos1} - } - } - } - } - pbo.Uint32FixedArAr = pbos - } - } - { - goorl := len(aas.Uint64ArAr) - if goorl == 0 { - pbo.Uint64ArAr = nil - } else { - pbos := make([]*testspb.TESTS_UInt64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Uint64ArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint64(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt64ValueList{Value: pbos1} - } - } - } - } - pbo.Uint64ArAr = pbos - } - } - { - goorl := len(aas.Uint64FixedArAr) - if goorl == 0 { - pbo.Uint64FixedArAr = nil - } else { - pbos := make([]*testspb.TESTS_Fixed64UInt64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.Uint64FixedArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed64UInt64ValueList{Value: pbos1} - } - } - } - } - pbo.Uint64FixedArAr = pbos - } - } - { - goorl := len(aas.UintArAr) - if goorl == 0 { - pbo.UintArAr = nil - } else { - pbos := make([]*testspb.TESTS_UInt64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.UintArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint64(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt64ValueList{Value: pbos1} - } - } - } - } - pbo.UintArAr = pbos - } - } - { - goorl := len(aas.StrArAr) - if goorl == 0 { - pbo.StrArAr = nil - } else { - pbos := make([]*testspb.TESTS_StringValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.StrArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]string, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = string(goore) - } - } - } - pbos[i] = &testspb.TESTS_StringValueList{Value: pbos1} - } - } - } - } - pbo.StrArAr = pbos - } - } - { - goorl := len(aas.BytesArAr) - if goorl == 0 { - pbo.BytesArAr = nil - } else { - pbos := make([]*testspb.TESTS_BytesList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.BytesArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([][]byte, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - goorl2 := len(goore) - if goorl2 == 0 { - pbos1[i] = nil - } else { - pbos2 := make([]uint8, goorl2) - for i := 0; i < goorl2; i += 1 { - { - goore := goore[i] - { - pbos2[i] = byte(goore) - } - } - } - pbos1[i] = pbos2 - } - } - } - } - pbos[i] = &testspb.TESTS_BytesList{Value: pbos1} - } - } - } - } - pbo.BytesArAr = pbos - } - } - { - goorl := len(aas.TimeArAr) - if goorl == 0 { - pbo.TimeArAr = nil - } else { - pbos := make([]*testspb.TESTS_TimestampList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.TimeArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]*timestamppb.Timestamp, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - if !amino.IsEmptyTime(goore) { - pbos1[i] = timestamppb.New(goore) - } - } - } - } - pbos[i] = &testspb.TESTS_TimestampList{Value: pbos1} - } - } - } - } - pbo.TimeArAr = pbos - } - } - { - goorl := len(aas.DurationArAr) - if goorl == 0 { - pbo.DurationArAr = nil - } else { - pbos := make([]*testspb.TESTS_DurationList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.DurationArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]*durationpb.Duration, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - if goore.Nanoseconds() != 0 { - pbos1[i] = durationpb.New(goore) - } - } - } - } - pbos[i] = &testspb.TESTS_DurationList{Value: pbos1} - } - } - } - } - pbo.DurationArAr = pbos - } - } - { - goorl := len(aas.EmptyArAr) - if goorl == 0 { - pbo.EmptyArAr = nil - } else { - pbos := make([]*testspb.TESTS_EmptyStructList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := aas.EmptyArAr[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]*testspb.EmptyStruct, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos1[i] = pbom.(*testspb.EmptyStruct) - } - } - } - pbos[i] = &testspb.TESTS_EmptyStructList{Value: pbos1} - } - } - } - } - pbo.EmptyArAr = pbos - } - } - } - msg = pbo - return -} - -func (aas ArraysArraysStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ArraysArraysStruct) - msg = pbo - return -} - -func (aas *ArraysArraysStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ArraysArraysStruct = msg.(*testspb.ArraysArraysStruct) - { - if pbo != nil { - { - goors := [2][2]int8{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Int8ArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]int8{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int8(int8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Int8ArAr = goors - } - { - goors := [2][2]int16{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Int16ArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]int16{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int16(int16(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Int16ArAr = goors - } - { - goors := [2][2]int32{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Int32ArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]int32{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Int32ArAr = goors - } - { - goors := [2][2]int32{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Int32FixedArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]int32{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Int32FixedArAr = goors - } - { - goors := [2][2]int64{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Int64ArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]int64{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Int64ArAr = goors - } - { - goors := [2][2]int64{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Int64FixedArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]int64{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Int64FixedArAr = goors - } - { - goors := [2][2]int{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.IntArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]int{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int(int(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).IntArAr = goors - } - { - goors := [2][2]uint8{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.ByteArAr[i] - { - pboev := pboe - goors1 := [2]uint8{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint8(uint8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - (*aas).ByteArAr = goors - } - { - goors := [2][2]uint8{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Uint8ArAr[i] - { - pboev := pboe - goors1 := [2]uint8{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint8(uint8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - (*aas).Uint8ArAr = goors - } - { - goors := [2][2]uint16{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Uint16ArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]uint16{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint16(uint16(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Uint16ArAr = goors - } - { - goors := [2][2]uint32{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Uint32ArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]uint32{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Uint32ArAr = goors - } - { - goors := [2][2]uint32{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Uint32FixedArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]uint32{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Uint32FixedArAr = goors - } - { - goors := [2][2]uint64{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Uint64ArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]uint64{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Uint64ArAr = goors - } - { - goors := [2][2]uint64{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Uint64FixedArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]uint64{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).Uint64FixedArAr = goors - } - { - goors := [2][2]uint{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.UintArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]uint{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint(uint(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).UintArAr = goors - } - { - goors := [2][2]string{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.StrArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]string{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = string(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).StrArAr = goors - } - { - goors := [2][2][]uint8{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.BytesArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2][]uint8{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - var pbol int = 0 - if pboev != nil { - pbol = len(pboev) - } - if pbol == 0 { - goors1[i] = nil - } else { - goors2 := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors2[i] = uint8(uint8(pboev)) - } - } - } - goors1[i] = goors2 - } - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).BytesArAr = goors - } - { - goors := [2][2]time.Time{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.TimeArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]time.Time{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = pboev.AsTime() - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).TimeArAr = goors - } - { - goors := [2][2]time.Duration{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.DurationArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]time.Duration{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = pboev.AsDuration() - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).DurationArAr = goors - } - { - goors := [2][2]EmptyStruct{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.EmptyArAr[i] - if pboe != nil { - { - pboev := pboe.Value - goors1 := [2]EmptyStruct{} - for i := 0; i < 2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - if pboev != nil { - err = goors1[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - goors[i] = goors1 - } - } - } - } - (*aas).EmptyArAr = goors - } - } - } - return -} - -func (aas ArraysArraysStruct) GetTypeURL() (typeURL string) { - return "/tests.ArraysArraysStruct" -} - -func IsArraysArraysStructReprEmpty(goor ArraysArraysStruct) (empty bool) { - { - empty = true - { - if len(goor.Int8ArAr) != 0 { - return false - } - } - { - if len(goor.Int16ArAr) != 0 { - return false - } - } - { - if len(goor.Int32ArAr) != 0 { - return false - } - } - { - if len(goor.Int32FixedArAr) != 0 { - return false - } - } - { - if len(goor.Int64ArAr) != 0 { - return false - } - } - { - if len(goor.Int64FixedArAr) != 0 { - return false - } - } - { - if len(goor.IntArAr) != 0 { - return false - } - } - { - if len(goor.ByteArAr) != 0 { - return false - } - } - { - if len(goor.Uint8ArAr) != 0 { - return false - } - } - { - if len(goor.Uint16ArAr) != 0 { - return false - } - } - { - if len(goor.Uint32ArAr) != 0 { - return false - } - } - { - if len(goor.Uint32FixedArAr) != 0 { - return false - } - } - { - if len(goor.Uint64ArAr) != 0 { - return false - } - } - { - if len(goor.Uint64FixedArAr) != 0 { - return false - } - } - { - if len(goor.UintArAr) != 0 { - return false - } - } - { - if len(goor.StrArAr) != 0 { - return false - } - } - { - if len(goor.BytesArAr) != 0 { - return false - } - } - { - if len(goor.TimeArAr) != 0 { - return false - } - } - { - if len(goor.DurationArAr) != 0 { - return false - } - } - { - if len(goor.EmptyArAr) != 0 { - return false - } - } - } - return -} - -func (ss SlicesStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.SlicesStruct - { - if IsSlicesStructReprEmpty(ss) { - var pbov *testspb.SlicesStruct - msg = pbov - return - } - pbo = new(testspb.SlicesStruct) - { - goorl := len(ss.Int8Sl) - if goorl == 0 { - pbo.Int8Sl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Int8Sl[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int8Sl = pbos - } - } - { - goorl := len(ss.Int16Sl) - if goorl == 0 { - pbo.Int16Sl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Int16Sl[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int16Sl = pbos - } - } - { - goorl := len(ss.Int32Sl) - if goorl == 0 { - pbo.Int32Sl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Int32Sl[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int32Sl = pbos - } - } - { - goorl := len(ss.Int32FixedSl) - if goorl == 0 { - pbo.Int32FixedSl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Int32FixedSl[i] - { - pbos[i] = int32(goore) - } - } - } - pbo.Int32FixedSl = pbos - } - } - { - goorl := len(ss.Int64Sl) - if goorl == 0 { - pbo.Int64Sl = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Int64Sl[i] - { - pbos[i] = int64(goore) - } - } - } - pbo.Int64Sl = pbos - } - } - { - goorl := len(ss.Int64FixedSl) - if goorl == 0 { - pbo.Int64FixedSl = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Int64FixedSl[i] - { - pbos[i] = int64(goore) - } - } - } - pbo.Int64FixedSl = pbos - } - } - { - goorl := len(ss.IntSl) - if goorl == 0 { - pbo.IntSl = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.IntSl[i] - { - pbos[i] = int64(goore) - } - } - } - pbo.IntSl = pbos - } - } - { - goorl := len(ss.ByteSl) - if goorl == 0 { - pbo.ByteSl = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.ByteSl[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.ByteSl = pbos - } - } - { - goorl := len(ss.Uint8Sl) - if goorl == 0 { - pbo.Uint8Sl = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Uint8Sl[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.Uint8Sl = pbos - } - } - { - goorl := len(ss.Uint16Sl) - if goorl == 0 { - pbo.Uint16Sl = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Uint16Sl[i] - { - pbos[i] = uint32(goore) - } - } - } - pbo.Uint16Sl = pbos - } - } - { - goorl := len(ss.Uint32Sl) - if goorl == 0 { - pbo.Uint32Sl = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Uint32Sl[i] - { - pbos[i] = uint32(goore) - } - } - } - pbo.Uint32Sl = pbos - } - } - { - goorl := len(ss.Uint32FixedSl) - if goorl == 0 { - pbo.Uint32FixedSl = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Uint32FixedSl[i] - { - pbos[i] = uint32(goore) - } - } - } - pbo.Uint32FixedSl = pbos - } - } - { - goorl := len(ss.Uint64Sl) - if goorl == 0 { - pbo.Uint64Sl = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Uint64Sl[i] - { - pbos[i] = uint64(goore) - } - } - } - pbo.Uint64Sl = pbos - } - } - { - goorl := len(ss.Uint64FixedSl) - if goorl == 0 { - pbo.Uint64FixedSl = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.Uint64FixedSl[i] - { - pbos[i] = uint64(goore) - } - } - } - pbo.Uint64FixedSl = pbos - } - } - { - goorl := len(ss.UintSl) - if goorl == 0 { - pbo.UintSl = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.UintSl[i] - { - pbos[i] = uint64(goore) - } - } - } - pbo.UintSl = pbos - } - } - { - goorl := len(ss.StrSl) - if goorl == 0 { - pbo.StrSl = nil - } else { - pbos := make([]string, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.StrSl[i] - { - pbos[i] = string(goore) - } - } - } - pbo.StrSl = pbos - } - } - { - goorl := len(ss.BytesSl) - if goorl == 0 { - pbo.BytesSl = nil - } else { - pbos := make([][]byte, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.BytesSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint8, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = byte(goore) - } - } - } - pbos[i] = pbos1 - } - } - } - } - pbo.BytesSl = pbos - } - } - { - goorl := len(ss.TimeSl) - if goorl == 0 { - pbo.TimeSl = nil - } else { - pbos := make([]*timestamppb.Timestamp, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.TimeSl[i] - { - if !amino.IsEmptyTime(goore) { - pbos[i] = timestamppb.New(goore) - } - } - } - } - pbo.TimeSl = pbos - } - } - { - goorl := len(ss.DurationSl) - if goorl == 0 { - pbo.DurationSl = nil - } else { - pbos := make([]*durationpb.Duration, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.DurationSl[i] - { - if goore.Nanoseconds() != 0 { - pbos[i] = durationpb.New(goore) - } - } - } - } - pbo.DurationSl = pbos - } - } - { - goorl := len(ss.EmptySl) - if goorl == 0 { - pbo.EmptySl = nil - } else { - pbos := make([]*testspb.EmptyStruct, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ss.EmptySl[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos[i] = pbom.(*testspb.EmptyStruct) - } - } - } - pbo.EmptySl = pbos - } - } - } - msg = pbo - return -} - -func (ss SlicesStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.SlicesStruct) - msg = pbo - return -} - -func (ss *SlicesStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.SlicesStruct = msg.(*testspb.SlicesStruct) - { - if pbo != nil { - { - var pbol int = 0 - if pbo.Int8Sl != nil { - pbol = len(pbo.Int8Sl) - } - if pbol == 0 { - (*ss).Int8Sl = nil - } else { - goors := make([]int8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int8Sl[i] - { - pboev := pboe - goors[i] = int8(int8(pboev)) - } - } - } - (*ss).Int8Sl = goors - } - } - { - var pbol int = 0 - if pbo.Int16Sl != nil { - pbol = len(pbo.Int16Sl) - } - if pbol == 0 { - (*ss).Int16Sl = nil - } else { - goors := make([]int16, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int16Sl[i] - { - pboev := pboe - goors[i] = int16(int16(pboev)) - } - } - } - (*ss).Int16Sl = goors - } - } - { - var pbol int = 0 - if pbo.Int32Sl != nil { - pbol = len(pbo.Int32Sl) - } - if pbol == 0 { - (*ss).Int32Sl = nil - } else { - goors := make([]int32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int32Sl[i] - { - pboev := pboe - goors[i] = int32(pboev) - } - } - } - (*ss).Int32Sl = goors - } - } - { - var pbol int = 0 - if pbo.Int32FixedSl != nil { - pbol = len(pbo.Int32FixedSl) - } - if pbol == 0 { - (*ss).Int32FixedSl = nil - } else { - goors := make([]int32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int32FixedSl[i] - { - pboev := pboe - goors[i] = int32(pboev) - } - } - } - (*ss).Int32FixedSl = goors - } - } - { - var pbol int = 0 - if pbo.Int64Sl != nil { - pbol = len(pbo.Int64Sl) - } - if pbol == 0 { - (*ss).Int64Sl = nil - } else { - goors := make([]int64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int64Sl[i] - { - pboev := pboe - goors[i] = int64(pboev) - } - } - } - (*ss).Int64Sl = goors - } - } - { - var pbol int = 0 - if pbo.Int64FixedSl != nil { - pbol = len(pbo.Int64FixedSl) - } - if pbol == 0 { - (*ss).Int64FixedSl = nil - } else { - goors := make([]int64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int64FixedSl[i] - { - pboev := pboe - goors[i] = int64(pboev) - } - } - } - (*ss).Int64FixedSl = goors - } - } - { - var pbol int = 0 - if pbo.IntSl != nil { - pbol = len(pbo.IntSl) - } - if pbol == 0 { - (*ss).IntSl = nil - } else { - goors := make([]int, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.IntSl[i] - { - pboev := pboe - goors[i] = int(int(pboev)) - } - } - } - (*ss).IntSl = goors - } - } - { - var pbol int = 0 - if pbo.ByteSl != nil { - pbol = len(pbo.ByteSl) - } - if pbol == 0 { - (*ss).ByteSl = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.ByteSl[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*ss).ByteSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint8Sl != nil { - pbol = len(pbo.Uint8Sl) - } - if pbol == 0 { - (*ss).Uint8Sl = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint8Sl[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*ss).Uint8Sl = goors - } - } - { - var pbol int = 0 - if pbo.Uint16Sl != nil { - pbol = len(pbo.Uint16Sl) - } - if pbol == 0 { - (*ss).Uint16Sl = nil - } else { - goors := make([]uint16, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint16Sl[i] - { - pboev := pboe - goors[i] = uint16(uint16(pboev)) - } - } - } - (*ss).Uint16Sl = goors - } - } - { - var pbol int = 0 - if pbo.Uint32Sl != nil { - pbol = len(pbo.Uint32Sl) - } - if pbol == 0 { - (*ss).Uint32Sl = nil - } else { - goors := make([]uint32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint32Sl[i] - { - pboev := pboe - goors[i] = uint32(pboev) - } - } - } - (*ss).Uint32Sl = goors - } - } - { - var pbol int = 0 - if pbo.Uint32FixedSl != nil { - pbol = len(pbo.Uint32FixedSl) - } - if pbol == 0 { - (*ss).Uint32FixedSl = nil - } else { - goors := make([]uint32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint32FixedSl[i] - { - pboev := pboe - goors[i] = uint32(pboev) - } - } - } - (*ss).Uint32FixedSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint64Sl != nil { - pbol = len(pbo.Uint64Sl) - } - if pbol == 0 { - (*ss).Uint64Sl = nil - } else { - goors := make([]uint64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint64Sl[i] - { - pboev := pboe - goors[i] = uint64(pboev) - } - } - } - (*ss).Uint64Sl = goors - } - } - { - var pbol int = 0 - if pbo.Uint64FixedSl != nil { - pbol = len(pbo.Uint64FixedSl) - } - if pbol == 0 { - (*ss).Uint64FixedSl = nil - } else { - goors := make([]uint64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint64FixedSl[i] - { - pboev := pboe - goors[i] = uint64(pboev) - } - } - } - (*ss).Uint64FixedSl = goors - } - } - { - var pbol int = 0 - if pbo.UintSl != nil { - pbol = len(pbo.UintSl) - } - if pbol == 0 { - (*ss).UintSl = nil - } else { - goors := make([]uint, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.UintSl[i] - { - pboev := pboe - goors[i] = uint(uint(pboev)) - } - } - } - (*ss).UintSl = goors - } - } - { - var pbol int = 0 - if pbo.StrSl != nil { - pbol = len(pbo.StrSl) - } - if pbol == 0 { - (*ss).StrSl = nil - } else { - goors := make([]string, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.StrSl[i] - { - pboev := pboe - goors[i] = string(pboev) - } - } - } - (*ss).StrSl = goors - } - } - { - var pbol int = 0 - if pbo.BytesSl != nil { - pbol = len(pbo.BytesSl) - } - if pbol == 0 { - (*ss).BytesSl = nil - } else { - goors := make([][]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.BytesSl[i] - { - pboev := pboe - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint8, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint8(uint8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*ss).BytesSl = goors - } - } - { - var pbol int = 0 - if pbo.TimeSl != nil { - pbol = len(pbo.TimeSl) - } - if pbol == 0 { - (*ss).TimeSl = nil - } else { - goors := make([]time.Time, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.TimeSl[i] - { - pboev := pboe - goors[i] = pboev.AsTime() - } - } - } - (*ss).TimeSl = goors - } - } - { - var pbol int = 0 - if pbo.DurationSl != nil { - pbol = len(pbo.DurationSl) - } - if pbol == 0 { - (*ss).DurationSl = nil - } else { - goors := make([]time.Duration, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.DurationSl[i] - { - pboev := pboe - goors[i] = pboev.AsDuration() - } - } - } - (*ss).DurationSl = goors - } - } - { - var pbol int = 0 - if pbo.EmptySl != nil { - pbol = len(pbo.EmptySl) - } - if pbol == 0 { - (*ss).EmptySl = nil - } else { - goors := make([]EmptyStruct, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.EmptySl[i] - { - pboev := pboe - if pboev != nil { - err = goors[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - (*ss).EmptySl = goors - } - } - } - } - return -} - -func (ss SlicesStruct) GetTypeURL() (typeURL string) { - return "/tests.SlicesStruct" -} - -func IsSlicesStructReprEmpty(goor SlicesStruct) (empty bool) { - { - empty = true - { - if len(goor.Int8Sl) != 0 { - return false - } - } - { - if len(goor.Int16Sl) != 0 { - return false - } - } - { - if len(goor.Int32Sl) != 0 { - return false - } - } - { - if len(goor.Int32FixedSl) != 0 { - return false - } - } - { - if len(goor.Int64Sl) != 0 { - return false - } - } - { - if len(goor.Int64FixedSl) != 0 { - return false - } - } - { - if len(goor.IntSl) != 0 { - return false - } - } - { - if len(goor.ByteSl) != 0 { - return false - } - } - { - if len(goor.Uint8Sl) != 0 { - return false - } - } - { - if len(goor.Uint16Sl) != 0 { - return false - } - } - { - if len(goor.Uint32Sl) != 0 { - return false - } - } - { - if len(goor.Uint32FixedSl) != 0 { - return false - } - } - { - if len(goor.Uint64Sl) != 0 { - return false - } - } - { - if len(goor.Uint64FixedSl) != 0 { - return false - } - } - { - if len(goor.UintSl) != 0 { - return false - } - } - { - if len(goor.StrSl) != 0 { - return false - } - } - { - if len(goor.BytesSl) != 0 { - return false - } - } - { - if len(goor.TimeSl) != 0 { - return false - } - } - { - if len(goor.DurationSl) != 0 { - return false - } - } - { - if len(goor.EmptySl) != 0 { - return false - } - } - } - return -} - -func (sss SlicesSlicesStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.SlicesSlicesStruct - { - if IsSlicesSlicesStructReprEmpty(sss) { - var pbov *testspb.SlicesSlicesStruct - msg = pbov - return - } - pbo = new(testspb.SlicesSlicesStruct) - { - goorl := len(sss.Int8SlSl) - if goorl == 0 { - pbo.Int8SlSl = nil - } else { - pbos := make([]*testspb.TESTS_Int8List, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Int8SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int8List{Value: pbos1} - } - } - } - } - pbo.Int8SlSl = pbos - } - } - { - goorl := len(sss.Int16SlSl) - if goorl == 0 { - pbo.Int16SlSl = nil - } else { - pbos := make([]*testspb.TESTS_Int16List, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Int16SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int16List{Value: pbos1} - } - } - } - } - pbo.Int16SlSl = pbos - } - } - { - goorl := len(sss.Int32SlSl) - if goorl == 0 { - pbo.Int32SlSl = nil - } else { - pbos := make([]*testspb.TESTS_Int32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Int32SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int32ValueList{Value: pbos1} - } - } - } - } - pbo.Int32SlSl = pbos - } - } - { - goorl := len(sss.Int32FixedSlSl) - if goorl == 0 { - pbo.Int32FixedSlSl = nil - } else { - pbos := make([]*testspb.TESTS_Fixed32Int32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Int32FixedSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed32Int32ValueList{Value: pbos1} - } - } - } - } - pbo.Int32FixedSlSl = pbos - } - } - { - goorl := len(sss.Int64SlSl) - if goorl == 0 { - pbo.Int64SlSl = nil - } else { - pbos := make([]*testspb.TESTS_Int64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Int64SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int64ValueList{Value: pbos1} - } - } - } - } - pbo.Int64SlSl = pbos - } - } - { - goorl := len(sss.Int64FixedSlSl) - if goorl == 0 { - pbo.Int64FixedSlSl = nil - } else { - pbos := make([]*testspb.TESTS_Fixed64Int64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Int64FixedSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed64Int64ValueList{Value: pbos1} - } - } - } - } - pbo.Int64FixedSlSl = pbos - } - } - { - goorl := len(sss.IntSlSl) - if goorl == 0 { - pbo.IntSlSl = nil - } else { - pbos := make([]*testspb.TESTS_Int64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.IntSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]int64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = int64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Int64ValueList{Value: pbos1} - } - } - } - } - pbo.IntSlSl = pbos - } - } - { - goorl := len(sss.ByteSlSl) - if goorl == 0 { - pbo.ByteSlSl = nil - } else { - pbos := make([][]byte, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.ByteSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint8, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = byte(goore) - } - } - } - pbos[i] = pbos1 - } - } - } - } - pbo.ByteSlSl = pbos - } - } - { - goorl := len(sss.Uint8SlSl) - if goorl == 0 { - pbo.Uint8SlSl = nil - } else { - pbos := make([][]byte, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Uint8SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint8, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = byte(goore) - } - } - } - pbos[i] = pbos1 - } - } - } - } - pbo.Uint8SlSl = pbos - } - } - { - goorl := len(sss.Uint16SlSl) - if goorl == 0 { - pbo.Uint16SlSl = nil - } else { - pbos := make([]*testspb.TESTS_UInt16List, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Uint16SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint32(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt16List{Value: pbos1} - } - } - } - } - pbo.Uint16SlSl = pbos - } - } - { - goorl := len(sss.Uint32SlSl) - if goorl == 0 { - pbo.Uint32SlSl = nil - } else { - pbos := make([]*testspb.TESTS_UInt32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Uint32SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint32(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt32ValueList{Value: pbos1} - } - } - } - } - pbo.Uint32SlSl = pbos - } - } - { - goorl := len(sss.Uint32FixedSlSl) - if goorl == 0 { - pbo.Uint32FixedSlSl = nil - } else { - pbos := make([]*testspb.TESTS_Fixed32UInt32ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Uint32FixedSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint32, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint32(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed32UInt32ValueList{Value: pbos1} - } - } - } - } - pbo.Uint32FixedSlSl = pbos - } - } - { - goorl := len(sss.Uint64SlSl) - if goorl == 0 { - pbo.Uint64SlSl = nil - } else { - pbos := make([]*testspb.TESTS_UInt64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Uint64SlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint64(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt64ValueList{Value: pbos1} - } - } - } - } - pbo.Uint64SlSl = pbos - } - } - { - goorl := len(sss.Uint64FixedSlSl) - if goorl == 0 { - pbo.Uint64FixedSlSl = nil - } else { - pbos := make([]*testspb.TESTS_Fixed64UInt64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.Uint64FixedSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint64(goore) - } - } - } - pbos[i] = &testspb.TESTS_Fixed64UInt64ValueList{Value: pbos1} - } - } - } - } - pbo.Uint64FixedSlSl = pbos - } - } - { - goorl := len(sss.UintSlSl) - if goorl == 0 { - pbo.UintSlSl = nil - } else { - pbos := make([]*testspb.TESTS_UInt64ValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.UintSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint64, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = uint64(goore) - } - } - } - pbos[i] = &testspb.TESTS_UInt64ValueList{Value: pbos1} - } - } - } - } - pbo.UintSlSl = pbos - } - } - { - goorl := len(sss.StrSlSl) - if goorl == 0 { - pbo.StrSlSl = nil - } else { - pbos := make([]*testspb.TESTS_StringValueList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.StrSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]string, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbos1[i] = string(goore) - } - } - } - pbos[i] = &testspb.TESTS_StringValueList{Value: pbos1} - } - } - } - } - pbo.StrSlSl = pbos - } - } - { - goorl := len(sss.BytesSlSl) - if goorl == 0 { - pbo.BytesSlSl = nil - } else { - pbos := make([]*testspb.TESTS_BytesList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.BytesSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([][]byte, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - goorl2 := len(goore) - if goorl2 == 0 { - pbos1[i] = nil - } else { - pbos2 := make([]uint8, goorl2) - for i := 0; i < goorl2; i += 1 { - { - goore := goore[i] - { - pbos2[i] = byte(goore) - } - } - } - pbos1[i] = pbos2 - } - } - } - } - pbos[i] = &testspb.TESTS_BytesList{Value: pbos1} - } - } - } - } - pbo.BytesSlSl = pbos - } - } - { - goorl := len(sss.TimeSlSl) - if goorl == 0 { - pbo.TimeSlSl = nil - } else { - pbos := make([]*testspb.TESTS_TimestampList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.TimeSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]*timestamppb.Timestamp, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - if !amino.IsEmptyTime(goore) { - pbos1[i] = timestamppb.New(goore) - } - } - } - } - pbos[i] = &testspb.TESTS_TimestampList{Value: pbos1} - } - } - } - } - pbo.TimeSlSl = pbos - } - } - { - goorl := len(sss.DurationSlSl) - if goorl == 0 { - pbo.DurationSlSl = nil - } else { - pbos := make([]*testspb.TESTS_DurationList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.DurationSlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]*durationpb.Duration, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - if goore.Nanoseconds() != 0 { - pbos1[i] = durationpb.New(goore) - } - } - } - } - pbos[i] = &testspb.TESTS_DurationList{Value: pbos1} - } - } - } - } - pbo.DurationSlSl = pbos - } - } - { - goorl := len(sss.EmptySlSl) - if goorl == 0 { - pbo.EmptySlSl = nil - } else { - pbos := make([]*testspb.TESTS_EmptyStructList, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := sss.EmptySlSl[i] - { - goorl1 := len(goore) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]*testspb.EmptyStruct, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := goore[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos1[i] = pbom.(*testspb.EmptyStruct) - } - } - } - pbos[i] = &testspb.TESTS_EmptyStructList{Value: pbos1} - } - } - } - } - pbo.EmptySlSl = pbos - } - } - } - msg = pbo - return -} - -func (sss SlicesSlicesStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.SlicesSlicesStruct) - msg = pbo - return -} - -func (sss *SlicesSlicesStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.SlicesSlicesStruct = msg.(*testspb.SlicesSlicesStruct) - { - if pbo != nil { - { - var pbol int = 0 - if pbo.Int8SlSl != nil { - pbol = len(pbo.Int8SlSl) - } - if pbol == 0 { - (*sss).Int8SlSl = nil - } else { - goors := make([][]int8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int8SlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]int8, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int8(int8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Int8SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Int16SlSl != nil { - pbol = len(pbo.Int16SlSl) - } - if pbol == 0 { - (*sss).Int16SlSl = nil - } else { - goors := make([][]int16, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int16SlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]int16, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int16(int16(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Int16SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Int32SlSl != nil { - pbol = len(pbo.Int32SlSl) - } - if pbol == 0 { - (*sss).Int32SlSl = nil - } else { - goors := make([][]int32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int32SlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]int32, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Int32SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Int32FixedSlSl != nil { - pbol = len(pbo.Int32FixedSlSl) - } - if pbol == 0 { - (*sss).Int32FixedSlSl = nil - } else { - goors := make([][]int32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int32FixedSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]int32, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Int32FixedSlSl = goors - } - } - { - var pbol int = 0 - if pbo.Int64SlSl != nil { - pbol = len(pbo.Int64SlSl) - } - if pbol == 0 { - (*sss).Int64SlSl = nil - } else { - goors := make([][]int64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int64SlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]int64, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Int64SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Int64FixedSlSl != nil { - pbol = len(pbo.Int64FixedSlSl) - } - if pbol == 0 { - (*sss).Int64FixedSlSl = nil - } else { - goors := make([][]int64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int64FixedSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]int64, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Int64FixedSlSl = goors - } - } - { - var pbol int = 0 - if pbo.IntSlSl != nil { - pbol = len(pbo.IntSlSl) - } - if pbol == 0 { - (*sss).IntSlSl = nil - } else { - goors := make([][]int, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.IntSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]int, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = int(int(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).IntSlSl = goors - } - } - { - var pbol int = 0 - if pbo.ByteSlSl != nil { - pbol = len(pbo.ByteSlSl) - } - if pbol == 0 { - (*sss).ByteSlSl = nil - } else { - goors := make([][]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.ByteSlSl[i] - { - pboev := pboe - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint8, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint8(uint8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*sss).ByteSlSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint8SlSl != nil { - pbol = len(pbo.Uint8SlSl) - } - if pbol == 0 { - (*sss).Uint8SlSl = nil - } else { - goors := make([][]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint8SlSl[i] - { - pboev := pboe - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint8, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint8(uint8(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - (*sss).Uint8SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint16SlSl != nil { - pbol = len(pbo.Uint16SlSl) - } - if pbol == 0 { - (*sss).Uint16SlSl = nil - } else { - goors := make([][]uint16, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint16SlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint16, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint16(uint16(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Uint16SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint32SlSl != nil { - pbol = len(pbo.Uint32SlSl) - } - if pbol == 0 { - (*sss).Uint32SlSl = nil - } else { - goors := make([][]uint32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint32SlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint32, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Uint32SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint32FixedSlSl != nil { - pbol = len(pbo.Uint32FixedSlSl) - } - if pbol == 0 { - (*sss).Uint32FixedSlSl = nil - } else { - goors := make([][]uint32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint32FixedSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint32, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint32(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Uint32FixedSlSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint64SlSl != nil { - pbol = len(pbo.Uint64SlSl) - } - if pbol == 0 { - (*sss).Uint64SlSl = nil - } else { - goors := make([][]uint64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint64SlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint64, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Uint64SlSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint64FixedSlSl != nil { - pbol = len(pbo.Uint64FixedSlSl) - } - if pbol == 0 { - (*sss).Uint64FixedSlSl = nil - } else { - goors := make([][]uint64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint64FixedSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint64, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint64(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).Uint64FixedSlSl = goors - } - } - { - var pbol int = 0 - if pbo.UintSlSl != nil { - pbol = len(pbo.UintSlSl) - } - if pbol == 0 { - (*sss).UintSlSl = nil - } else { - goors := make([][]uint, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.UintSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]uint, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint(uint(pboev)) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).UintSlSl = goors - } - } - { - var pbol int = 0 - if pbo.StrSlSl != nil { - pbol = len(pbo.StrSlSl) - } - if pbol == 0 { - (*sss).StrSlSl = nil - } else { - goors := make([][]string, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.StrSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]string, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = string(pboev) - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).StrSlSl = goors - } - } - { - var pbol int = 0 - if pbo.BytesSlSl != nil { - pbol = len(pbo.BytesSlSl) - } - if pbol == 0 { - (*sss).BytesSlSl = nil - } else { - goors := make([][][]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.BytesSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([][]uint8, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - var pbol2 int = 0 - if pboev != nil { - pbol2 = len(pboev) - } - if pbol2 == 0 { - goors1[i] = nil - } else { - goors2 := make([]uint8, pbol2) - for i := 0; i < pbol2; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors2[i] = uint8(uint8(pboev)) - } - } - } - goors1[i] = goors2 - } - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).BytesSlSl = goors - } - } - { - var pbol int = 0 - if pbo.TimeSlSl != nil { - pbol = len(pbo.TimeSlSl) - } - if pbol == 0 { - (*sss).TimeSlSl = nil - } else { - goors := make([][]time.Time, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.TimeSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]time.Time, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = pboev.AsTime() - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).TimeSlSl = goors - } - } - { - var pbol int = 0 - if pbo.DurationSlSl != nil { - pbol = len(pbo.DurationSlSl) - } - if pbol == 0 { - (*sss).DurationSlSl = nil - } else { - goors := make([][]time.Duration, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.DurationSlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]time.Duration, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = pboev.AsDuration() - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).DurationSlSl = goors - } - } - { - var pbol int = 0 - if pbo.EmptySlSl != nil { - pbol = len(pbo.EmptySlSl) - } - if pbol == 0 { - (*sss).EmptySlSl = nil - } else { - goors := make([][]EmptyStruct, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.EmptySlSl[i] - if pboe != nil { - { - pboev := pboe.Value - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - goors[i] = nil - } else { - goors1 := make([]EmptyStruct, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - if pboev != nil { - err = goors1[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - goors[i] = goors1 - } - } - } - } - } - (*sss).EmptySlSl = goors - } - } - } - } - return -} - -func (sss SlicesSlicesStruct) GetTypeURL() (typeURL string) { - return "/tests.SlicesSlicesStruct" -} - -func IsSlicesSlicesStructReprEmpty(goor SlicesSlicesStruct) (empty bool) { - { - empty = true - { - if len(goor.Int8SlSl) != 0 { - return false - } - } - { - if len(goor.Int16SlSl) != 0 { - return false - } - } - { - if len(goor.Int32SlSl) != 0 { - return false - } - } - { - if len(goor.Int32FixedSlSl) != 0 { - return false - } - } - { - if len(goor.Int64SlSl) != 0 { - return false - } - } - { - if len(goor.Int64FixedSlSl) != 0 { - return false - } - } - { - if len(goor.IntSlSl) != 0 { - return false - } - } - { - if len(goor.ByteSlSl) != 0 { - return false - } - } - { - if len(goor.Uint8SlSl) != 0 { - return false - } - } - { - if len(goor.Uint16SlSl) != 0 { - return false - } - } - { - if len(goor.Uint32SlSl) != 0 { - return false - } - } - { - if len(goor.Uint32FixedSlSl) != 0 { - return false - } - } - { - if len(goor.Uint64SlSl) != 0 { - return false - } - } - { - if len(goor.Uint64FixedSlSl) != 0 { - return false - } - } - { - if len(goor.UintSlSl) != 0 { - return false - } - } - { - if len(goor.StrSlSl) != 0 { - return false - } - } - { - if len(goor.BytesSlSl) != 0 { - return false - } - } - { - if len(goor.TimeSlSl) != 0 { - return false - } - } - { - if len(goor.DurationSlSl) != 0 { - return false - } - } - { - if len(goor.EmptySlSl) != 0 { - return false - } - } - } - return -} - -func (ps PointersStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.PointersStruct - { - if IsPointersStructReprEmpty(ps) { - var pbov *testspb.PointersStruct - msg = pbov - return - } - pbo = new(testspb.PointersStruct) - { - if ps.Int8Pt != nil { - dgoor := *ps.Int8Pt - dgoor = dgoor - pbo.Int8Pt = int32(dgoor) - } - } - { - if ps.Int16Pt != nil { - dgoor := *ps.Int16Pt - dgoor = dgoor - pbo.Int16Pt = int32(dgoor) - } - } - { - if ps.Int32Pt != nil { - dgoor := *ps.Int32Pt - dgoor = dgoor - pbo.Int32Pt = int32(dgoor) - } - } - { - if ps.Int32FixedPt != nil { - dgoor := *ps.Int32FixedPt - dgoor = dgoor - pbo.Int32FixedPt = int32(dgoor) - } - } - { - if ps.Int64Pt != nil { - dgoor := *ps.Int64Pt - dgoor = dgoor - pbo.Int64Pt = int64(dgoor) - } - } - { - if ps.Int64FixedPt != nil { - dgoor := *ps.Int64FixedPt - dgoor = dgoor - pbo.Int64FixedPt = int64(dgoor) - } - } - { - if ps.IntPt != nil { - dgoor := *ps.IntPt - dgoor = dgoor - pbo.IntPt = int64(dgoor) - } - } - { - if ps.BytePt != nil { - dgoor := *ps.BytePt - dgoor = dgoor - pbo.BytePt = uint32(dgoor) - } - } - { - if ps.Uint8Pt != nil { - dgoor := *ps.Uint8Pt - dgoor = dgoor - pbo.Uint8Pt = uint32(dgoor) - } - } - { - if ps.Uint16Pt != nil { - dgoor := *ps.Uint16Pt - dgoor = dgoor - pbo.Uint16Pt = uint32(dgoor) - } - } - { - if ps.Uint32Pt != nil { - dgoor := *ps.Uint32Pt - dgoor = dgoor - pbo.Uint32Pt = uint32(dgoor) - } - } - { - if ps.Uint32FixedPt != nil { - dgoor := *ps.Uint32FixedPt - dgoor = dgoor - pbo.Uint32FixedPt = uint32(dgoor) - } - } - { - if ps.Uint64Pt != nil { - dgoor := *ps.Uint64Pt - dgoor = dgoor - pbo.Uint64Pt = uint64(dgoor) - } - } - { - if ps.Uint64FixedPt != nil { - dgoor := *ps.Uint64FixedPt - dgoor = dgoor - pbo.Uint64FixedPt = uint64(dgoor) - } - } - { - if ps.UintPt != nil { - dgoor := *ps.UintPt - dgoor = dgoor - pbo.UintPt = uint64(dgoor) - } - } - { - if ps.StrPt != nil { - dgoor := *ps.StrPt - dgoor = dgoor - pbo.StrPt = string(dgoor) - } - } - { - if ps.BytesPt != nil { - dgoor := *ps.BytesPt - dgoor = dgoor - goorl := len(dgoor) - if goorl == 0 { - pbo.BytesPt = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := dgoor[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.BytesPt = pbos - } - } - } - { - if ps.TimePt != nil { - dgoor := *ps.TimePt - dgoor = dgoor - pbo.TimePt = timestamppb.New(dgoor) - } - } - { - if ps.DurationPt != nil { - dgoor := *ps.DurationPt - dgoor = dgoor - pbo.DurationPt = durationpb.New(dgoor) - } - } - { - if ps.EmptyPt != nil { - pbom := proto.Message(nil) - pbom, err = ps.EmptyPt.ToPBMessage(cdc) - if err != nil { - return - } - pbo.EmptyPt = pbom.(*testspb.EmptyStruct) - if pbo.EmptyPt == nil { - pbo.EmptyPt = new(testspb.EmptyStruct) - } - } - } - } - msg = pbo - return -} - -func (ps PointersStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.PointersStruct) - msg = pbo - return -} - -func (ps *PointersStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.PointersStruct = msg.(*testspb.PointersStruct) - { - if pbo != nil { - { - (*ps).Int8Pt = new(int8) - *(*ps).Int8Pt = int8(int8(pbo.Int8Pt)) - } - { - (*ps).Int16Pt = new(int16) - *(*ps).Int16Pt = int16(int16(pbo.Int16Pt)) - } - { - (*ps).Int32Pt = new(int32) - *(*ps).Int32Pt = int32(pbo.Int32Pt) - } - { - (*ps).Int32FixedPt = new(int32) - *(*ps).Int32FixedPt = int32(pbo.Int32FixedPt) - } - { - (*ps).Int64Pt = new(int64) - *(*ps).Int64Pt = int64(pbo.Int64Pt) - } - { - (*ps).Int64FixedPt = new(int64) - *(*ps).Int64FixedPt = int64(pbo.Int64FixedPt) - } - { - (*ps).IntPt = new(int) - *(*ps).IntPt = int(int(pbo.IntPt)) - } - { - (*ps).BytePt = new(uint8) - *(*ps).BytePt = uint8(uint8(pbo.BytePt)) - } - { - (*ps).Uint8Pt = new(uint8) - *(*ps).Uint8Pt = uint8(uint8(pbo.Uint8Pt)) - } - { - (*ps).Uint16Pt = new(uint16) - *(*ps).Uint16Pt = uint16(uint16(pbo.Uint16Pt)) - } - { - (*ps).Uint32Pt = new(uint32) - *(*ps).Uint32Pt = uint32(pbo.Uint32Pt) - } - { - (*ps).Uint32FixedPt = new(uint32) - *(*ps).Uint32FixedPt = uint32(pbo.Uint32FixedPt) - } - { - (*ps).Uint64Pt = new(uint64) - *(*ps).Uint64Pt = uint64(pbo.Uint64Pt) - } - { - (*ps).Uint64FixedPt = new(uint64) - *(*ps).Uint64FixedPt = uint64(pbo.Uint64FixedPt) - } - { - (*ps).UintPt = new(uint) - *(*ps).UintPt = uint(uint(pbo.UintPt)) - } - { - (*ps).StrPt = new(string) - *(*ps).StrPt = string(pbo.StrPt) - } - { - (*ps).BytesPt = new([]uint8) - var pbol int = 0 - if pbo.BytesPt != nil { - pbol = len(pbo.BytesPt) - } - if pbol == 0 { - *(*ps).BytesPt = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.BytesPt[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - *(*ps).BytesPt = goors - } - } - { - (*ps).TimePt = new(time.Time) - *(*ps).TimePt = pbo.TimePt.AsTime() - } - { - (*ps).DurationPt = new(time.Duration) - *(*ps).DurationPt = pbo.DurationPt.AsDuration() - } - { - if pbo.EmptyPt != nil { - (*ps).EmptyPt = new(EmptyStruct) - err = (*ps).EmptyPt.FromPBMessage(cdc, pbo.EmptyPt) - if err != nil { - return - } - } - } - } - } - return -} - -func (ps PointersStruct) GetTypeURL() (typeURL string) { - return "/tests.PointersStruct" -} - -func IsPointersStructReprEmpty(goor PointersStruct) (empty bool) { - { - empty = true - { - if goor.Int8Pt != nil { - dgoor := *goor.Int8Pt - dgoor = dgoor - if dgoor != int8(0) { - return false - } - } - } - { - if goor.Int16Pt != nil { - dgoor := *goor.Int16Pt - dgoor = dgoor - if dgoor != int16(0) { - return false - } - } - } - { - if goor.Int32Pt != nil { - dgoor := *goor.Int32Pt - dgoor = dgoor - if dgoor != int32(0) { - return false - } - } - } - { - if goor.Int32FixedPt != nil { - dgoor := *goor.Int32FixedPt - dgoor = dgoor - if dgoor != int32(0) { - return false - } - } - } - { - if goor.Int64Pt != nil { - dgoor := *goor.Int64Pt - dgoor = dgoor - if dgoor != int64(0) { - return false - } - } - } - { - if goor.Int64FixedPt != nil { - dgoor := *goor.Int64FixedPt - dgoor = dgoor - if dgoor != int64(0) { - return false - } - } - } - { - if goor.IntPt != nil { - dgoor := *goor.IntPt - dgoor = dgoor - if dgoor != int(0) { - return false - } - } - } - { - if goor.BytePt != nil { - dgoor := *goor.BytePt - dgoor = dgoor - if dgoor != uint8(0) { - return false - } - } - } - { - if goor.Uint8Pt != nil { - dgoor := *goor.Uint8Pt - dgoor = dgoor - if dgoor != uint8(0) { - return false - } - } - } - { - if goor.Uint16Pt != nil { - dgoor := *goor.Uint16Pt - dgoor = dgoor - if dgoor != uint16(0) { - return false - } - } - } - { - if goor.Uint32Pt != nil { - dgoor := *goor.Uint32Pt - dgoor = dgoor - if dgoor != uint32(0) { - return false - } - } - } - { - if goor.Uint32FixedPt != nil { - dgoor := *goor.Uint32FixedPt - dgoor = dgoor - if dgoor != uint32(0) { - return false - } - } - } - { - if goor.Uint64Pt != nil { - dgoor := *goor.Uint64Pt - dgoor = dgoor - if dgoor != uint64(0) { - return false - } - } - } - { - if goor.Uint64FixedPt != nil { - dgoor := *goor.Uint64FixedPt - dgoor = dgoor - if dgoor != uint64(0) { - return false - } - } - } - { - if goor.UintPt != nil { - dgoor := *goor.UintPt - dgoor = dgoor - if dgoor != uint(0) { - return false - } - } - } - { - if goor.StrPt != nil { - dgoor := *goor.StrPt - dgoor = dgoor - if dgoor != string("") { - return false - } - } - } - { - if goor.BytesPt != nil { - dgoor := *goor.BytesPt - dgoor = dgoor - if len(dgoor) != 0 { - return false - } - } - } - { - if goor.TimePt != nil { - return false - } - } - { - if goor.DurationPt != nil { - dgoor := *goor.DurationPt - dgoor = dgoor - if dgoor != time.Duration(0) { - return false - } - } - } - { - if goor.EmptyPt != nil { - return false - } - } - } - return -} - -func (pss PointerSlicesStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.PointerSlicesStruct - { - if IsPointerSlicesStructReprEmpty(pss) { - var pbov *testspb.PointerSlicesStruct - msg = pbov - return - } - pbo = new(testspb.PointerSlicesStruct) - { - goorl := len(pss.Int8PtSl) - if goorl == 0 { - pbo.Int8PtSl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Int8PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = int32(dgoor) - } - } - } - } - pbo.Int8PtSl = pbos - } - } - { - goorl := len(pss.Int16PtSl) - if goorl == 0 { - pbo.Int16PtSl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Int16PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = int32(dgoor) - } - } - } - } - pbo.Int16PtSl = pbos - } - } - { - goorl := len(pss.Int32PtSl) - if goorl == 0 { - pbo.Int32PtSl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Int32PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = int32(dgoor) - } - } - } - } - pbo.Int32PtSl = pbos - } - } - { - goorl := len(pss.Int32FixedPtSl) - if goorl == 0 { - pbo.Int32FixedPtSl = nil - } else { - pbos := make([]int32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Int32FixedPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = int32(dgoor) - } - } - } - } - pbo.Int32FixedPtSl = pbos - } - } - { - goorl := len(pss.Int64PtSl) - if goorl == 0 { - pbo.Int64PtSl = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Int64PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = int64(dgoor) - } - } - } - } - pbo.Int64PtSl = pbos - } - } - { - goorl := len(pss.Int64FixedPtSl) - if goorl == 0 { - pbo.Int64FixedPtSl = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Int64FixedPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = int64(dgoor) - } - } - } - } - pbo.Int64FixedPtSl = pbos - } - } - { - goorl := len(pss.IntPtSl) - if goorl == 0 { - pbo.IntPtSl = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.IntPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = int64(dgoor) - } - } - } - } - pbo.IntPtSl = pbos - } - } - { - goorl := len(pss.BytePtSl) - if goorl == 0 { - pbo.BytePtSl = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.BytePtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = byte(dgoor) - } - } - } - } - pbo.BytePtSl = pbos - } - } - { - goorl := len(pss.Uint8PtSl) - if goorl == 0 { - pbo.Uint8PtSl = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Uint8PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = byte(dgoor) - } - } - } - } - pbo.Uint8PtSl = pbos - } - } - { - goorl := len(pss.Uint16PtSl) - if goorl == 0 { - pbo.Uint16PtSl = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Uint16PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = uint32(dgoor) - } - } - } - } - pbo.Uint16PtSl = pbos - } - } - { - goorl := len(pss.Uint32PtSl) - if goorl == 0 { - pbo.Uint32PtSl = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Uint32PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = uint32(dgoor) - } - } - } - } - pbo.Uint32PtSl = pbos - } - } - { - goorl := len(pss.Uint32FixedPtSl) - if goorl == 0 { - pbo.Uint32FixedPtSl = nil - } else { - pbos := make([]uint32, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Uint32FixedPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = uint32(dgoor) - } - } - } - } - pbo.Uint32FixedPtSl = pbos - } - } - { - goorl := len(pss.Uint64PtSl) - if goorl == 0 { - pbo.Uint64PtSl = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Uint64PtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = uint64(dgoor) - } - } - } - } - pbo.Uint64PtSl = pbos - } - } - { - goorl := len(pss.Uint64FixedPtSl) - if goorl == 0 { - pbo.Uint64FixedPtSl = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.Uint64FixedPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = uint64(dgoor) - } - } - } - } - pbo.Uint64FixedPtSl = pbos - } - } - { - goorl := len(pss.UintPtSl) - if goorl == 0 { - pbo.UintPtSl = nil - } else { - pbos := make([]uint64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.UintPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = uint64(dgoor) - } - } - } - } - pbo.UintPtSl = pbos - } - } - { - goorl := len(pss.StrPtSl) - if goorl == 0 { - pbo.StrPtSl = nil - } else { - pbos := make([]string, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.StrPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = string(dgoor) - } - } - } - } - pbo.StrPtSl = pbos - } - } - { - goorl := len(pss.BytesPtSl) - if goorl == 0 { - pbo.BytesPtSl = nil - } else { - pbos := make([][]byte, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.BytesPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - goorl1 := len(dgoor) - if goorl1 == 0 { - pbos[i] = nil - } else { - pbos1 := make([]uint8, goorl1) - for i := 0; i < goorl1; i += 1 { - { - goore := dgoor[i] - { - pbos1[i] = byte(goore) - } - } - } - pbos[i] = pbos1 - } - } - } - } - } - pbo.BytesPtSl = pbos - } - } - { - goorl := len(pss.TimePtSl) - if goorl == 0 { - pbo.TimePtSl = nil - } else { - pbos := make([]*timestamppb.Timestamp, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.TimePtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = timestamppb.New(dgoor) - } - } - } - } - pbo.TimePtSl = pbos - } - } - { - goorl := len(pss.DurationPtSl) - if goorl == 0 { - pbo.DurationPtSl = nil - } else { - pbos := make([]*durationpb.Duration, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.DurationPtSl[i] - { - if goore != nil { - dgoor := *goore - dgoor = dgoor - pbos[i] = durationpb.New(dgoor) - } - } - } - } - pbo.DurationPtSl = pbos - } - } - { - goorl := len(pss.EmptyPtSl) - if goorl == 0 { - pbo.EmptyPtSl = nil - } else { - pbos := make([]*testspb.EmptyStruct, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := pss.EmptyPtSl[i] - { - if goore != nil { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos[i] = pbom.(*testspb.EmptyStruct) - if pbos[i] == nil { - pbos[i] = new(testspb.EmptyStruct) - } - } - } - } - } - pbo.EmptyPtSl = pbos - } - } - } - msg = pbo - return -} - -func (pss PointerSlicesStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.PointerSlicesStruct) - msg = pbo - return -} - -func (pss *PointerSlicesStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.PointerSlicesStruct = msg.(*testspb.PointerSlicesStruct) - { - if pbo != nil { - { - var pbol int = 0 - if pbo.Int8PtSl != nil { - pbol = len(pbo.Int8PtSl) - } - if pbol == 0 { - (*pss).Int8PtSl = nil - } else { - goors := make([]*int8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int8PtSl[i] - { - pboev := pboe - goors[i] = new(int8) - *goors[i] = int8(int8(pboev)) - } - } - } - (*pss).Int8PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Int16PtSl != nil { - pbol = len(pbo.Int16PtSl) - } - if pbol == 0 { - (*pss).Int16PtSl = nil - } else { - goors := make([]*int16, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int16PtSl[i] - { - pboev := pboe - goors[i] = new(int16) - *goors[i] = int16(int16(pboev)) - } - } - } - (*pss).Int16PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Int32PtSl != nil { - pbol = len(pbo.Int32PtSl) - } - if pbol == 0 { - (*pss).Int32PtSl = nil - } else { - goors := make([]*int32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int32PtSl[i] - { - pboev := pboe - goors[i] = new(int32) - *goors[i] = int32(pboev) - } - } - } - (*pss).Int32PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Int32FixedPtSl != nil { - pbol = len(pbo.Int32FixedPtSl) - } - if pbol == 0 { - (*pss).Int32FixedPtSl = nil - } else { - goors := make([]*int32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int32FixedPtSl[i] - { - pboev := pboe - goors[i] = new(int32) - *goors[i] = int32(pboev) - } - } - } - (*pss).Int32FixedPtSl = goors - } - } - { - var pbol int = 0 - if pbo.Int64PtSl != nil { - pbol = len(pbo.Int64PtSl) - } - if pbol == 0 { - (*pss).Int64PtSl = nil - } else { - goors := make([]*int64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int64PtSl[i] - { - pboev := pboe - goors[i] = new(int64) - *goors[i] = int64(pboev) - } - } - } - (*pss).Int64PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Int64FixedPtSl != nil { - pbol = len(pbo.Int64FixedPtSl) - } - if pbol == 0 { - (*pss).Int64FixedPtSl = nil - } else { - goors := make([]*int64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Int64FixedPtSl[i] - { - pboev := pboe - goors[i] = new(int64) - *goors[i] = int64(pboev) - } - } - } - (*pss).Int64FixedPtSl = goors - } - } - { - var pbol int = 0 - if pbo.IntPtSl != nil { - pbol = len(pbo.IntPtSl) - } - if pbol == 0 { - (*pss).IntPtSl = nil - } else { - goors := make([]*int, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.IntPtSl[i] - { - pboev := pboe - goors[i] = new(int) - *goors[i] = int(int(pboev)) - } - } - } - (*pss).IntPtSl = goors - } - } - { - var pbol int = 0 - if pbo.BytePtSl != nil { - pbol = len(pbo.BytePtSl) - } - if pbol == 0 { - (*pss).BytePtSl = nil - } else { - goors := make([]*uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.BytePtSl[i] - { - pboev := pboe - goors[i] = new(uint8) - *goors[i] = uint8(uint8(pboev)) - } - } - } - (*pss).BytePtSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint8PtSl != nil { - pbol = len(pbo.Uint8PtSl) - } - if pbol == 0 { - (*pss).Uint8PtSl = nil - } else { - goors := make([]*uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint8PtSl[i] - { - pboev := pboe - goors[i] = new(uint8) - *goors[i] = uint8(uint8(pboev)) - } - } - } - (*pss).Uint8PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint16PtSl != nil { - pbol = len(pbo.Uint16PtSl) - } - if pbol == 0 { - (*pss).Uint16PtSl = nil - } else { - goors := make([]*uint16, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint16PtSl[i] - { - pboev := pboe - goors[i] = new(uint16) - *goors[i] = uint16(uint16(pboev)) - } - } - } - (*pss).Uint16PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint32PtSl != nil { - pbol = len(pbo.Uint32PtSl) - } - if pbol == 0 { - (*pss).Uint32PtSl = nil - } else { - goors := make([]*uint32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint32PtSl[i] - { - pboev := pboe - goors[i] = new(uint32) - *goors[i] = uint32(pboev) - } - } - } - (*pss).Uint32PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint32FixedPtSl != nil { - pbol = len(pbo.Uint32FixedPtSl) - } - if pbol == 0 { - (*pss).Uint32FixedPtSl = nil - } else { - goors := make([]*uint32, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint32FixedPtSl[i] - { - pboev := pboe - goors[i] = new(uint32) - *goors[i] = uint32(pboev) - } - } - } - (*pss).Uint32FixedPtSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint64PtSl != nil { - pbol = len(pbo.Uint64PtSl) - } - if pbol == 0 { - (*pss).Uint64PtSl = nil - } else { - goors := make([]*uint64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint64PtSl[i] - { - pboev := pboe - goors[i] = new(uint64) - *goors[i] = uint64(pboev) - } - } - } - (*pss).Uint64PtSl = goors - } - } - { - var pbol int = 0 - if pbo.Uint64FixedPtSl != nil { - pbol = len(pbo.Uint64FixedPtSl) - } - if pbol == 0 { - (*pss).Uint64FixedPtSl = nil - } else { - goors := make([]*uint64, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Uint64FixedPtSl[i] - { - pboev := pboe - goors[i] = new(uint64) - *goors[i] = uint64(pboev) - } - } - } - (*pss).Uint64FixedPtSl = goors - } - } - { - var pbol int = 0 - if pbo.UintPtSl != nil { - pbol = len(pbo.UintPtSl) - } - if pbol == 0 { - (*pss).UintPtSl = nil - } else { - goors := make([]*uint, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.UintPtSl[i] - { - pboev := pboe - goors[i] = new(uint) - *goors[i] = uint(uint(pboev)) - } - } - } - (*pss).UintPtSl = goors - } - } - { - var pbol int = 0 - if pbo.StrPtSl != nil { - pbol = len(pbo.StrPtSl) - } - if pbol == 0 { - (*pss).StrPtSl = nil - } else { - goors := make([]*string, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.StrPtSl[i] - { - pboev := pboe - goors[i] = new(string) - *goors[i] = string(pboev) - } - } - } - (*pss).StrPtSl = goors - } - } - { - var pbol int = 0 - if pbo.BytesPtSl != nil { - pbol = len(pbo.BytesPtSl) - } - if pbol == 0 { - (*pss).BytesPtSl = nil - } else { - goors := make([]*[]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.BytesPtSl[i] - { - pboev := pboe - goors[i] = new([]uint8) - var pbol1 int = 0 - if pboev != nil { - pbol1 = len(pboev) - } - if pbol1 == 0 { - *goors[i] = nil - } else { - goors1 := make([]uint8, pbol1) - for i := 0; i < pbol1; i += 1 { - { - pboe := pboev[i] - { - pboev := pboe - goors1[i] = uint8(uint8(pboev)) - } - } - } - *goors[i] = goors1 - } - } - } - } - (*pss).BytesPtSl = goors - } - } - { - var pbol int = 0 - if pbo.TimePtSl != nil { - pbol = len(pbo.TimePtSl) - } - if pbol == 0 { - (*pss).TimePtSl = nil - } else { - goors := make([]*time.Time, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.TimePtSl[i] - { - pboev := pboe - goors[i] = new(time.Time) - *goors[i] = pboev.AsTime() - } - } - } - (*pss).TimePtSl = goors - } - } - { - var pbol int = 0 - if pbo.DurationPtSl != nil { - pbol = len(pbo.DurationPtSl) - } - if pbol == 0 { - (*pss).DurationPtSl = nil - } else { - goors := make([]*time.Duration, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.DurationPtSl[i] - { - pboev := pboe - goors[i] = new(time.Duration) - *goors[i] = pboev.AsDuration() - } - } - } - (*pss).DurationPtSl = goors - } - } - { - var pbol int = 0 - if pbo.EmptyPtSl != nil { - pbol = len(pbo.EmptyPtSl) - } - if pbol == 0 { - (*pss).EmptyPtSl = nil - } else { - goors := make([]*EmptyStruct, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.EmptyPtSl[i] - { - pboev := pboe - if pboev != nil { - goors[i] = new(EmptyStruct) - err = goors[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - (*pss).EmptyPtSl = goors - } - } - } - } - return -} - -func (pss PointerSlicesStruct) GetTypeURL() (typeURL string) { - return "/tests.PointerSlicesStruct" -} - -func IsPointerSlicesStructReprEmpty(goor PointerSlicesStruct) (empty bool) { - { - empty = true - { - if len(goor.Int8PtSl) != 0 { - return false - } - } - { - if len(goor.Int16PtSl) != 0 { - return false - } - } - { - if len(goor.Int32PtSl) != 0 { - return false - } - } - { - if len(goor.Int32FixedPtSl) != 0 { - return false - } - } - { - if len(goor.Int64PtSl) != 0 { - return false - } - } - { - if len(goor.Int64FixedPtSl) != 0 { - return false - } - } - { - if len(goor.IntPtSl) != 0 { - return false - } - } - { - if len(goor.BytePtSl) != 0 { - return false - } - } - { - if len(goor.Uint8PtSl) != 0 { - return false - } - } - { - if len(goor.Uint16PtSl) != 0 { - return false - } - } - { - if len(goor.Uint32PtSl) != 0 { - return false - } - } - { - if len(goor.Uint32FixedPtSl) != 0 { - return false - } - } - { - if len(goor.Uint64PtSl) != 0 { - return false - } - } - { - if len(goor.Uint64FixedPtSl) != 0 { - return false - } - } - { - if len(goor.UintPtSl) != 0 { - return false - } - } - { - if len(goor.StrPtSl) != 0 { - return false - } - } - { - if len(goor.BytesPtSl) != 0 { - return false - } - } - { - if len(goor.TimePtSl) != 0 { - return false - } - } - { - if len(goor.DurationPtSl) != 0 { - return false - } - } - { - if len(goor.EmptyPtSl) != 0 { - return false - } - } - } - return -} - -func (cs ComplexSt) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ComplexSt - { - if IsComplexStReprEmpty(cs) { - var pbov *testspb.ComplexSt - msg = pbov - return - } - pbo = new(testspb.ComplexSt) - { - pbom := proto.Message(nil) - pbom, err = cs.PrField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PrField = pbom.(*testspb.PrimitivesStruct) - } - { - pbom := proto.Message(nil) - pbom, err = cs.ArField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.ArField = pbom.(*testspb.ArraysStruct) - } - { - pbom := proto.Message(nil) - pbom, err = cs.SlField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.SlField = pbom.(*testspb.SlicesStruct) - } - { - pbom := proto.Message(nil) - pbom, err = cs.PtField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PtField = pbom.(*testspb.PointersStruct) - } - } - msg = pbo - return -} - -func (cs ComplexSt) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ComplexSt) - msg = pbo - return -} - -func (cs *ComplexSt) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ComplexSt = msg.(*testspb.ComplexSt) - { - if pbo != nil { - { - if pbo.PrField != nil { - err = (*cs).PrField.FromPBMessage(cdc, pbo.PrField) - if err != nil { - return - } - } - } - { - if pbo.ArField != nil { - err = (*cs).ArField.FromPBMessage(cdc, pbo.ArField) - if err != nil { - return - } - } - } - { - if pbo.SlField != nil { - err = (*cs).SlField.FromPBMessage(cdc, pbo.SlField) - if err != nil { - return - } - } - } - { - if pbo.PtField != nil { - err = (*cs).PtField.FromPBMessage(cdc, pbo.PtField) - if err != nil { - return - } - } - } - } - } - return -} - -func (cs ComplexSt) GetTypeURL() (typeURL string) { - return "/tests.ComplexSt" -} - -func IsComplexStReprEmpty(goor ComplexSt) (empty bool) { - { - empty = true - { - e := IsPrimitivesStructReprEmpty(goor.PrField) - if e == false { - return false - } - } - { - e := IsArraysStructReprEmpty(goor.ArField) - if e == false { - return false - } - } - { - e := IsSlicesStructReprEmpty(goor.SlField) - if e == false { - return false - } - } - { - e := IsPointersStructReprEmpty(goor.PtField) - if e == false { - return false - } - } - } - return -} - -func (es EmbeddedSt1) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.EmbeddedSt1 - { - if IsEmbeddedSt1ReprEmpty(es) { - var pbov *testspb.EmbeddedSt1 - msg = pbov - return - } - pbo = new(testspb.EmbeddedSt1) - { - pbom := proto.Message(nil) - pbom, err = es.PrimitivesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PrimitivesStruct = pbom.(*testspb.PrimitivesStruct) - } - } - msg = pbo - return -} - -func (es EmbeddedSt1) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.EmbeddedSt1) - msg = pbo - return -} - -func (es *EmbeddedSt1) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.EmbeddedSt1 = msg.(*testspb.EmbeddedSt1) - { - if pbo != nil { - { - if pbo.PrimitivesStruct != nil { - err = (*es).PrimitivesStruct.FromPBMessage(cdc, pbo.PrimitivesStruct) - if err != nil { - return - } - } - } - } - } - return -} - -func (es EmbeddedSt1) GetTypeURL() (typeURL string) { - return "/tests.EmbeddedSt1" -} - -func IsEmbeddedSt1ReprEmpty(goor EmbeddedSt1) (empty bool) { - { - empty = true - { - e := IsPrimitivesStructReprEmpty(goor.PrimitivesStruct) - if e == false { - return false - } - } - } - return -} - -func (es EmbeddedSt2) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.EmbeddedSt2 - { - if IsEmbeddedSt2ReprEmpty(es) { - var pbov *testspb.EmbeddedSt2 - msg = pbov - return - } - pbo = new(testspb.EmbeddedSt2) - { - pbom := proto.Message(nil) - pbom, err = es.PrimitivesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PrimitivesStruct = pbom.(*testspb.PrimitivesStruct) - } - { - pbom := proto.Message(nil) - pbom, err = es.ArraysStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.ArraysStruct = pbom.(*testspb.ArraysStruct) - } - { - pbom := proto.Message(nil) - pbom, err = es.SlicesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.SlicesStruct = pbom.(*testspb.SlicesStruct) - } - { - pbom := proto.Message(nil) - pbom, err = es.PointersStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PointersStruct = pbom.(*testspb.PointersStruct) - } - } - msg = pbo - return -} - -func (es EmbeddedSt2) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.EmbeddedSt2) - msg = pbo - return -} - -func (es *EmbeddedSt2) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.EmbeddedSt2 = msg.(*testspb.EmbeddedSt2) - { - if pbo != nil { - { - if pbo.PrimitivesStruct != nil { - err = (*es).PrimitivesStruct.FromPBMessage(cdc, pbo.PrimitivesStruct) - if err != nil { - return - } - } - } - { - if pbo.ArraysStruct != nil { - err = (*es).ArraysStruct.FromPBMessage(cdc, pbo.ArraysStruct) - if err != nil { - return - } - } - } - { - if pbo.SlicesStruct != nil { - err = (*es).SlicesStruct.FromPBMessage(cdc, pbo.SlicesStruct) - if err != nil { - return - } - } - } - { - if pbo.PointersStruct != nil { - err = (*es).PointersStruct.FromPBMessage(cdc, pbo.PointersStruct) - if err != nil { - return - } - } - } - } - } - return -} - -func (es EmbeddedSt2) GetTypeURL() (typeURL string) { - return "/tests.EmbeddedSt2" -} - -func IsEmbeddedSt2ReprEmpty(goor EmbeddedSt2) (empty bool) { - { - empty = true - { - e := IsPrimitivesStructReprEmpty(goor.PrimitivesStruct) - if e == false { - return false - } - } - { - e := IsArraysStructReprEmpty(goor.ArraysStruct) - if e == false { - return false - } - } - { - e := IsSlicesStructReprEmpty(goor.SlicesStruct) - if e == false { - return false - } - } - { - e := IsPointersStructReprEmpty(goor.PointersStruct) - if e == false { - return false - } - } - } - return -} - -func (es EmbeddedSt3) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.EmbeddedSt3 - { - if IsEmbeddedSt3ReprEmpty(es) { - var pbov *testspb.EmbeddedSt3 - msg = pbov - return - } - pbo = new(testspb.EmbeddedSt3) - { - if es.PrimitivesStruct != nil { - pbom := proto.Message(nil) - pbom, err = es.PrimitivesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PrimitivesStruct = pbom.(*testspb.PrimitivesStruct) - if pbo.PrimitivesStruct == nil { - pbo.PrimitivesStruct = new(testspb.PrimitivesStruct) - } - } - } - { - if es.ArraysStruct != nil { - pbom := proto.Message(nil) - pbom, err = es.ArraysStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.ArraysStruct = pbom.(*testspb.ArraysStruct) - if pbo.ArraysStruct == nil { - pbo.ArraysStruct = new(testspb.ArraysStruct) - } - } - } - { - if es.SlicesStruct != nil { - pbom := proto.Message(nil) - pbom, err = es.SlicesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.SlicesStruct = pbom.(*testspb.SlicesStruct) - if pbo.SlicesStruct == nil { - pbo.SlicesStruct = new(testspb.SlicesStruct) - } - } - } - { - if es.PointersStruct != nil { - pbom := proto.Message(nil) - pbom, err = es.PointersStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PointersStruct = pbom.(*testspb.PointersStruct) - if pbo.PointersStruct == nil { - pbo.PointersStruct = new(testspb.PointersStruct) - } - } - } - { - if es.EmptyStruct != nil { - pbom := proto.Message(nil) - pbom, err = es.EmptyStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.EmptyStruct = pbom.(*testspb.EmptyStruct) - if pbo.EmptyStruct == nil { - pbo.EmptyStruct = new(testspb.EmptyStruct) - } - } - } - } - msg = pbo - return -} - -func (es EmbeddedSt3) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.EmbeddedSt3) - msg = pbo - return -} - -func (es *EmbeddedSt3) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.EmbeddedSt3 = msg.(*testspb.EmbeddedSt3) - { - if pbo != nil { - { - if pbo.PrimitivesStruct != nil { - (*es).PrimitivesStruct = new(PrimitivesStruct) - err = (*es).PrimitivesStruct.FromPBMessage(cdc, pbo.PrimitivesStruct) - if err != nil { - return - } - } - } - { - if pbo.ArraysStruct != nil { - (*es).ArraysStruct = new(ArraysStruct) - err = (*es).ArraysStruct.FromPBMessage(cdc, pbo.ArraysStruct) - if err != nil { - return - } - } - } - { - if pbo.SlicesStruct != nil { - (*es).SlicesStruct = new(SlicesStruct) - err = (*es).SlicesStruct.FromPBMessage(cdc, pbo.SlicesStruct) - if err != nil { - return - } - } - } - { - if pbo.PointersStruct != nil { - (*es).PointersStruct = new(PointersStruct) - err = (*es).PointersStruct.FromPBMessage(cdc, pbo.PointersStruct) - if err != nil { - return - } - } - } - { - if pbo.EmptyStruct != nil { - (*es).EmptyStruct = new(EmptyStruct) - err = (*es).EmptyStruct.FromPBMessage(cdc, pbo.EmptyStruct) - if err != nil { - return - } - } - } - } - } - return -} - -func (es EmbeddedSt3) GetTypeURL() (typeURL string) { - return "/tests.EmbeddedSt3" -} - -func IsEmbeddedSt3ReprEmpty(goor EmbeddedSt3) (empty bool) { - { - empty = true - { - if goor.PrimitivesStruct != nil { - return false - } - } - { - if goor.ArraysStruct != nil { - return false - } - } - { - if goor.SlicesStruct != nil { - return false - } - } - { - if goor.PointersStruct != nil { - return false - } - } - { - if goor.EmptyStruct != nil { - return false - } - } - } - return -} - -func (es EmbeddedSt4) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.EmbeddedSt4 - { - if IsEmbeddedSt4ReprEmpty(es) { - var pbov *testspb.EmbeddedSt4 - msg = pbov - return - } - pbo = new(testspb.EmbeddedSt4) - { - pbo.Foo1 = int64(es.Foo1) - } - { - pbom := proto.Message(nil) - pbom, err = es.PrimitivesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PrimitivesStruct = pbom.(*testspb.PrimitivesStruct) - } - { - pbo.Foo2 = string(es.Foo2) - } - { - pbom := proto.Message(nil) - pbom, err = es.ArraysStructField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.ArraysStructField = pbom.(*testspb.ArraysStruct) - } - { - goorl := len(es.Foo3) - if goorl == 0 { - pbo.Foo3 = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := es.Foo3[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.Foo3 = pbos - } - } - { - pbom := proto.Message(nil) - pbom, err = es.SlicesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.SlicesStruct = pbom.(*testspb.SlicesStruct) - } - { - pbo.Foo4 = bool(es.Foo4) - } - { - pbom := proto.Message(nil) - pbom, err = es.PointersStructField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PointersStructField = pbom.(*testspb.PointersStruct) - } - { - pbo.Foo5 = uint64(es.Foo5) - } - } - msg = pbo - return -} - -func (es EmbeddedSt4) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.EmbeddedSt4) - msg = pbo - return -} - -func (es *EmbeddedSt4) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.EmbeddedSt4 = msg.(*testspb.EmbeddedSt4) - { - if pbo != nil { - { - (*es).Foo1 = int(int(pbo.Foo1)) - } - { - if pbo.PrimitivesStruct != nil { - err = (*es).PrimitivesStruct.FromPBMessage(cdc, pbo.PrimitivesStruct) - if err != nil { - return - } - } - } - { - (*es).Foo2 = string(pbo.Foo2) - } - { - if pbo.ArraysStructField != nil { - err = (*es).ArraysStructField.FromPBMessage(cdc, pbo.ArraysStructField) - if err != nil { - return - } - } - } - { - var pbol int = 0 - if pbo.Foo3 != nil { - pbol = len(pbo.Foo3) - } - if pbol == 0 { - (*es).Foo3 = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Foo3[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*es).Foo3 = goors - } - } - { - if pbo.SlicesStruct != nil { - err = (*es).SlicesStruct.FromPBMessage(cdc, pbo.SlicesStruct) - if err != nil { - return - } - } - } - { - (*es).Foo4 = bool(pbo.Foo4) - } - { - if pbo.PointersStructField != nil { - err = (*es).PointersStructField.FromPBMessage(cdc, pbo.PointersStructField) - if err != nil { - return - } - } - } - { - (*es).Foo5 = uint(uint(pbo.Foo5)) - } - } - } - return -} - -func (es EmbeddedSt4) GetTypeURL() (typeURL string) { - return "/tests.EmbeddedSt4" -} - -func IsEmbeddedSt4ReprEmpty(goor EmbeddedSt4) (empty bool) { - { - empty = true - { - if goor.Foo1 != int(0) { - return false - } - } - { - e := IsPrimitivesStructReprEmpty(goor.PrimitivesStruct) - if e == false { - return false - } - } - { - if goor.Foo2 != string("") { - return false - } - } - { - e := IsArraysStructReprEmpty(goor.ArraysStructField) - if e == false { - return false - } - } - { - if len(goor.Foo3) != 0 { - return false - } - } - { - e := IsSlicesStructReprEmpty(goor.SlicesStruct) - if e == false { - return false - } - } - { - if goor.Foo4 != bool(false) { - return false - } - } - { - e := IsPointersStructReprEmpty(goor.PointersStructField) - if e == false { - return false - } - } - { - if goor.Foo5 != uint(0) { - return false - } - } - } - return -} - -func (es EmbeddedSt5) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.EmbeddedSt5NameOverride - { - if IsEmbeddedSt5NameOverrideReprEmpty(es) { - var pbov *testspb.EmbeddedSt5NameOverride - msg = pbov - return - } - pbo = new(testspb.EmbeddedSt5NameOverride) - { - pbo.Foo1 = int64(es.Foo1) - } - { - if es.PrimitivesStruct != nil { - pbom := proto.Message(nil) - pbom, err = es.PrimitivesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PrimitivesStruct = pbom.(*testspb.PrimitivesStruct) - if pbo.PrimitivesStruct == nil { - pbo.PrimitivesStruct = new(testspb.PrimitivesStruct) - } - } - } - { - pbo.Foo2 = string(es.Foo2) - } - { - if es.ArraysStructField != nil { - pbom := proto.Message(nil) - pbom, err = es.ArraysStructField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.ArraysStructField = pbom.(*testspb.ArraysStruct) - if pbo.ArraysStructField == nil { - pbo.ArraysStructField = new(testspb.ArraysStruct) - } - } - } - { - goorl := len(es.Foo3) - if goorl == 0 { - pbo.Foo3 = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := es.Foo3[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.Foo3 = pbos - } - } - { - if es.SlicesStruct != nil { - pbom := proto.Message(nil) - pbom, err = es.SlicesStruct.ToPBMessage(cdc) - if err != nil { - return - } - pbo.SlicesStruct = pbom.(*testspb.SlicesStruct) - if pbo.SlicesStruct == nil { - pbo.SlicesStruct = new(testspb.SlicesStruct) - } - } - } - { - pbo.Foo4 = bool(es.Foo4) - } - { - if es.PointersStructField != nil { - pbom := proto.Message(nil) - pbom, err = es.PointersStructField.ToPBMessage(cdc) - if err != nil { - return - } - pbo.PointersStructField = pbom.(*testspb.PointersStruct) - if pbo.PointersStructField == nil { - pbo.PointersStructField = new(testspb.PointersStruct) - } - } - } - { - pbo.Foo5 = uint64(es.Foo5) - } - } - msg = pbo - return -} - -func (es EmbeddedSt5) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.EmbeddedSt5NameOverride) - msg = pbo - return -} - -func (es *EmbeddedSt5) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.EmbeddedSt5NameOverride = msg.(*testspb.EmbeddedSt5NameOverride) - { - if pbo != nil { - { - (*es).Foo1 = int(int(pbo.Foo1)) - } - { - if pbo.PrimitivesStruct != nil { - (*es).PrimitivesStruct = new(PrimitivesStruct) - err = (*es).PrimitivesStruct.FromPBMessage(cdc, pbo.PrimitivesStruct) - if err != nil { - return - } - } - } - { - (*es).Foo2 = string(pbo.Foo2) - } - { - if pbo.ArraysStructField != nil { - (*es).ArraysStructField = new(ArraysStruct) - err = (*es).ArraysStructField.FromPBMessage(cdc, pbo.ArraysStructField) - if err != nil { - return - } - } - } - { - var pbol int = 0 - if pbo.Foo3 != nil { - pbol = len(pbo.Foo3) - } - if pbol == 0 { - (*es).Foo3 = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Foo3[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*es).Foo3 = goors - } - } - { - if pbo.SlicesStruct != nil { - (*es).SlicesStruct = new(SlicesStruct) - err = (*es).SlicesStruct.FromPBMessage(cdc, pbo.SlicesStruct) - if err != nil { - return - } - } - } - { - (*es).Foo4 = bool(pbo.Foo4) - } - { - if pbo.PointersStructField != nil { - (*es).PointersStructField = new(PointersStruct) - err = (*es).PointersStructField.FromPBMessage(cdc, pbo.PointersStructField) - if err != nil { - return - } - } - } - { - (*es).Foo5 = uint(uint(pbo.Foo5)) - } - } - } - return -} - -func (es EmbeddedSt5) GetTypeURL() (typeURL string) { - return "/tests.EmbeddedSt5NameOverride" -} - -func IsEmbeddedSt5NameOverrideReprEmpty(goor EmbeddedSt5) (empty bool) { - { - empty = true - { - if goor.Foo1 != int(0) { - return false - } - } - { - if goor.PrimitivesStruct != nil { - return false - } - } - { - if goor.Foo2 != string("") { - return false - } - } - { - if goor.ArraysStructField != nil { - return false - } - } - { - if len(goor.Foo3) != 0 { - return false - } - } - { - if goor.SlicesStruct != nil { - return false - } - } - { - if goor.Foo4 != bool(false) { - return false - } - } - { - if goor.PointersStructField != nil { - return false - } - } - { - if goor.Foo5 != uint(0) { - return false - } - } - } - return -} - -func (ams AminoMarshalerStruct1) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.AminoMarshalerStruct1 - { - goor, err1 := ams.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsAminoMarshalerStruct1ReprEmpty(goor) { - var pbov *testspb.AminoMarshalerStruct1 - msg = pbov - return - } - pbo = new(testspb.AminoMarshalerStruct1) - { - pbo.C = int64(goor.C) - } - { - pbo.D = int64(goor.D) - } - } - msg = pbo - return -} - -func (ams AminoMarshalerStruct1) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.AminoMarshalerStruct1) - msg = pbo - return -} - -func (ams *AminoMarshalerStruct1) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.AminoMarshalerStruct1 = msg.(*testspb.AminoMarshalerStruct1) - { - if pbo != nil { - var goor ReprStruct1 - { - goor.C = int64(pbo.C) - } - { - goor.D = int64(pbo.D) - } - err = ams.UnmarshalAmino(goor) - if err != nil { - return - } - } - } - return -} - -func (ams AminoMarshalerStruct1) GetTypeURL() (typeURL string) { - return "/tests.AminoMarshalerStruct1" -} - -func IsAminoMarshalerStruct1ReprEmpty(goor ReprStruct1) (empty bool) { - { - empty = true - { - if goor.C != int64(0) { - return false - } - } - { - if goor.D != int64(0) { - return false - } - } - } - return -} - -func (rs ReprStruct1) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ReprStruct1 - { - if IsReprStruct1ReprEmpty(rs) { - var pbov *testspb.ReprStruct1 - msg = pbov - return - } - pbo = new(testspb.ReprStruct1) - { - pbo.C = int64(rs.C) - } - { - pbo.D = int64(rs.D) - } - } - msg = pbo - return -} - -func (rs ReprStruct1) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ReprStruct1) - msg = pbo - return -} - -func (rs *ReprStruct1) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ReprStruct1 = msg.(*testspb.ReprStruct1) - { - if pbo != nil { - { - (*rs).C = int64(pbo.C) - } - { - (*rs).D = int64(pbo.D) - } - } - } - return -} - -func (rs ReprStruct1) GetTypeURL() (typeURL string) { - return "/tests.ReprStruct1" -} - -func IsReprStruct1ReprEmpty(goor ReprStruct1) (empty bool) { - { - empty = true - { - if goor.C != int64(0) { - return false - } - } - { - if goor.D != int64(0) { - return false - } - } - } - return -} - -func (ams AminoMarshalerStruct2) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.AminoMarshalerStruct2 - { - goor, err1 := ams.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsAminoMarshalerStruct2ReprEmpty(goor) { - var pbov *testspb.AminoMarshalerStruct2 - msg = pbov - return - } - goorl := len(goor) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]*testspb.ReprElem2, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := goor[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos[i] = pbom.(*testspb.ReprElem2) - } - } - } - pbo = &testspb.AminoMarshalerStruct2{Value: pbos} - } - } - msg = pbo - return -} - -func (ams AminoMarshalerStruct2) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.AminoMarshalerStruct2) - msg = pbo - return -} - -func (ams *AminoMarshalerStruct2) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.AminoMarshalerStruct2 = msg.(*testspb.AminoMarshalerStruct2) - { - var goor []ReprElem2 - var pbol int = 0 - if pbo != nil { - pbol = len(pbo.Value) - } - if pbol == 0 { - goor = nil - } else { - goors := make([]ReprElem2, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - if pboev != nil { - err = goors[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - goor = goors - } - err = ams.UnmarshalAmino(goor) - if err != nil { - return - } - } - return -} - -func (ams AminoMarshalerStruct2) GetTypeURL() (typeURL string) { - return "/tests.AminoMarshalerStruct2" -} - -func IsAminoMarshalerStruct2ReprEmpty(goor []ReprElem2) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (re ReprElem2) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ReprElem2 - { - if IsReprElem2ReprEmpty(re) { - var pbov *testspb.ReprElem2 - msg = pbov - return - } - pbo = new(testspb.ReprElem2) - { - pbo.Key = string(re.Key) - } - { - if re.Value != nil { - typeUrl := cdc.GetTypeURL(re.Value) - bz := []byte(nil) - bz, err = cdc.Marshal(re.Value) - if err != nil { - return - } - pbo.Value = &anypb.Any{TypeUrl: typeUrl, Value: bz} - } - } - } - msg = pbo - return -} - -func (re ReprElem2) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ReprElem2) - msg = pbo - return -} - -func (re *ReprElem2) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ReprElem2 = msg.(*testspb.ReprElem2) - { - if pbo != nil { - { - (*re).Key = string(pbo.Key) - } - { - typeUrl := pbo.Value.TypeUrl - bz := pbo.Value.Value - goorp := &(*re).Value - err = cdc.UnmarshalAny2(typeUrl, bz, goorp) - if err != nil { - return - } - } - } - } - return -} - -func (re ReprElem2) GetTypeURL() (typeURL string) { - return "/tests.ReprElem2" -} - -func IsReprElem2ReprEmpty(goor ReprElem2) (empty bool) { - { - empty = true - { - if goor.Key != string("") { - return false - } - } - { - if goor.Value != nil { - return false - } - } - } - return -} - -func (ams AminoMarshalerStruct3) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.AminoMarshalerStruct3 - { - goor, err1 := ams.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsAminoMarshalerStruct3ReprEmpty(goor) { - var pbov *testspb.AminoMarshalerStruct3 - msg = pbov - return - } - pbo = &testspb.AminoMarshalerStruct3{Value: int32(goor)} - } - msg = pbo - return -} - -func (ams AminoMarshalerStruct3) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.AminoMarshalerStruct3) - msg = pbo - return -} - -func (ams *AminoMarshalerStruct3) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.AminoMarshalerStruct3 = msg.(*testspb.AminoMarshalerStruct3) - { - var goor int32 - goor = int32(pbo.Value) - err = ams.UnmarshalAmino(goor) - if err != nil { - return - } - } - return -} - -func (ams AminoMarshalerStruct3) GetTypeURL() (typeURL string) { - return "/tests.AminoMarshalerStruct3" -} - -func IsAminoMarshalerStruct3ReprEmpty(goor int32) (empty bool) { - { - empty = true - if goor != int32(0) { - return false - } - } - return -} - -func (am AminoMarshalerInt4) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.AminoMarshalerInt4 - { - goor, err1 := am.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsAminoMarshalerInt4ReprEmpty(goor) { - var pbov *testspb.AminoMarshalerInt4 - msg = pbov - return - } - pbo = new(testspb.AminoMarshalerInt4) - { - pbo.A = int32(goor.A) - } - } - msg = pbo - return -} - -func (am AminoMarshalerInt4) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.AminoMarshalerInt4) - msg = pbo - return -} - -func (am *AminoMarshalerInt4) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.AminoMarshalerInt4 = msg.(*testspb.AminoMarshalerInt4) - { - if pbo != nil { - var goor ReprStruct4 - { - goor.A = int32(pbo.A) - } - err = am.UnmarshalAmino(goor) - if err != nil { - return - } - } - } - return -} - -func (am AminoMarshalerInt4) GetTypeURL() (typeURL string) { - return "/tests.AminoMarshalerInt4" -} - -func IsAminoMarshalerInt4ReprEmpty(goor ReprStruct4) (empty bool) { - { - empty = true - { - if goor.A != int32(0) { - return false - } - } - } - return -} - -func (am AminoMarshalerInt5) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.AminoMarshalerInt5 - { - goor, err1 := am.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsAminoMarshalerInt5ReprEmpty(goor) { - var pbov *testspb.AminoMarshalerInt5 - msg = pbov - return - } - pbo = &testspb.AminoMarshalerInt5{Value: string(goor)} - } - msg = pbo - return -} - -func (am AminoMarshalerInt5) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.AminoMarshalerInt5) - msg = pbo - return -} - -func (am *AminoMarshalerInt5) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.AminoMarshalerInt5 = msg.(*testspb.AminoMarshalerInt5) - { - var goor string - goor = string(pbo.Value) - err = am.UnmarshalAmino(goor) - if err != nil { - return - } - } - return -} - -func (am AminoMarshalerInt5) GetTypeURL() (typeURL string) { - return "/tests.AminoMarshalerInt5" -} - -func IsAminoMarshalerInt5ReprEmpty(goor string) (empty bool) { - { - empty = true - if goor != string("") { - return false - } - } - return -} - -func (ams AminoMarshalerStruct6) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.AminoMarshalerStruct6 - { - goor, err1 := ams.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsAminoMarshalerStruct6ReprEmpty(goor) { - var pbov *testspb.AminoMarshalerStruct6 - msg = pbov - return - } - goorl := len(goor) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]*testspb.AminoMarshalerStruct1, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := goor[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos[i] = pbom.(*testspb.AminoMarshalerStruct1) - } - } - } - pbo = &testspb.AminoMarshalerStruct6{Value: pbos} - } - } - msg = pbo - return -} - -func (ams AminoMarshalerStruct6) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.AminoMarshalerStruct6) - msg = pbo - return -} - -func (ams *AminoMarshalerStruct6) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.AminoMarshalerStruct6 = msg.(*testspb.AminoMarshalerStruct6) - { - var goor []AminoMarshalerStruct1 - var pbol int = 0 - if pbo != nil { - pbol = len(pbo.Value) - } - if pbol == 0 { - goor = nil - } else { - goors := make([]AminoMarshalerStruct1, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - if pboev != nil { - err = goors[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - goor = goors - } - err = ams.UnmarshalAmino(goor) - if err != nil { - return - } - } - return -} - -func (ams AminoMarshalerStruct6) GetTypeURL() (typeURL string) { - return "/tests.AminoMarshalerStruct6" -} - -func IsAminoMarshalerStruct6ReprEmpty(goor []AminoMarshalerStruct1) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (ams AminoMarshalerStruct7) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.AminoMarshalerStruct7 - { - goor, err1 := ams.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsAminoMarshalerStruct7ReprEmpty(goor) { - var pbov *testspb.AminoMarshalerStruct7 - msg = pbov - return - } - goorl := len(goor) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := goor[i] - { - goor1, err2 := goore.MarshalAmino() - if err2 != nil { - return nil, err2 - } - if !IsReprElem7ReprEmpty(goor1) { - pbos[i] = byte(goor1) - } - } - } - } - pbo = &testspb.AminoMarshalerStruct7{Value: pbos} - } - } - msg = pbo - return -} - -func (ams AminoMarshalerStruct7) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.AminoMarshalerStruct7) - msg = pbo - return -} - -func (ams *AminoMarshalerStruct7) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.AminoMarshalerStruct7 = msg.(*testspb.AminoMarshalerStruct7) - { - var goor []ReprElem7 - var pbol int = 0 - if pbo != nil { - pbol = len(pbo.Value) - } - if pbol == 0 { - goor = nil - } else { - goors := make([]ReprElem7, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - var goor1 uint8 - goor1 = uint8(uint8(pboev)) - err = goors[i].UnmarshalAmino(goor1) - if err != nil { - return - } - } - } - } - goor = goors - } - err = ams.UnmarshalAmino(goor) - if err != nil { - return - } - } - return -} - -func (ams AminoMarshalerStruct7) GetTypeURL() (typeURL string) { - return "/tests.AminoMarshalerStruct7" -} - -func IsAminoMarshalerStruct7ReprEmpty(goor []ReprElem7) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (re ReprElem7) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ReprElem7 - { - goor, err1 := re.MarshalAmino() - if err1 != nil { - return nil, err1 - } - if IsReprElem7ReprEmpty(goor) { - var pbov *testspb.ReprElem7 - msg = pbov - return - } - pbo = &testspb.ReprElem7{Value: uint32(goor)} - } - msg = pbo - return -} - -func (re ReprElem7) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ReprElem7) - msg = pbo - return -} - -func (re *ReprElem7) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ReprElem7 = msg.(*testspb.ReprElem7) - { - var goor uint8 - goor = uint8(uint8(pbo.Value)) - err = re.UnmarshalAmino(goor) - if err != nil { - return - } - } - return -} - -func (re ReprElem7) GetTypeURL() (typeURL string) { - return "/tests.ReprElem7" -} - -func IsReprElem7ReprEmpty(goor uint8) (empty bool) { - { - empty = true - if goor != uint8(0) { - return false - } - } - return -} - -func (id IntDef) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.IntDef - { - if IsIntDefReprEmpty(id) { - var pbov *testspb.IntDef - msg = pbov - return - } - pbo = &testspb.IntDef{Value: int64(id)} - } - msg = pbo - return -} - -func (id IntDef) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.IntDef) - msg = pbo - return -} - -func (id *IntDef) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.IntDef = msg.(*testspb.IntDef) - { - *id = IntDef(int(pbo.Value)) - } - return -} - -func (id IntDef) GetTypeURL() (typeURL string) { - return "/tests.IntDef" -} - -func IsIntDefReprEmpty(goor IntDef) (empty bool) { - { - empty = true - if goor != IntDef(0) { - return false - } - } - return -} - -func (ia IntAr) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.IntAr - { - if IsIntArReprEmpty(ia) { - var pbov *testspb.IntAr - msg = pbov - return - } - goorl := len(ia) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ia[i] - { - pbos[i] = int64(goore) - } - } - } - pbo = &testspb.IntAr{Value: pbos} - } - } - msg = pbo - return -} - -func (ia IntAr) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.IntAr) - msg = pbo - return -} - -func (ia *IntAr) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.IntAr = msg.(*testspb.IntAr) - { - goors := [4]int{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - goors[i] = int(int(pboev)) - } - } - } - *ia = goors - } - return -} - -func (ia IntAr) GetTypeURL() (typeURL string) { - return "/tests.IntAr" -} - -func IsIntArReprEmpty(goor IntAr) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (is IntSl) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.IntSl - { - if IsIntSlReprEmpty(is) { - var pbov *testspb.IntSl - msg = pbov - return - } - goorl := len(is) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]int64, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := is[i] - { - pbos[i] = int64(goore) - } - } - } - pbo = &testspb.IntSl{Value: pbos} - } - } - msg = pbo - return -} - -func (is IntSl) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.IntSl) - msg = pbo - return -} - -func (is *IntSl) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.IntSl = msg.(*testspb.IntSl) - { - var pbol int = 0 - if pbo != nil { - pbol = len(pbo.Value) - } - if pbol == 0 { - *is = nil - } else { - goors := make([]int, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - goors[i] = int(int(pboev)) - } - } - } - *is = goors - } - } - return -} - -func (is IntSl) GetTypeURL() (typeURL string) { - return "/tests.IntSl" -} - -func IsIntSlReprEmpty(goor IntSl) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (ba ByteAr) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ByteAr - { - if IsByteArReprEmpty(ba) { - var pbov *testspb.ByteAr - msg = pbov - return - } - goorl := len(ba) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ba[i] - { - pbos[i] = byte(goore) - } - } - } - pbo = &testspb.ByteAr{Value: pbos} - } - } - msg = pbo - return -} - -func (ba ByteAr) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ByteAr) - msg = pbo - return -} - -func (ba *ByteAr) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ByteAr = msg.(*testspb.ByteAr) - { - goors := [4]uint8{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - *ba = goors - } - return -} - -func (ba ByteAr) GetTypeURL() (typeURL string) { - return "/tests.ByteAr" -} - -func IsByteArReprEmpty(goor ByteAr) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (bs ByteSl) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ByteSl - { - if IsByteSlReprEmpty(bs) { - var pbov *testspb.ByteSl - msg = pbov - return - } - goorl := len(bs) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := bs[i] - { - pbos[i] = byte(goore) - } - } - } - pbo = &testspb.ByteSl{Value: pbos} - } - } - msg = pbo - return -} - -func (bs ByteSl) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ByteSl) - msg = pbo - return -} - -func (bs *ByteSl) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ByteSl = msg.(*testspb.ByteSl) - { - var pbol int = 0 - if pbo != nil { - pbol = len(pbo.Value) - } - if pbol == 0 { - *bs = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - *bs = goors - } - } - return -} - -func (bs ByteSl) GetTypeURL() (typeURL string) { - return "/tests.ByteSl" -} - -func IsByteSlReprEmpty(goor ByteSl) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (psd PrimitivesStructDef) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.PrimitivesStructDef - { - if IsPrimitivesStructDefReprEmpty(psd) { - var pbov *testspb.PrimitivesStructDef - msg = pbov - return - } - pbo = new(testspb.PrimitivesStructDef) - { - pbo.Int8 = int32(psd.Int8) - } - { - pbo.Int16 = int32(psd.Int16) - } - { - pbo.Int32 = int32(psd.Int32) - } - { - pbo.Int32Fixed = int32(psd.Int32Fixed) - } - { - pbo.Int64 = int64(psd.Int64) - } - { - pbo.Int64Fixed = int64(psd.Int64Fixed) - } - { - pbo.Int = int64(psd.Int) - } - { - pbo.Byte = uint32(psd.Byte) - } - { - pbo.Uint8 = uint32(psd.Uint8) - } - { - pbo.Uint16 = uint32(psd.Uint16) - } - { - pbo.Uint32 = uint32(psd.Uint32) - } - { - pbo.Uint32Fixed = uint32(psd.Uint32Fixed) - } - { - pbo.Uint64 = uint64(psd.Uint64) - } - { - pbo.Uint64Fixed = uint64(psd.Uint64Fixed) - } - { - pbo.Uint = uint64(psd.Uint) - } - { - pbo.Str = string(psd.Str) - } - { - goorl := len(psd.Bytes) - if goorl == 0 { - pbo.Bytes = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := psd.Bytes[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.Bytes = pbos - } - } - { - if !amino.IsEmptyTime(psd.Time) { - pbo.Time = timestamppb.New(psd.Time) - } - } - { - if psd.Duration.Nanoseconds() != 0 { - pbo.Duration = durationpb.New(psd.Duration) - } - } - { - pbom := proto.Message(nil) - pbom, err = psd.Empty.ToPBMessage(cdc) - if err != nil { - return - } - pbo.Empty = pbom.(*testspb.EmptyStruct) - } - } - msg = pbo - return -} - -func (psd PrimitivesStructDef) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.PrimitivesStructDef) - msg = pbo - return -} - -func (psd *PrimitivesStructDef) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.PrimitivesStructDef = msg.(*testspb.PrimitivesStructDef) - { - if pbo != nil { - { - (*psd).Int8 = int8(int8(pbo.Int8)) - } - { - (*psd).Int16 = int16(int16(pbo.Int16)) - } - { - (*psd).Int32 = int32(pbo.Int32) - } - { - (*psd).Int32Fixed = int32(pbo.Int32Fixed) - } - { - (*psd).Int64 = int64(pbo.Int64) - } - { - (*psd).Int64Fixed = int64(pbo.Int64Fixed) - } - { - (*psd).Int = int(int(pbo.Int)) - } - { - (*psd).Byte = uint8(uint8(pbo.Byte)) - } - { - (*psd).Uint8 = uint8(uint8(pbo.Uint8)) - } - { - (*psd).Uint16 = uint16(uint16(pbo.Uint16)) - } - { - (*psd).Uint32 = uint32(pbo.Uint32) - } - { - (*psd).Uint32Fixed = uint32(pbo.Uint32Fixed) - } - { - (*psd).Uint64 = uint64(pbo.Uint64) - } - { - (*psd).Uint64Fixed = uint64(pbo.Uint64Fixed) - } - { - (*psd).Uint = uint(uint(pbo.Uint)) - } - { - (*psd).Str = string(pbo.Str) - } - { - var pbol int = 0 - if pbo.Bytes != nil { - pbol = len(pbo.Bytes) - } - if pbol == 0 { - (*psd).Bytes = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Bytes[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*psd).Bytes = goors - } - } - { - (*psd).Time = pbo.Time.AsTime() - } - { - (*psd).Duration = pbo.Duration.AsDuration() - } - { - if pbo.Empty != nil { - err = (*psd).Empty.FromPBMessage(cdc, pbo.Empty) - if err != nil { - return - } - } - } - } - } - return -} - -func (psd PrimitivesStructDef) GetTypeURL() (typeURL string) { - return "/tests.PrimitivesStructDef" -} - -func IsPrimitivesStructDefReprEmpty(goor PrimitivesStructDef) (empty bool) { - { - empty = true - { - if goor.Int8 != int8(0) { - return false - } - } - { - if goor.Int16 != int16(0) { - return false - } - } - { - if goor.Int32 != int32(0) { - return false - } - } - { - if goor.Int32Fixed != int32(0) { - return false - } - } - { - if goor.Int64 != int64(0) { - return false - } - } - { - if goor.Int64Fixed != int64(0) { - return false - } - } - { - if goor.Int != int(0) { - return false - } - } - { - if goor.Byte != uint8(0) { - return false - } - } - { - if goor.Uint8 != uint8(0) { - return false - } - } - { - if goor.Uint16 != uint16(0) { - return false - } - } - { - if goor.Uint32 != uint32(0) { - return false - } - } - { - if goor.Uint32Fixed != uint32(0) { - return false - } - } - { - if goor.Uint64 != uint64(0) { - return false - } - } - { - if goor.Uint64Fixed != uint64(0) { - return false - } - } - { - if goor.Uint != uint(0) { - return false - } - } - { - if goor.Str != string("") { - return false - } - } - { - if len(goor.Bytes) != 0 { - return false - } - } - { - if !amino.IsEmptyTime(goor.Time) { - return false - } - } - { - if goor.Duration != time.Duration(0) { - return false - } - } - { - e := IsEmptyStructReprEmpty(goor.Empty) - if e == false { - return false - } - } - } - return -} - -func (ps PrimitivesStructSl) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.PrimitivesStructSl - { - if IsPrimitivesStructSlReprEmpty(ps) { - var pbov *testspb.PrimitivesStructSl - msg = pbov - return - } - goorl := len(ps) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]*testspb.PrimitivesStruct, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ps[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos[i] = pbom.(*testspb.PrimitivesStruct) - } - } - } - pbo = &testspb.PrimitivesStructSl{Value: pbos} - } - } - msg = pbo - return -} - -func (ps PrimitivesStructSl) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.PrimitivesStructSl) - msg = pbo - return -} - -func (ps *PrimitivesStructSl) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.PrimitivesStructSl = msg.(*testspb.PrimitivesStructSl) - { - var pbol int = 0 - if pbo != nil { - pbol = len(pbo.Value) - } - if pbol == 0 { - *ps = nil - } else { - goors := make([]PrimitivesStruct, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - if pboev != nil { - err = goors[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - *ps = goors - } - } - return -} - -func (ps PrimitivesStructSl) GetTypeURL() (typeURL string) { - return "/tests.PrimitivesStructSl" -} - -func IsPrimitivesStructSlReprEmpty(goor PrimitivesStructSl) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (ps PrimitivesStructAr) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.PrimitivesStructAr - { - if IsPrimitivesStructArReprEmpty(ps) { - var pbov *testspb.PrimitivesStructAr - msg = pbov - return - } - goorl := len(ps) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]*testspb.PrimitivesStruct, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ps[i] - { - pbom := proto.Message(nil) - pbom, err = goore.ToPBMessage(cdc) - if err != nil { - return - } - pbos[i] = pbom.(*testspb.PrimitivesStruct) - } - } - } - pbo = &testspb.PrimitivesStructAr{Value: pbos} - } - } - msg = pbo - return -} - -func (ps PrimitivesStructAr) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.PrimitivesStructAr) - msg = pbo - return -} - -func (ps *PrimitivesStructAr) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.PrimitivesStructAr = msg.(*testspb.PrimitivesStructAr) - { - goors := [2]PrimitivesStruct{} - for i := 0; i < 2; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - if pboev != nil { - err = goors[i].FromPBMessage(cdc, pboev) - if err != nil { - return - } - } - } - } - } - *ps = goors - } - return -} - -func (ps PrimitivesStructAr) GetTypeURL() (typeURL string) { - return "/tests.PrimitivesStructAr" -} - -func IsPrimitivesStructArReprEmpty(goor PrimitivesStructAr) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (c Concrete1) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.Concrete1 - { - if IsConcrete1ReprEmpty(c) { - var pbov *testspb.Concrete1 - msg = pbov - return - } - pbo = new(testspb.Concrete1) - } - msg = pbo - return -} - -func (c Concrete1) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.Concrete1) - msg = pbo - return -} - -func (c *Concrete1) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.Concrete1 = msg.(*testspb.Concrete1) - { - if pbo != nil { - } - } - return -} - -func (c Concrete1) GetTypeURL() (typeURL string) { - return "/tests.Concrete1" -} - -func IsConcrete1ReprEmpty(goor Concrete1) (empty bool) { - { - empty = true - } - return -} - -func (c Concrete2) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.Concrete2 - { - if IsConcrete2ReprEmpty(c) { - var pbov *testspb.Concrete2 - msg = pbov - return - } - pbo = new(testspb.Concrete2) - } - msg = pbo - return -} - -func (c Concrete2) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.Concrete2) - msg = pbo - return -} - -func (c *Concrete2) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.Concrete2 = msg.(*testspb.Concrete2) - { - if pbo != nil { - } - } - return -} - -func (c Concrete2) GetTypeURL() (typeURL string) { - return "/tests.Concrete2" -} - -func IsConcrete2ReprEmpty(goor Concrete2) (empty bool) { - { - empty = true - } - return -} - -func (ctd ConcreteTypeDef) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ConcreteTypeDef - { - if IsConcreteTypeDefReprEmpty(ctd) { - var pbov *testspb.ConcreteTypeDef - msg = pbov - return - } - goorl := len(ctd) - if goorl == 0 { - pbo = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := ctd[i] - { - pbos[i] = byte(goore) - } - } - } - pbo = &testspb.ConcreteTypeDef{Value: pbos} - } - } - msg = pbo - return -} - -func (ctd ConcreteTypeDef) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ConcreteTypeDef) - msg = pbo - return -} - -func (ctd *ConcreteTypeDef) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ConcreteTypeDef = msg.(*testspb.ConcreteTypeDef) - { - goors := [4]uint8{} - for i := 0; i < 4; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - *ctd = goors - } - return -} - -func (ctd ConcreteTypeDef) GetTypeURL() (typeURL string) { - return "/tests.ConcreteTypeDef" -} - -func IsConcreteTypeDefReprEmpty(goor ConcreteTypeDef) (empty bool) { - { - empty = true - if len(goor) != 0 { - return false - } - } - return -} - -func (cwb ConcreteWrappedBytes) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.ConcreteWrappedBytes - { - if IsConcreteWrappedBytesReprEmpty(cwb) { - var pbov *testspb.ConcreteWrappedBytes - msg = pbov - return - } - pbo = new(testspb.ConcreteWrappedBytes) - { - goorl := len(cwb.Value) - if goorl == 0 { - pbo.Value = nil - } else { - pbos := make([]uint8, goorl) - for i := 0; i < goorl; i += 1 { - { - goore := cwb.Value[i] - { - pbos[i] = byte(goore) - } - } - } - pbo.Value = pbos - } - } - } - msg = pbo - return -} - -func (cwb ConcreteWrappedBytes) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.ConcreteWrappedBytes) - msg = pbo - return -} - -func (cwb *ConcreteWrappedBytes) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.ConcreteWrappedBytes = msg.(*testspb.ConcreteWrappedBytes) - { - if pbo != nil { - { - var pbol int = 0 - if pbo.Value != nil { - pbol = len(pbo.Value) - } - if pbol == 0 { - (*cwb).Value = nil - } else { - goors := make([]uint8, pbol) - for i := 0; i < pbol; i += 1 { - { - pboe := pbo.Value[i] - { - pboev := pboe - goors[i] = uint8(uint8(pboev)) - } - } - } - (*cwb).Value = goors - } - } - } - } - return -} - -func (cwb ConcreteWrappedBytes) GetTypeURL() (typeURL string) { - return "/tests.ConcreteWrappedBytes" -} - -func IsConcreteWrappedBytesReprEmpty(goor ConcreteWrappedBytes) (empty bool) { - { - empty = true - { - if len(goor.Value) != 0 { - return false - } - } - } - return -} - -func (ifs InterfaceFieldsStruct) ToPBMessage(cdc *amino.Codec) (msg proto.Message, err error) { - var pbo *testspb.InterfaceFieldsStruct - { - if IsInterfaceFieldsStructReprEmpty(ifs) { - var pbov *testspb.InterfaceFieldsStruct - msg = pbov - return - } - pbo = new(testspb.InterfaceFieldsStruct) - { - if ifs.F1 != nil { - typeUrl := cdc.GetTypeURL(ifs.F1) - bz := []byte(nil) - bz, err = cdc.Marshal(ifs.F1) - if err != nil { - return - } - pbo.F1 = &anypb.Any{TypeUrl: typeUrl, Value: bz} - } - } - { - if ifs.F2 != nil { - typeUrl := cdc.GetTypeURL(ifs.F2) - bz := []byte(nil) - bz, err = cdc.Marshal(ifs.F2) - if err != nil { - return - } - pbo.F2 = &anypb.Any{TypeUrl: typeUrl, Value: bz} - } - } - { - if ifs.F3 != nil { - typeUrl := cdc.GetTypeURL(ifs.F3) - bz := []byte(nil) - bz, err = cdc.Marshal(ifs.F3) - if err != nil { - return - } - pbo.F3 = &anypb.Any{TypeUrl: typeUrl, Value: bz} - } - } - { - if ifs.F4 != nil { - typeUrl := cdc.GetTypeURL(ifs.F4) - bz := []byte(nil) - bz, err = cdc.Marshal(ifs.F4) - if err != nil { - return - } - pbo.F4 = &anypb.Any{TypeUrl: typeUrl, Value: bz} - } - } - } - msg = pbo - return -} - -func (ifs InterfaceFieldsStruct) EmptyPBMessage(cdc *amino.Codec) (msg proto.Message) { - pbo := new(testspb.InterfaceFieldsStruct) - msg = pbo - return -} - -func (ifs *InterfaceFieldsStruct) FromPBMessage(cdc *amino.Codec, msg proto.Message) (err error) { - var pbo *testspb.InterfaceFieldsStruct = msg.(*testspb.InterfaceFieldsStruct) - { - if pbo != nil { - { - typeUrl := pbo.F1.TypeUrl - bz := pbo.F1.Value - goorp := &(*ifs).F1 - err = cdc.UnmarshalAny2(typeUrl, bz, goorp) - if err != nil { - return - } - } - { - typeUrl := pbo.F2.TypeUrl - bz := pbo.F2.Value - goorp := &(*ifs).F2 - err = cdc.UnmarshalAny2(typeUrl, bz, goorp) - if err != nil { - return - } - } - { - typeUrl := pbo.F3.TypeUrl - bz := pbo.F3.Value - goorp := &(*ifs).F3 - err = cdc.UnmarshalAny2(typeUrl, bz, goorp) - if err != nil { - return - } - } - { - typeUrl := pbo.F4.TypeUrl - bz := pbo.F4.Value - goorp := &(*ifs).F4 - err = cdc.UnmarshalAny2(typeUrl, bz, goorp) - if err != nil { - return - } - } - } - } - return -} - -func (ifs InterfaceFieldsStruct) GetTypeURL() (typeURL string) { - return "/tests.InterfaceFieldsStruct" -} - -func IsInterfaceFieldsStructReprEmpty(goor InterfaceFieldsStruct) (empty bool) { - { - empty = true - { - if goor.F1 != nil { - return false - } - } - { - if goor.F2 != nil { - return false - } - } - { - if goor.F3 != nil { - return false - } - } - { - if goor.F4 != nil { - return false - } - } - } - return -} diff --git a/pkgs/amino/tests/proto3/proto/compat.pb.go b/pkgs/amino/tests/proto3/proto/compat.pb.go deleted file mode 100644 index 11e218452b9..00000000000 --- a/pkgs/amino/tests/proto3/proto/compat.pb.go +++ /dev/null @@ -1,743 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: compat.proto - -package proto3tests - -import ( - fmt "fmt" - math "math" - - proto "github.com/golang/protobuf/proto" - timestamp "github.com/golang/protobuf/ptypes/timestamp" -) - -// Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package - -type TestInt32Varint struct { - Int32 int32 `protobuf:"zigzag32,1,opt,name=Int32,proto3" json:"Int32,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TestInt32Varint) Reset() { *m = TestInt32Varint{} } -func (m *TestInt32Varint) String() string { return proto.CompactTextString(m) } -func (*TestInt32Varint) ProtoMessage() {} -func (*TestInt32Varint) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{0} -} - -func (m *TestInt32Varint) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TestInt32Varint.Unmarshal(m, b) -} - -func (m *TestInt32Varint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TestInt32Varint.Marshal(b, m, deterministic) -} - -func (m *TestInt32Varint) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestInt32Varint.Merge(m, src) -} - -func (m *TestInt32Varint) XXX_Size() int { - return xxx_messageInfo_TestInt32Varint.Size(m) -} - -func (m *TestInt32Varint) XXX_DiscardUnknown() { - xxx_messageInfo_TestInt32Varint.DiscardUnknown(m) -} - -var xxx_messageInfo_TestInt32Varint proto.InternalMessageInfo - -func (m *TestInt32Varint) GetInt32() int32 { - if m != nil { - return m.Int32 - } - return 0 -} - -type TestInt32Fixed struct { - Fixed32 uint32 `protobuf:"fixed32,1,opt,name=Fixed32,proto3" json:"Fixed32,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TestInt32Fixed) Reset() { *m = TestInt32Fixed{} } -func (m *TestInt32Fixed) String() string { return proto.CompactTextString(m) } -func (*TestInt32Fixed) ProtoMessage() {} -func (*TestInt32Fixed) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{1} -} - -func (m *TestInt32Fixed) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TestInt32Fixed.Unmarshal(m, b) -} - -func (m *TestInt32Fixed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TestInt32Fixed.Marshal(b, m, deterministic) -} - -func (m *TestInt32Fixed) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestInt32Fixed.Merge(m, src) -} - -func (m *TestInt32Fixed) XXX_Size() int { - return xxx_messageInfo_TestInt32Fixed.Size(m) -} - -func (m *TestInt32Fixed) XXX_DiscardUnknown() { - xxx_messageInfo_TestInt32Fixed.DiscardUnknown(m) -} - -var xxx_messageInfo_TestInt32Fixed proto.InternalMessageInfo - -func (m *TestInt32Fixed) GetFixed32() uint32 { - if m != nil { - return m.Fixed32 - } - return 0 -} - -type Test32 struct { - Foo uint32 `protobuf:"fixed32,1,opt,name=foo,proto3" json:"foo,omitempty"` - Bar int32 `protobuf:"zigzag32,2,opt,name=bar,proto3" json:"bar,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Test32) Reset() { *m = Test32{} } -func (m *Test32) String() string { return proto.CompactTextString(m) } -func (*Test32) ProtoMessage() {} -func (*Test32) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{2} -} - -func (m *Test32) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Test32.Unmarshal(m, b) -} - -func (m *Test32) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Test32.Marshal(b, m, deterministic) -} - -func (m *Test32) XXX_Merge(src proto.Message) { - xxx_messageInfo_Test32.Merge(m, src) -} - -func (m *Test32) XXX_Size() int { - return xxx_messageInfo_Test32.Size(m) -} - -func (m *Test32) XXX_DiscardUnknown() { - xxx_messageInfo_Test32.DiscardUnknown(m) -} - -var xxx_messageInfo_Test32 proto.InternalMessageInfo - -func (m *Test32) GetFoo() uint32 { - if m != nil { - return m.Foo - } - return 0 -} - -func (m *Test32) GetBar() int32 { - if m != nil { - return m.Bar - } - return 0 -} - -type TestFixedInt64 struct { - Int64 uint64 `protobuf:"fixed64,1,opt,name=Int64,proto3" json:"Int64,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TestFixedInt64) Reset() { *m = TestFixedInt64{} } -func (m *TestFixedInt64) String() string { return proto.CompactTextString(m) } -func (*TestFixedInt64) ProtoMessage() {} -func (*TestFixedInt64) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{3} -} - -func (m *TestFixedInt64) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TestFixedInt64.Unmarshal(m, b) -} - -func (m *TestFixedInt64) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TestFixedInt64.Marshal(b, m, deterministic) -} - -func (m *TestFixedInt64) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestFixedInt64.Merge(m, src) -} - -func (m *TestFixedInt64) XXX_Size() int { - return xxx_messageInfo_TestFixedInt64.Size(m) -} - -func (m *TestFixedInt64) XXX_DiscardUnknown() { - xxx_messageInfo_TestFixedInt64.DiscardUnknown(m) -} - -var xxx_messageInfo_TestFixedInt64 proto.InternalMessageInfo - -func (m *TestFixedInt64) GetInt64() uint64 { - if m != nil { - return m.Int64 - } - return 0 -} - -type TestSFixedSInt64 struct { - SInt64 int64 `protobuf:"fixed64,1,opt,name=SInt64,proto3" json:"SInt64,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TestSFixedSInt64) Reset() { *m = TestSFixedSInt64{} } -func (m *TestSFixedSInt64) String() string { return proto.CompactTextString(m) } -func (*TestSFixedSInt64) ProtoMessage() {} -func (*TestSFixedSInt64) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{4} -} - -func (m *TestSFixedSInt64) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TestSFixedSInt64.Unmarshal(m, b) -} - -func (m *TestSFixedSInt64) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TestSFixedSInt64.Marshal(b, m, deterministic) -} - -func (m *TestSFixedSInt64) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestSFixedSInt64.Merge(m, src) -} - -func (m *TestSFixedSInt64) XXX_Size() int { - return xxx_messageInfo_TestSFixedSInt64.Size(m) -} - -func (m *TestSFixedSInt64) XXX_DiscardUnknown() { - xxx_messageInfo_TestSFixedSInt64.DiscardUnknown(m) -} - -var xxx_messageInfo_TestSFixedSInt64 proto.InternalMessageInfo - -func (m *TestSFixedSInt64) GetSInt64() int64 { - if m != nil { - return m.SInt64 - } - return 0 -} - -type EmbeddedStruct struct { - SomethingFixedLen int64 `protobuf:"fixed64,1,opt,name=somethingFixedLen,proto3" json:"somethingFixedLen,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *EmbeddedStruct) Reset() { *m = EmbeddedStruct{} } -func (m *EmbeddedStruct) String() string { return proto.CompactTextString(m) } -func (*EmbeddedStruct) ProtoMessage() {} -func (*EmbeddedStruct) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{5} -} - -func (m *EmbeddedStruct) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EmbeddedStruct.Unmarshal(m, b) -} - -func (m *EmbeddedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EmbeddedStruct.Marshal(b, m, deterministic) -} - -func (m *EmbeddedStruct) XXX_Merge(src proto.Message) { - xxx_messageInfo_EmbeddedStruct.Merge(m, src) -} - -func (m *EmbeddedStruct) XXX_Size() int { - return xxx_messageInfo_EmbeddedStruct.Size(m) -} - -func (m *EmbeddedStruct) XXX_DiscardUnknown() { - xxx_messageInfo_EmbeddedStruct.DiscardUnknown(m) -} - -var xxx_messageInfo_EmbeddedStruct proto.InternalMessageInfo - -func (m *EmbeddedStruct) GetSomethingFixedLen() int64 { - if m != nil { - return m.SomethingFixedLen - } - return 0 -} - -type SomeStruct struct { - // proto3 autom. turns this into a pointer ... - Emb *EmbeddedStruct `protobuf:"bytes,1,opt,name=emb,proto3" json:"emb,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SomeStruct) Reset() { *m = SomeStruct{} } -func (m *SomeStruct) String() string { return proto.CompactTextString(m) } -func (*SomeStruct) ProtoMessage() {} -func (*SomeStruct) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{6} -} - -func (m *SomeStruct) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SomeStruct.Unmarshal(m, b) -} - -func (m *SomeStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SomeStruct.Marshal(b, m, deterministic) -} - -func (m *SomeStruct) XXX_Merge(src proto.Message) { - xxx_messageInfo_SomeStruct.Merge(m, src) -} - -func (m *SomeStruct) XXX_Size() int { - return xxx_messageInfo_SomeStruct.Size(m) -} - -func (m *SomeStruct) XXX_DiscardUnknown() { - xxx_messageInfo_SomeStruct.DiscardUnknown(m) -} - -var xxx_messageInfo_SomeStruct proto.InternalMessageInfo - -func (m *SomeStruct) GetEmb() *EmbeddedStruct { - if m != nil { - return m.Emb - } - return nil -} - -type ProtoGotTime struct { - T *timestamp.Timestamp `protobuf:"bytes,1,opt,name=T,proto3" json:"T,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ProtoGotTime) Reset() { *m = ProtoGotTime{} } -func (m *ProtoGotTime) String() string { return proto.CompactTextString(m) } -func (*ProtoGotTime) ProtoMessage() {} -func (*ProtoGotTime) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{7} -} - -func (m *ProtoGotTime) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ProtoGotTime.Unmarshal(m, b) -} - -func (m *ProtoGotTime) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ProtoGotTime.Marshal(b, m, deterministic) -} - -func (m *ProtoGotTime) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProtoGotTime.Merge(m, src) -} - -func (m *ProtoGotTime) XXX_Size() int { - return xxx_messageInfo_ProtoGotTime.Size(m) -} - -func (m *ProtoGotTime) XXX_DiscardUnknown() { - xxx_messageInfo_ProtoGotTime.DiscardUnknown(m) -} - -var xxx_messageInfo_ProtoGotTime proto.InternalMessageInfo - -func (m *ProtoGotTime) GetT() *timestamp.Timestamp { - if m != nil { - return m.T - } - return nil -} - -type TestInt32 struct { - Int32 int32 `protobuf:"varint,1,opt,name=Int32,proto3" json:"Int32,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TestInt32) Reset() { *m = TestInt32{} } -func (m *TestInt32) String() string { return proto.CompactTextString(m) } -func (*TestInt32) ProtoMessage() {} -func (*TestInt32) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{8} -} - -func (m *TestInt32) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TestInt32.Unmarshal(m, b) -} - -func (m *TestInt32) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TestInt32.Marshal(b, m, deterministic) -} - -func (m *TestInt32) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestInt32.Merge(m, src) -} - -func (m *TestInt32) XXX_Size() int { - return xxx_messageInfo_TestInt32.Size(m) -} - -func (m *TestInt32) XXX_DiscardUnknown() { - xxx_messageInfo_TestInt32.DiscardUnknown(m) -} - -var xxx_messageInfo_TestInt32 proto.InternalMessageInfo - -func (m *TestInt32) GetInt32() int32 { - if m != nil { - return m.Int32 - } - return 0 -} - -type TestInts struct { - Int32 int32 `protobuf:"varint,1,opt,name=Int32,proto3" json:"Int32,omitempty"` - Int64 int64 `protobuf:"varint,2,opt,name=Int64,proto3" json:"Int64,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TestInts) Reset() { *m = TestInts{} } -func (m *TestInts) String() string { return proto.CompactTextString(m) } -func (*TestInts) ProtoMessage() {} -func (*TestInts) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{9} -} - -func (m *TestInts) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TestInts.Unmarshal(m, b) -} - -func (m *TestInts) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TestInts.Marshal(b, m, deterministic) -} - -func (m *TestInts) XXX_Merge(src proto.Message) { - xxx_messageInfo_TestInts.Merge(m, src) -} - -func (m *TestInts) XXX_Size() int { - return xxx_messageInfo_TestInts.Size(m) -} - -func (m *TestInts) XXX_DiscardUnknown() { - xxx_messageInfo_TestInts.DiscardUnknown(m) -} - -var xxx_messageInfo_TestInts proto.InternalMessageInfo - -func (m *TestInts) GetInt32() int32 { - if m != nil { - return m.Int32 - } - return 0 -} - -func (m *TestInts) GetInt64() int64 { - if m != nil { - return m.Int64 - } - return 0 -} - -type IntDef struct { - Val int64 `protobuf:"varint,1,opt,name=val,proto3" json:"val,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *IntDef) Reset() { *m = IntDef{} } -func (m *IntDef) String() string { return proto.CompactTextString(m) } -func (*IntDef) ProtoMessage() {} -func (*IntDef) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{10} -} - -func (m *IntDef) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_IntDef.Unmarshal(m, b) -} - -func (m *IntDef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_IntDef.Marshal(b, m, deterministic) -} - -func (m *IntDef) XXX_Merge(src proto.Message) { - xxx_messageInfo_IntDef.Merge(m, src) -} - -func (m *IntDef) XXX_Size() int { - return xxx_messageInfo_IntDef.Size(m) -} - -func (m *IntDef) XXX_DiscardUnknown() { - xxx_messageInfo_IntDef.DiscardUnknown(m) -} - -var xxx_messageInfo_IntDef proto.InternalMessageInfo - -func (m *IntDef) GetVal() int64 { - if m != nil { - return m.Val - } - return 0 -} - -type IntArr struct { - Val []int64 `protobuf:"varint,1,rep,packed,name=val,proto3" json:"val,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *IntArr) Reset() { *m = IntArr{} } -func (m *IntArr) String() string { return proto.CompactTextString(m) } -func (*IntArr) ProtoMessage() {} -func (*IntArr) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{11} -} - -func (m *IntArr) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_IntArr.Unmarshal(m, b) -} - -func (m *IntArr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_IntArr.Marshal(b, m, deterministic) -} - -func (m *IntArr) XXX_Merge(src proto.Message) { - xxx_messageInfo_IntArr.Merge(m, src) -} - -func (m *IntArr) XXX_Size() int { - return xxx_messageInfo_IntArr.Size(m) -} - -func (m *IntArr) XXX_DiscardUnknown() { - xxx_messageInfo_IntArr.DiscardUnknown(m) -} - -var xxx_messageInfo_IntArr proto.InternalMessageInfo - -func (m *IntArr) GetVal() []int64 { - if m != nil { - return m.Val - } - return nil -} - -type PrimitivesStruct struct { - Int32 int32 `protobuf:"varint,3,opt,name=Int32,proto3" json:"Int32,omitempty"` - Int64 int64 `protobuf:"varint,4,opt,name=Int64,proto3" json:"Int64,omitempty"` - Varint int64 `protobuf:"varint,5,opt,name=Varint,proto3" json:"Varint,omitempty"` - // int int - // Byte byte = 4; // this just another varint - // Uint8 uint8 // another varint - // Uint16 uint16 // another one, also the following - // Uint32 uint32 - // Uint64 uint64 - // Uvarint uint64 `binary:"varint"` - // Uint uint - String_ string `protobuf:"bytes,14,opt,name=String,proto3" json:"String,omitempty"` - Bytes []byte `protobuf:"bytes,15,opt,name=Bytes,proto3" json:"Bytes,omitempty"` - Time *timestamp.Timestamp `protobuf:"bytes,16,opt,name=Time,proto3" json:"Time,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *PrimitivesStruct) Reset() { *m = PrimitivesStruct{} } -func (m *PrimitivesStruct) String() string { return proto.CompactTextString(m) } -func (*PrimitivesStruct) ProtoMessage() {} -func (*PrimitivesStruct) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{12} -} - -func (m *PrimitivesStruct) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PrimitivesStruct.Unmarshal(m, b) -} - -func (m *PrimitivesStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PrimitivesStruct.Marshal(b, m, deterministic) -} - -func (m *PrimitivesStruct) XXX_Merge(src proto.Message) { - xxx_messageInfo_PrimitivesStruct.Merge(m, src) -} - -func (m *PrimitivesStruct) XXX_Size() int { - return xxx_messageInfo_PrimitivesStruct.Size(m) -} - -func (m *PrimitivesStruct) XXX_DiscardUnknown() { - xxx_messageInfo_PrimitivesStruct.DiscardUnknown(m) -} - -var xxx_messageInfo_PrimitivesStruct proto.InternalMessageInfo - -func (m *PrimitivesStruct) GetInt32() int32 { - if m != nil { - return m.Int32 - } - return 0 -} - -func (m *PrimitivesStruct) GetInt64() int64 { - if m != nil { - return m.Int64 - } - return 0 -} - -func (m *PrimitivesStruct) GetVarint() int64 { - if m != nil { - return m.Varint - } - return 0 -} - -func (m *PrimitivesStruct) GetString_() string { - if m != nil { - return m.String_ - } - return "" -} - -func (m *PrimitivesStruct) GetBytes() []byte { - if m != nil { - return m.Bytes - } - return nil -} - -func (m *PrimitivesStruct) GetTime() *timestamp.Timestamp { - if m != nil { - return m.Time - } - return nil -} - -type PrimitivesStructSl struct { - Structs []*PrimitivesStruct `protobuf:"bytes,1,rep,name=Structs,proto3" json:"Structs,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *PrimitivesStructSl) Reset() { *m = PrimitivesStructSl{} } -func (m *PrimitivesStructSl) String() string { return proto.CompactTextString(m) } -func (*PrimitivesStructSl) ProtoMessage() {} -func (*PrimitivesStructSl) Descriptor() ([]byte, []int) { - return fileDescriptor_bced3ff93dcaa7f8, []int{13} -} - -func (m *PrimitivesStructSl) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PrimitivesStructSl.Unmarshal(m, b) -} - -func (m *PrimitivesStructSl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PrimitivesStructSl.Marshal(b, m, deterministic) -} - -func (m *PrimitivesStructSl) XXX_Merge(src proto.Message) { - xxx_messageInfo_PrimitivesStructSl.Merge(m, src) -} - -func (m *PrimitivesStructSl) XXX_Size() int { - return xxx_messageInfo_PrimitivesStructSl.Size(m) -} - -func (m *PrimitivesStructSl) XXX_DiscardUnknown() { - xxx_messageInfo_PrimitivesStructSl.DiscardUnknown(m) -} - -var xxx_messageInfo_PrimitivesStructSl proto.InternalMessageInfo - -func (m *PrimitivesStructSl) GetStructs() []*PrimitivesStruct { - if m != nil { - return m.Structs - } - return nil -} - -func init() { - proto.RegisterType((*TestInt32Varint)(nil), "proto3tests.TestInt32Varint") - proto.RegisterType((*TestInt32Fixed)(nil), "proto3tests.TestInt32Fixed") - proto.RegisterType((*Test32)(nil), "proto3tests.Test32") - proto.RegisterType((*TestFixedInt64)(nil), "proto3tests.TestFixedInt64") - proto.RegisterType((*TestSFixedSInt64)(nil), "proto3tests.TestSFixedSInt64") - proto.RegisterType((*EmbeddedStruct)(nil), "proto3tests.EmbeddedStruct") - proto.RegisterType((*SomeStruct)(nil), "proto3tests.SomeStruct") - proto.RegisterType((*ProtoGotTime)(nil), "proto3tests.ProtoGotTime") - proto.RegisterType((*TestInt32)(nil), "proto3tests.TestInt32") - proto.RegisterType((*TestInts)(nil), "proto3tests.TestInts") - proto.RegisterType((*IntDef)(nil), "proto3tests.IntDef") - proto.RegisterType((*IntArr)(nil), "proto3tests.IntArr") - proto.RegisterType((*PrimitivesStruct)(nil), "proto3tests.PrimitivesStruct") - proto.RegisterType((*PrimitivesStructSl)(nil), "proto3tests.PrimitivesStructSl") -} - -func init() { proto.RegisterFile("compat.proto", fileDescriptor_bced3ff93dcaa7f8) } - -var fileDescriptor_bced3ff93dcaa7f8 = []byte{ - // 445 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x6f, 0x6b, 0x13, 0x41, - 0x10, 0xc6, 0x39, 0xaf, 0xb9, 0xd8, 0x49, 0x48, 0xaf, 0x8b, 0xc8, 0x11, 0x11, 0xe3, 0xbe, 0xd0, - 0x50, 0xea, 0x15, 0x92, 0x12, 0x05, 0x41, 0x50, 0xfc, 0x43, 0x40, 0xa1, 0xec, 0x1d, 0xbe, 0xbf, - 0x6b, 0x36, 0x71, 0x21, 0x7b, 0x1b, 0x76, 0xa7, 0x45, 0xbf, 0x97, 0x1f, 0x50, 0xf6, 0xcf, 0x25, - 0x4d, 0x0d, 0xf4, 0x55, 0xe6, 0xd9, 0xf9, 0xcd, 0xce, 0xe6, 0x79, 0x0e, 0xfa, 0xd7, 0x4a, 0x6e, - 0x2a, 0xcc, 0x37, 0x5a, 0xa1, 0x22, 0x3d, 0xf7, 0x33, 0x45, 0x6e, 0xd0, 0x0c, 0x5f, 0xac, 0x94, - 0x5a, 0xad, 0xf9, 0x85, 0x3b, 0xab, 0x6f, 0x96, 0x17, 0x28, 0x24, 0x37, 0x58, 0xc9, 0x8d, 0xa7, - 0xe9, 0x6b, 0x38, 0x29, 0xb9, 0xc1, 0x79, 0x83, 0xd3, 0xc9, 0xcf, 0x4a, 0x8b, 0x06, 0xc9, 0x13, - 0xe8, 0x38, 0x99, 0x45, 0xa3, 0x68, 0x7c, 0xca, 0xbc, 0xa0, 0x67, 0x30, 0xd8, 0x82, 0x5f, 0xc5, - 0x6f, 0xbe, 0x20, 0x19, 0x74, 0x5d, 0x11, 0xc8, 0x2e, 0x6b, 0x25, 0x3d, 0x87, 0xc4, 0xb2, 0xd3, - 0x09, 0x49, 0x21, 0x5e, 0x2a, 0x15, 0xfa, 0xb6, 0xb4, 0x27, 0x75, 0xa5, 0xb3, 0x47, 0xee, 0x6e, - 0x5b, 0xd2, 0x57, 0xfe, 0x66, 0x37, 0x3c, 0x6f, 0x70, 0x76, 0x19, 0x5e, 0x30, 0xbb, 0x74, 0x73, - 0x09, 0xf3, 0x82, 0x9e, 0x41, 0x6a, 0xb9, 0xc2, 0x81, 0x85, 0x27, 0x9f, 0x42, 0x52, 0xec, 0xd0, - 0x94, 0x05, 0x45, 0x3f, 0xc0, 0xe0, 0x8b, 0xac, 0xf9, 0x62, 0xc1, 0x17, 0x05, 0xea, 0x9b, 0x6b, - 0x24, 0xe7, 0x70, 0x6a, 0x94, 0xe4, 0xf8, 0x4b, 0x34, 0x2b, 0x77, 0xc3, 0x77, 0xde, 0x84, 0xa1, - 0xff, 0x1b, 0xf4, 0x3d, 0x40, 0xa1, 0x24, 0x0f, 0xb3, 0x6f, 0x20, 0xe6, 0xb2, 0x76, 0x74, 0x6f, - 0xf2, 0x2c, 0xbf, 0x63, 0x70, 0xbe, 0xbf, 0x85, 0x59, 0x8e, 0xbe, 0x83, 0xfe, 0x95, 0x45, 0xbe, - 0x29, 0x2c, 0x85, 0xe4, 0x64, 0x0c, 0x51, 0x19, 0x86, 0x87, 0xb9, 0x0f, 0x24, 0x6f, 0x03, 0xc9, - 0xcb, 0x36, 0x10, 0x16, 0x95, 0xf4, 0x25, 0x1c, 0x6f, 0x4d, 0xde, 0xcf, 0xa1, 0xd3, 0xe6, 0x30, - 0x83, 0xc7, 0x01, 0x31, 0x87, 0x89, 0x9d, 0x7b, 0xd6, 0xe3, 0xb8, 0x75, 0x6f, 0x08, 0xc9, 0xbc, - 0xc1, 0xcf, 0x7c, 0x69, 0x13, 0xb8, 0xad, 0xd6, 0x6e, 0x26, 0x66, 0xb6, 0x0c, 0xbd, 0x8f, 0x5a, - 0xef, 0x7a, 0x71, 0xdb, 0xfb, 0x1b, 0x41, 0x7a, 0xa5, 0x85, 0x14, 0x28, 0x6e, 0xb9, 0x09, 0x86, - 0x6c, 0x17, 0xc7, 0x07, 0x17, 0x1f, 0xdd, 0x59, 0x6c, 0x23, 0xf2, 0x1f, 0x56, 0xd6, 0x71, 0xc7, - 0x41, 0xb9, 0xe8, 0x50, 0x8b, 0x66, 0x95, 0x0d, 0x46, 0xd1, 0xf8, 0x98, 0x05, 0x65, 0x6f, 0xf9, - 0xf4, 0x07, 0xb9, 0xc9, 0x4e, 0x46, 0xd1, 0xb8, 0xcf, 0xbc, 0x20, 0x39, 0x1c, 0x59, 0xa7, 0xb2, - 0xf4, 0x41, 0x1b, 0x1d, 0x47, 0x7f, 0x00, 0xb9, 0xff, 0xea, 0x62, 0x4d, 0xde, 0x42, 0xd7, 0xd7, - 0xc6, 0xfd, 0xc5, 0xde, 0xe4, 0xf9, 0x5e, 0x98, 0xf7, 0x27, 0x58, 0x4b, 0xd7, 0x89, 0xc7, 0xfe, - 0x05, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x3c, 0xc6, 0x27, 0x6b, 0x03, 0x00, 0x00, -} diff --git a/pkgs/bft/blockchain/blockchain.proto b/pkgs/bft/blockchain/blockchain.proto deleted file mode 100644 index dc288efc74c..00000000000 --- a/pkgs/bft/blockchain/blockchain.proto +++ /dev/null @@ -1,31 +0,0 @@ -syntax = "proto3"; -package tm; - -option go_package = "github.com/gnolang/gno/pkgs/bft/blockchain/pb"; - -// imports -import "github.com/gnolang/gno/pkgs/bft/types/types.proto"; -import "github.com/gnolang/gno/pkgs/bft/abci/types/abci.proto"; -import "github.com/gnolang/gno/pkgs/crypto/merkle/merkle.proto"; -import "github.com/gnolang/gno/pkgs/bitarray/bitarray.proto"; - -// messages -message BlockRequest { - sint64 Height = 1; -} - -message BlockResponse { - Block Block = 1; -} - -message NoBlockResponse { - sint64 Height = 1; -} - -message StatusRequest { - sint64 Height = 1; -} - -message StatusResponse { - sint64 Height = 1; -} \ No newline at end of file diff --git a/pkgs/sdk/sdk.proto b/pkgs/sdk/sdk.proto deleted file mode 100644 index 9609cacae06..00000000000 --- a/pkgs/sdk/sdk.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; -package tm; - -option go_package = "github.com/gnolang/gno/pkgs/sdk/pb"; - -// imports -import "github.com/gnolang/gno/pkgs/bft/abci/types/abci.proto"; -import "github.com/gnolang/gno/pkgs/crypto/merkle/merkle.proto"; - -// messages -message Result { - abci.ResponseBase ResponseBase = 1; - sint64 GasWanted = 2; - sint64 GasUsed = 3; -} \ No newline at end of file diff --git a/tm2/LICENSE.md b/tm2/LICENSE.md new file mode 100644 index 00000000000..67db8588217 --- /dev/null +++ b/tm2/LICENSE.md @@ -0,0 +1,175 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/tm2/Makefile b/tm2/Makefile new file mode 100644 index 00000000000..d6b0e86f474 --- /dev/null +++ b/tm2/Makefile @@ -0,0 +1,48 @@ +.PHONY: help +help: + @echo "Available make commands:" + @cat Makefile | grep '^[a-z][^:]*:' | cut -d: -f1 | sort | sed 's/^/ /' + +rundep=go run -modfile ../misc/devdeps/go.mod + +.PHONY: build +build: _build.t2txsync +_build.tools: _build.aminoscan _build.goscan _build.logjack _build.iaviewer + +_build.t2txsync:; go build -o build/t2txsync ./cmd/t2txsync +_build.aminoscan:; go build -o build/aminoscan ./pkg/amino/cmd/aminoscan +_build.goscan:; go build -o build/goscan ./pkg/amino/cmd/goscan +_build.logjack:; go build -o build/logjack ./pkg/autofile/cmd +_build.iaviewer:; go build -o build/iaviewer ./pkg/iavl/cmd/iaviewer + +.PHONY: install +install: + go install ./cmd/... + +.PHONY: clean +clean: + rm -rf ./build/ + +.PHONY: fmt +GOFMT_FLAGS ?= -w +fmt: + $(rundep) mvdan.cc/gofumpt $(GOFMT_FLAGS) . + +.PHONY: lint +lint: + golangci-lint run --config ../.github/golangci.yml ./... + +######################################## +# Test suite +.PHONY: test +test: _test.pkg.amino _test.pkg.bft _test.pkg.others _test.flappy _test.cmds + +_test.flappy: + # flappy tests should work "sometimes" (at least once) + TEST_STABILITY=flappy $(rundep) moul.io/testman test -test.v -timeout=20m -retry=10 -run ^TestFlappy \ + ./pkg/bft/consensus ./pkg/bft/blockchain ./pkg/bft/mempool ./pkg/p2p ./pkg/bft/privval + +_test.pkg.others:; go test `go list ./pkg/... | grep -v pkg/amino/ | grep -v pkg/bft/` -v -p 1 -timeout=30m +_test.pkg.amino:; go test ./pkg/amino/... -v -p 1 -timeout=30m +_test.pkg.bft:; go test ./pkg/bft/... -v -p 1 -timeout=30m +_test.cmds:; go test ./cmd/... -v -p 1 -timeout=30m diff --git a/tm2/README.md b/tm2/README.md new file mode 100644 index 00000000000..f6ef0fc63ba --- /dev/null +++ b/tm2/README.md @@ -0,0 +1,107 @@ +# Tendermint2 + +**Disclaimer: Tendermint2 is currently part of the Gno monorepo for streamlined development. Once Gno.land is on the mainnet, Tendermint2 will operate independently, including for governance, on https://github.com/tendermint/tendermint2.** + +## Mission + + * make awesome software with modular components. + * crypto p2p swiss armyknife for human liberation. + +## Problems + + * Open source is open for subversion. + * Incentives and mission are misaligned. + * Need directory & forum for Tendermint/SDK forks. + +## Partial Solution: adopt principles + + * Simplicity of design. + * The code is the spec. + * Minimal code - keep total footprint small. + * Minimal dependencies - all dependencies must get audited, and become part of + the repo. + * Modular dependencies - whereever reasonable, make components modular. + * Completeness - software projects that don't become finished are projects + that are forever vulnerable. One of the primary goals of the Gno language + and related works is to become finished within a reasonable timeframe. + +## What is already proposed for Tendermint2: + +* Complete Amino. -> multiplier of productivity for SDK development, to not + have to think about protobuf at all. Use "genproto" to even auto-generate + proto3 for encoding/decoding optimization through protoc. // MISSION: be the + basis for improving the encoding standard from proto3, because proto3 + length-prefixing is slow, and we need "proto4" or "amino2". // LOOK at the + auto-generated proto files! + https://github.com/gnolang/gno/blob/master/pkgs/bft/consensus/types/cstypes.proto + for example. // There was work to remove this from the CosmosSDK because + Amino wasn't ready, but now that it is, it makes sense to incorporate it into + Tendermint2. + +* Remove EvidenceReactor, Evidence, Violation -> we need to make it easy to + create alt mempool reactors. We "kill two birds with one stone" by + implementing evidence as a first-class mempool lane. The authors of "ABCI++" + have a different set of problems to solve, so we should do both! Tendermint++ + and Tendermint2. + +* Fix address size to 20 bytes -> 160 is sufficient, and fixing it brings + optimizations. + +* General versionset system for handshake negotiation. -> So Tendermint2 can be + used as basis for other p2p applications. + +* EventBus -> EventSwitch. -> For indexing, use an external system. This keeps + Tendermint2 minimal, allowing integration with plugin modules, without having + any internal implementation at all. EventSwitch is also simpler, and + synchronous, and this keeps the Tendermint tests deterministic. There is no + performance need to do anything else than keep the Tendermint protocol + synchronous. (If there is, because of massive validator numbers for whatever + reason, then it should be a fork of Tendermint with a unique & distinct name, + and would be under the same taxonomy of Tendermint). + +* Fix nondeterminism in consensus tests -> in relation to the above. + +* Add "MaxDataBytes" for total tx data size limitation. -> The previous way of + limiting the total block size may result in unexpected behavior with changes + in validator size. We should err to allocate room for each module seperately, + to ensure availability. + +* Remove external dependencies like prometheus. -> Any metrics and events + should be plugged in through the implementation of interfaces. This may + involve picking out the client logic from prometheus, but even if so it would + be forked into Tendermint2 and be audited like anything else. + +* General consensus/WAL -> a WAL is useful enough to warrant being a re-usable + module. + +* Remove GRPC -> GRPC support should be plugged in (say in a GRPC fork of + Tendermint2), so alternative RPC protocols can likewise be. Tendermint2 aims + to be independent of the Protobuf stack so that it can retain freedom for + improving its codec. + +* Remove dependency on viper/cobra -> I have tried to strip out what we don't + use of viper/cobra for minimalism, but could not; and viper/cobra is one + prime target for malware to be introduced. Rather than audit viper/cobra, + Tendermint2 implements a cli convention for Go-structure-based flags and cli; + so if you still want to use viper/cobra you can do so by translating flags to + an options struct. + +* Question: Which projects use ABCI sockets besides CosmosSDK derived chains? + +## Roadmap + +First, we create a multi-organizational team for Tendermint2 & +TendermintCore/++ development. We will maintain a fork of the Tendermint++ repo +and suggest changes upstream based on our work on Tendermint2, while also +porting necessary fixes from Tendermint++ over to Tendermint2. + +We will also reach out to ecosystem partners and survey and create a +directory/taxonomy for Tendermint and CosmosSDK derivatives and manage a forum +for interfork collaboration. + +Ideally, Tendermint2 and TendermintCore/++ merge into one. + +## Challenge + +Either make a PR to Gaia/CosmosSDK/TendermintCore to be like Tendermint2, or +make a PR to Tendermint2 to import a feature or fix of TendermintCore. diff --git a/cmd/gnotxport/README.md b/tm2/cmd/tm2txsync/README.md similarity index 100% rename from cmd/gnotxport/README.md rename to tm2/cmd/tm2txsync/README.md diff --git a/cmd/gnotxport/export.go b/tm2/cmd/tm2txsync/export.go similarity index 89% rename from cmd/gnotxport/export.go rename to tm2/cmd/tm2txsync/export.go index 389df9371fc..1d7585256e0 100644 --- a/cmd/gnotxport/export.go +++ b/tm2/cmd/tm2txsync/export.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/std" - - _ "github.com/gnolang/gno/pkgs/sdk/auth" // XXX better way? - _ "github.com/gnolang/gno/pkgs/sdk/bank" - _ "github.com/gnolang/gno/pkgs/sdk/vm" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/std" + + _ "github.com/gnolang/gno/tm2/pkg/sdk/auth" // XXX better way? + _ "github.com/gnolang/gno/tm2/pkg/sdk/bank" + _ "github.com/gnolang/gno/tm2/pkg/sdk/vm" ) type exportCfg struct { diff --git a/cmd/gnotxport/import.go b/tm2/cmd/tm2txsync/import.go similarity index 85% rename from cmd/gnotxport/import.go rename to tm2/cmd/tm2txsync/import.go index d35e659389c..5938496bdd0 100644 --- a/cmd/gnotxport/import.go +++ b/tm2/cmd/tm2txsync/import.go @@ -8,15 +8,15 @@ import ( "os" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/std" - - _ "github.com/gnolang/gno/pkgs/sdk/auth" // XXX better way? - _ "github.com/gnolang/gno/pkgs/sdk/bank" - _ "github.com/gnolang/gno/pkgs/sdk/vm" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/std" + + _ "github.com/gnolang/gno/tm2/pkg/sdk/auth" // XXX better way? + _ "github.com/gnolang/gno/tm2/pkg/sdk/bank" + _ "github.com/gnolang/gno/tm2/pkg/sdk/vm" ) type importCfg struct { diff --git a/cmd/gnotxport/main.go b/tm2/cmd/tm2txsync/main.go similarity index 95% rename from cmd/gnotxport/main.go rename to tm2/cmd/tm2txsync/main.go index 8c2e7c86fa5..6c904c597a3 100644 --- a/cmd/gnotxport/main.go +++ b/tm2/cmd/tm2txsync/main.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" ) // config is the shared config for gnotxport, and its subcommands diff --git a/pkgs/amino/CONTRIBUTING.md b/tm2/pkg/amino/CONTRIBUTING.md similarity index 100% rename from pkgs/amino/CONTRIBUTING.md rename to tm2/pkg/amino/CONTRIBUTING.md diff --git a/pkgs/amino/LICENSE b/tm2/pkg/amino/LICENSE similarity index 100% rename from pkgs/amino/LICENSE rename to tm2/pkg/amino/LICENSE diff --git a/pkgs/amino/Makefile b/tm2/pkg/amino/Makefile similarity index 91% rename from pkgs/amino/Makefile rename to tm2/pkg/amino/Makefile index a63b96b8d5c..6f9682d7513 100644 --- a/pkgs/amino/Makefile +++ b/tm2/pkg/amino/Makefile @@ -28,7 +28,7 @@ gofuzz_binary: rm -rf tests/fuzz/binary/crashers/ rm -rf tests/fuzz/binary/suppressions/ go run tests/fuzz/binary/init-corpus/main.go --corpus-parent=tests/fuzz/binary - go-fuzz-build github.com/gnolang/gno/pkgs/amino/tests/fuzz/binary + go-fuzz-build github.com/gnolang/gno/tm2/pkg/amino/tests/fuzz/binary go-fuzz -bin=./fuzzbinary-fuzz.zip -workdir=tests/fuzz/binary rm -rf ./fuzzbinary-fuzz.zip @@ -36,7 +36,7 @@ gofuzz_json: rm -rf tests/fuzz/json/corpus/ rm -rf tests/fuzz/json/crashers/ rm -rf tests/fuzz/json/suppressions/ - go-fuzz-build github.com/gnolang/gno/pkgs/amino/tests/fuzz/json + go-fuzz-build github.com/gnolang/gno/tm2/pkg/amino/tests/fuzz/json go-fuzz -bin=./fuzzjson-fuzz.zip -workdir=tests/fuzz/json rm -rf ./fuzzjson-fuzz.zip diff --git a/pkgs/amino/README.md b/tm2/pkg/amino/README.md similarity index 95% rename from pkgs/amino/README.md rename to tm2/pkg/amino/README.md index 112c5aecbb8..1a69cc7426c 100644 --- a/pkgs/amino/README.md +++ b/tm2/pkg/amino/README.md @@ -1,6 +1,6 @@ # Amino -http://github.com/gnolang/gno/pkgs/amino +http://github.com/gnolang/gno/tm2/pkg/amino NOTE: This project used to be gnolang/gno/pkgs/amino, derived from tendermint/go-amino. @@ -62,12 +62,12 @@ Each package should declare in a package local file (by convention called amino. which should look like the following: ```go -// see github.com/gnolang/gno/pkgs/amino/protogen/example/main.go +// see github.com/gnolang/gno/tm2/pkg/amino/protogen/example/main.go package main import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule" ) var Package = amino.RegisterPackage( diff --git a/pkgs/amino/TODO.md b/tm2/pkg/amino/TODO.md similarity index 100% rename from pkgs/amino/TODO.md rename to tm2/pkg/amino/TODO.md diff --git a/pkgs/amino/amino.go b/tm2/pkg/amino/amino.go similarity index 99% rename from pkgs/amino/amino.go rename to tm2/pkg/amino/amino.go index e2ba3b89e9b..1ca3427b85c 100644 --- a/pkgs/amino/amino.go +++ b/tm2/pkg/amino/amino.go @@ -11,8 +11,8 @@ import ( "runtime" "time" - "github.com/gnolang/gno/pkgs/amino/pkg" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" + "github.com/gnolang/gno/tm2/pkg/errors" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkgs/amino/amino_test.go b/tm2/pkg/amino/amino_test.go similarity index 98% rename from pkgs/amino/amino_test.go rename to tm2/pkg/amino/amino_test.go index 2e759c72be3..a06601a43da 100644 --- a/pkgs/amino/amino_test.go +++ b/tm2/pkg/amino/amino_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - amino "github.com/gnolang/gno/pkgs/amino" + amino "github.com/gnolang/gno/tm2/pkg/amino" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/amino/benchmark_test.go b/tm2/pkg/amino/benchmark_test.go similarity index 97% rename from pkgs/amino/benchmark_test.go rename to tm2/pkg/amino/benchmark_test.go index 5eabe02a16d..7dc9773dfa4 100644 --- a/pkgs/amino/benchmark_test.go +++ b/tm2/pkg/amino/benchmark_test.go @@ -6,8 +6,8 @@ import ( "runtime/debug" "testing" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" fuzz "github.com/google/gofuzz" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/pkgs/amino/benchmark_test.txt b/tm2/pkg/amino/benchmark_test.txt similarity index 99% rename from pkgs/amino/benchmark_test.txt rename to tm2/pkg/amino/benchmark_test.txt index b8eb0a7166d..0fa6217f09e 100644 --- a/pkgs/amino/benchmark_test.txt +++ b/tm2/pkg/amino/benchmark_test.txt @@ -1,6 +1,6 @@ goos: darwin goarch: amd64 -pkg: github.com/gnolang/gno/pkgs/amino +pkg: github.com/gnolang/gno/tm2/pkg/amino BenchmarkBinary/EmptyStruct:encode-12 2014173 600 ns/op BenchmarkBinary/EmptyStruct:decode-12 2552624 476 ns/op BenchmarkBinary/PrimitivesStruct:encode-12 195601 5863 ns/op @@ -36,7 +36,7 @@ BenchmarkBinary/AminoMarshalerStruct:decode-12 213175 5642 ns/o goos: darwin goarch: amd64 -pkg: github.com/gnolang/gno/pkgs/amino +pkg: github.com/gnolang/gno/tm2/pkg/amino BenchmarkBinaryPBBindings/EmptyStruct:encode:pbbindings-12 3058335 417 ns/op BenchmarkBinaryPBBindings/EmptyStruct:encode:pbbindings:translate_only-12 10182542 122 ns/op BenchmarkBinaryPBBindings/EmptyStruct:decode:pbbindings-12 1792140 627 ns/op diff --git a/pkgs/amino/binary_decode.go b/tm2/pkg/amino/binary_decode.go similarity index 99% rename from pkgs/amino/binary_decode.go rename to tm2/pkg/amino/binary_decode.go index 879ce99970e..8ac4161cede 100644 --- a/pkgs/amino/binary_decode.go +++ b/tm2/pkg/amino/binary_decode.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) const bdOptionByte = 0x01 diff --git a/pkgs/amino/binary_encode.go b/tm2/pkg/amino/binary_encode.go similarity index 100% rename from pkgs/amino/binary_encode.go rename to tm2/pkg/amino/binary_encode.go diff --git a/pkgs/amino/binary_encode_test.go b/tm2/pkg/amino/binary_encode_test.go similarity index 100% rename from pkgs/amino/binary_encode_test.go rename to tm2/pkg/amino/binary_encode_test.go diff --git a/pkgs/amino/binary_test.go b/tm2/pkg/amino/binary_test.go similarity index 99% rename from pkgs/amino/binary_test.go rename to tm2/pkg/amino/binary_test.go index 10a57913509..8516ac2e1fa 100644 --- a/pkgs/amino/binary_test.go +++ b/tm2/pkg/amino/binary_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - amino "github.com/gnolang/gno/pkgs/amino" + amino "github.com/gnolang/gno/tm2/pkg/amino" ) func TestNilSliceEmptySlice(t *testing.T) { diff --git a/pkgs/amino/byteslice_test.go b/tm2/pkg/amino/byteslice_test.go similarity index 100% rename from pkgs/amino/byteslice_test.go rename to tm2/pkg/amino/byteslice_test.go diff --git a/pkgs/amino/cmd/aminoscan/aminoscan.go b/tm2/pkg/amino/cmd/aminoscan/aminoscan.go similarity index 99% rename from pkgs/amino/cmd/aminoscan/aminoscan.go rename to tm2/pkg/amino/cmd/aminoscan/aminoscan.go index ae7b78e570f..c9a7d3e2943 100644 --- a/pkgs/amino/cmd/aminoscan/aminoscan.go +++ b/tm2/pkg/amino/cmd/aminoscan/aminoscan.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - amino "github.com/gnolang/gno/pkgs/amino" + amino "github.com/gnolang/gno/tm2/pkg/amino" ) func main() { diff --git a/pkgs/amino/cmd/aminoscan/colors.go b/tm2/pkg/amino/cmd/aminoscan/colors.go similarity index 100% rename from pkgs/amino/cmd/aminoscan/colors.go rename to tm2/pkg/amino/cmd/aminoscan/colors.go diff --git a/pkgs/amino/cmd/goscan/goscan.go b/tm2/pkg/amino/cmd/goscan/goscan.go similarity index 100% rename from pkgs/amino/cmd/goscan/goscan.go rename to tm2/pkg/amino/cmd/goscan/goscan.go diff --git a/pkgs/amino/codec.go b/tm2/pkg/amino/codec.go similarity index 99% rename from pkgs/amino/codec.go rename to tm2/pkg/amino/codec.go index 416434db617..6300ae04673 100644 --- a/pkgs/amino/codec.go +++ b/tm2/pkg/amino/codec.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/gnolang/gno/pkgs/amino/pkg" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" ) // Useful for debugging. diff --git a/pkgs/amino/codec_test.go b/tm2/pkg/amino/codec_test.go similarity index 98% rename from pkgs/amino/codec_test.go rename to tm2/pkg/amino/codec_test.go index 84877ec4fe8..7e025f73271 100644 --- a/pkgs/amino/codec_test.go +++ b/tm2/pkg/amino/codec_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) type SimpleStruct struct { diff --git a/pkgs/amino/decoder.go b/tm2/pkg/amino/decoder.go similarity index 100% rename from pkgs/amino/decoder.go rename to tm2/pkg/amino/decoder.go diff --git a/pkgs/amino/deep_copy.go b/tm2/pkg/amino/deep_copy.go similarity index 100% rename from pkgs/amino/deep_copy.go rename to tm2/pkg/amino/deep_copy.go diff --git a/pkgs/amino/deep_copy_test.go b/tm2/pkg/amino/deep_copy_test.go similarity index 98% rename from pkgs/amino/deep_copy_test.go rename to tm2/pkg/amino/deep_copy_test.go index ff8ae9b1812..55aff4c6a60 100644 --- a/pkgs/amino/deep_copy_test.go +++ b/tm2/pkg/amino/deep_copy_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - amino "github.com/gnolang/gno/pkgs/amino" + amino "github.com/gnolang/gno/tm2/pkg/amino" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/amino/deep_equal.go b/tm2/pkg/amino/deep_equal.go similarity index 100% rename from pkgs/amino/deep_equal.go rename to tm2/pkg/amino/deep_equal.go diff --git a/pkgs/amino/doc.go b/tm2/pkg/amino/doc.go similarity index 100% rename from pkgs/amino/doc.go rename to tm2/pkg/amino/doc.go diff --git a/pkgs/amino/docs/resources/protobuf3.png b/tm2/pkg/amino/docs/resources/protobuf3.png similarity index 100% rename from pkgs/amino/docs/resources/protobuf3.png rename to tm2/pkg/amino/docs/resources/protobuf3.png diff --git a/pkgs/amino/encoder.go b/tm2/pkg/amino/encoder.go similarity index 100% rename from pkgs/amino/encoder.go rename to tm2/pkg/amino/encoder.go diff --git a/pkgs/amino/encoder_test.go b/tm2/pkg/amino/encoder_test.go similarity index 100% rename from pkgs/amino/encoder_test.go rename to tm2/pkg/amino/encoder_test.go diff --git a/pkgs/amino/example_test.go b/tm2/pkg/amino/example_test.go similarity index 97% rename from pkgs/amino/example_test.go rename to tm2/pkg/amino/example_test.go index cf1779d533a..877607e8022 100644 --- a/pkgs/amino/example_test.go +++ b/tm2/pkg/amino/example_test.go @@ -18,7 +18,7 @@ import ( "fmt" "reflect" - amino "github.com/gnolang/gno/pkgs/amino" + amino "github.com/gnolang/gno/tm2/pkg/amino" ) func Example() { diff --git a/pkgs/amino/fuzzjson-fuzz.zip b/tm2/pkg/amino/fuzzjson-fuzz.zip similarity index 100% rename from pkgs/amino/fuzzjson-fuzz.zip rename to tm2/pkg/amino/fuzzjson-fuzz.zip diff --git a/pkgs/amino/gengo/README.md b/tm2/pkg/amino/gengo/README.md similarity index 100% rename from pkgs/amino/gengo/README.md rename to tm2/pkg/amino/gengo/README.md diff --git a/pkgs/amino/gengo/gengo.go b/tm2/pkg/amino/gengo/gengo.go similarity index 96% rename from pkgs/amino/gengo/gengo.go rename to tm2/pkg/amino/gengo/gengo.go index 2efb911c247..d34f3c855d2 100644 --- a/pkgs/amino/gengo/gengo.go +++ b/tm2/pkg/amino/gengo/gengo.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/libs/press" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/libs/press" ) // shortcut diff --git a/pkgs/amino/gengo/gengo_test.go b/tm2/pkg/amino/gengo/gengo_test.go similarity index 83% rename from pkgs/amino/gengo/gengo_test.go rename to tm2/pkg/amino/gengo/gengo_test.go index 44df9beedac..88b25d9acdd 100644 --- a/pkgs/amino/gengo/gengo_test.go +++ b/tm2/pkg/amino/gengo/gengo_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/libs/press" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/libs/press" ) type SampleStruct struct { diff --git a/pkgs/amino/genproto/bindings.go b/tm2/pkg/amino/genproto/bindings.go similarity index 99% rename from pkgs/amino/genproto/bindings.go rename to tm2/pkg/amino/genproto/bindings.go index f88ee67d7f8..458d8b14578 100644 --- a/pkgs/amino/genproto/bindings.go +++ b/tm2/pkg/amino/genproto/bindings.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/pkg" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" ) const ( @@ -39,7 +39,7 @@ func GenerateProtoBindingsForTypes(pkg *amino.Package, rtz ...reflect.Type) (fil scope := ast.NewScope(nil) imports := _imports( "proto", "google.golang.org/protobuf/proto", - "amino", "github.com/gnolang/gno/pkgs/amino") + "amino", "github.com/gnolang/gno/tm2/pkg/amino") addImportAuto(imports, scope, pkg.GoPkgName+"pb", pkg.P3GoPkgPath) file.Decls = append(file.Decls, imports) diff --git a/pkgs/amino/genproto/bindings_test.go b/tm2/pkg/amino/genproto/bindings_test.go similarity index 93% rename from pkgs/amino/genproto/bindings_test.go rename to tm2/pkg/amino/genproto/bindings_test.go index 860e63bdedc..295c388def3 100644 --- a/pkgs/amino/genproto/bindings_test.go +++ b/tm2/pkg/amino/genproto/bindings_test.go @@ -6,7 +6,7 @@ import ( "go/token" "testing" - "github.com/gnolang/gno/pkgs/amino/tests" + "github.com/gnolang/gno/tm2/pkg/amino/tests" "github.com/jaekwon/testify/assert" ) diff --git a/pkgs/amino/genproto/camelcase.go b/tm2/pkg/amino/genproto/camelcase.go similarity index 100% rename from pkgs/amino/genproto/camelcase.go rename to tm2/pkg/amino/genproto/camelcase.go diff --git a/pkgs/amino/genproto/example/.gitignore b/tm2/pkg/amino/genproto/example/.gitignore similarity index 100% rename from pkgs/amino/genproto/example/.gitignore rename to tm2/pkg/amino/genproto/example/.gitignore diff --git a/pkgs/amino/genproto/example/README.md b/tm2/pkg/amino/genproto/example/README.md similarity index 100% rename from pkgs/amino/genproto/example/README.md rename to tm2/pkg/amino/genproto/example/README.md diff --git a/pkgs/amino/genproto/example/main.go b/tm2/pkg/amino/genproto/example/main.go similarity index 82% rename from pkgs/amino/genproto/example/main.go rename to tm2/pkg/amino/genproto/example/main.go index 1af8af72ec3..24132305893 100644 --- a/pkgs/amino/genproto/example/main.go +++ b/tm2/pkg/amino/genproto/example/main.go @@ -3,10 +3,10 @@ package main import ( "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/genproto" - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule" - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/genproto" + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule" + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2" ) // amino diff --git a/pkgs/amino/genproto/example/main.proto b/tm2/pkg/amino/genproto/example/main.proto similarity index 53% rename from pkgs/amino/genproto/example/main.proto rename to tm2/pkg/amino/genproto/example/main.proto index 28a947ea6a3..e9cfb8e9554 100644 --- a/pkgs/amino/genproto/example/main.proto +++ b/tm2/pkg/amino/genproto/example/main.proto @@ -1,11 +1,11 @@ syntax = "proto3"; package main; -option go_package = "github.com/gnolang/gno/pkgs/amino/genproto/example/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/pb"; // imports -import "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule/submodule.proto"; -import "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2/submodule2.proto"; +import "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule/submodule.proto"; +import "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2/submodule2.proto"; import "google/protobuf/any.proto"; // messages diff --git a/pkgs/amino/genproto/example/package.go b/tm2/pkg/amino/genproto/example/package.go similarity index 58% rename from pkgs/amino/genproto/example/package.go rename to tm2/pkg/amino/genproto/example/package.go index 595b70c3a73..3e83e276b47 100644 --- a/pkgs/amino/genproto/example/package.go +++ b/tm2/pkg/amino/genproto/example/package.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule" ) var Package = amino.RegisterPackage( @@ -11,7 +11,7 @@ var Package = amino.RegisterPackage( "main", amino.GetCallersDirname(), ).WithP3GoPkgPath( - "github.com/gnolang/gno/pkgs/amino/genproto/example/pb", + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/pb", ).WithDependencies( submodule.Package, ).WithTypes( diff --git a/tm2/pkg/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule/types.proto b/tm2/pkg/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule/types.proto new file mode 100644 index 00000000000..ce83012f548 --- /dev/null +++ b/tm2/pkg/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule/types.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +package submodule; + +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule/pb"; + +// imports +import "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2/types.proto"; + +// messages +message StructSM { + sint64 FieldA = 1; + string FieldB = 2; + submodule2.StructSM2 FieldC = 3; +} \ No newline at end of file diff --git a/pkgs/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule2/types.proto b/tm2/pkg/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule2/types.proto similarity index 55% rename from pkgs/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule2/types.proto rename to tm2/pkg/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule2/types.proto index 242a30ce2dc..4c98a1263fb 100644 --- a/pkgs/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule2/types.proto +++ b/tm2/pkg/amino/genproto/example/proto/github.com/tendermint/go-amino/genproto/example/submodule2/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package submodule2; -option go_package = "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2/pb"; // messages message StructSM2 { diff --git a/pkgs/amino/genproto/example/proto/main/types.proto b/tm2/pkg/amino/genproto/example/proto/main/types.proto similarity index 64% rename from pkgs/amino/genproto/example/proto/main/types.proto rename to tm2/pkg/amino/genproto/example/proto/main/types.proto index b7d5bfd658c..ed107ee5495 100644 --- a/pkgs/amino/genproto/example/proto/main/types.proto +++ b/tm2/pkg/amino/genproto/example/proto/main/types.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package main; -option go_package = "github.com/gnolang/gno/pkgs/amino/genproto/example/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/pb"; // imports -import "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule/types.proto"; +import "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule/types.proto"; import "google/protobuf/any.proto"; // messages diff --git a/pkgs/amino/genproto/example/submodule/package.go b/tm2/pkg/amino/genproto/example/submodule/package.go similarity index 54% rename from pkgs/amino/genproto/example/submodule/package.go rename to tm2/pkg/amino/genproto/example/submodule/package.go index 61636b9ba58..53f5942ccc7 100644 --- a/pkgs/amino/genproto/example/submodule/package.go +++ b/tm2/pkg/amino/genproto/example/submodule/package.go @@ -1,13 +1,13 @@ package submodule import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2" ) var Package = amino.RegisterPackage( amino.NewPackage( - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule", + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule", "submodule", amino.GetCallersDirname(), ).WithDependencies( diff --git a/pkgs/amino/genproto/example/submodule/submodule.go b/tm2/pkg/amino/genproto/example/submodule/submodule.go similarity index 62% rename from pkgs/amino/genproto/example/submodule/submodule.go rename to tm2/pkg/amino/genproto/example/submodule/submodule.go index 2622dbd411a..e20892c9e4e 100644 --- a/pkgs/amino/genproto/example/submodule/submodule.go +++ b/tm2/pkg/amino/genproto/example/submodule/submodule.go @@ -1,7 +1,7 @@ package submodule import ( - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2" + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2" ) type StructSM struct { diff --git a/tm2/pkg/amino/genproto/example/submodule/submodule.proto b/tm2/pkg/amino/genproto/example/submodule/submodule.proto new file mode 100644 index 00000000000..9c33cccd4d6 --- /dev/null +++ b/tm2/pkg/amino/genproto/example/submodule/submodule.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +package submodule; + +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule/pb"; + +// imports +import "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2/submodule2.proto"; + +// messages +message StructSM { + sint64 FieldA = 1; + string FieldB = 2; + submodule2.StructSM2 FieldC = 3; +} \ No newline at end of file diff --git a/pkgs/amino/genproto/example/submodule2/package.go b/tm2/pkg/amino/genproto/example/submodule2/package.go similarity index 60% rename from pkgs/amino/genproto/example/submodule2/package.go rename to tm2/pkg/amino/genproto/example/submodule2/package.go index 0b08faea1af..28dee3def8f 100644 --- a/pkgs/amino/genproto/example/submodule2/package.go +++ b/tm2/pkg/amino/genproto/example/submodule2/package.go @@ -1,12 +1,12 @@ package submodule2 import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage( amino.NewPackage( - "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2", + "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2", "submodule2", amino.GetCallersDirname(), ).WithTypes( diff --git a/pkgs/amino/genproto/example/submodule2/submodule2.go b/tm2/pkg/amino/genproto/example/submodule2/submodule2.go similarity index 100% rename from pkgs/amino/genproto/example/submodule2/submodule2.go rename to tm2/pkg/amino/genproto/example/submodule2/submodule2.go diff --git a/pkgs/amino/genproto/example/submodule2/submodule2.proto b/tm2/pkg/amino/genproto/example/submodule2/submodule2.proto similarity index 55% rename from pkgs/amino/genproto/example/submodule2/submodule2.proto rename to tm2/pkg/amino/genproto/example/submodule2/submodule2.proto index 242a30ce2dc..4c98a1263fb 100644 --- a/pkgs/amino/genproto/example/submodule2/submodule2.proto +++ b/tm2/pkg/amino/genproto/example/submodule2/submodule2.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package submodule2; -option go_package = "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2/pb"; // messages message StructSM2 { diff --git a/pkgs/amino/genproto/genproto.go b/tm2/pkg/amino/genproto/genproto.go similarity index 99% rename from pkgs/amino/genproto/genproto.go rename to tm2/pkg/amino/genproto/genproto.go index 15574fc2cbc..8af73b2690a 100644 --- a/pkgs/amino/genproto/genproto.go +++ b/tm2/pkg/amino/genproto/genproto.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/pkg" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" ) // TODO sort diff --git a/pkgs/amino/genproto/genproto_test.go b/tm2/pkg/amino/genproto/genproto_test.go similarity index 69% rename from pkgs/amino/genproto/genproto_test.go rename to tm2/pkg/amino/genproto/genproto_test.go index 124a0759b52..20a45361519 100644 --- a/pkgs/amino/genproto/genproto_test.go +++ b/tm2/pkg/amino/genproto/genproto_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - sm1 "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule" + sm1 "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule" "github.com/jaekwon/testify/assert" ) @@ -25,16 +25,16 @@ func TestBasic(t *testing.T) { package test; // imports -import "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2/submodule2.proto";`) +import "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2/submodule2.proto";`) p3doc = p3c.GenerateProto3SchemaForTypes(sm1.Package, reflect.TypeOf(obj)) assert.Equal(t, p3doc.Print(), `syntax = "proto3"; package submodule; -option go_package = "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule/pb"; // imports -import "github.com/gnolang/gno/pkgs/amino/genproto/example/submodule2/submodule2.proto"; +import "github.com/gnolang/gno/tm2/pkg/amino/genproto/example/submodule2/submodule2.proto"; // messages message StructSM { diff --git a/pkgs/amino/genproto/reflect.go b/tm2/pkg/amino/genproto/reflect.go similarity index 100% rename from pkgs/amino/genproto/reflect.go rename to tm2/pkg/amino/genproto/reflect.go diff --git a/pkgs/amino/genproto/scanner.go b/tm2/pkg/amino/genproto/scanner.go similarity index 100% rename from pkgs/amino/genproto/scanner.go rename to tm2/pkg/amino/genproto/scanner.go diff --git a/pkgs/amino/genproto/types.go b/tm2/pkg/amino/genproto/types.go similarity index 99% rename from pkgs/amino/genproto/types.go rename to tm2/pkg/amino/genproto/types.go index a98d70a6e3f..a01794de01a 100644 --- a/pkgs/amino/genproto/types.go +++ b/tm2/pkg/amino/genproto/types.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/libs/press" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/libs/press" ) //---------------------------------------- diff --git a/pkgs/amino/genproto/types_test.go b/tm2/pkg/amino/genproto/types_test.go similarity index 100% rename from pkgs/amino/genproto/types_test.go rename to tm2/pkg/amino/genproto/types_test.go diff --git a/pkgs/amino/json_decode.go b/tm2/pkg/amino/json_decode.go similarity index 99% rename from pkgs/amino/json_decode.go rename to tm2/pkg/amino/json_decode.go index 52c8f5d1417..a84f75305c8 100644 --- a/pkgs/amino/json_decode.go +++ b/tm2/pkg/amino/json_decode.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // ---------------------------------------- diff --git a/pkgs/amino/json_encode.go b/tm2/pkg/amino/json_encode.go similarity index 99% rename from pkgs/amino/json_encode.go rename to tm2/pkg/amino/json_encode.go index 6416eef65c5..4113908e593 100644 --- a/pkgs/amino/json_encode.go +++ b/tm2/pkg/amino/json_encode.go @@ -7,7 +7,7 @@ import ( "io" "reflect" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // ---------------------------------------- diff --git a/pkgs/amino/json_test.go b/tm2/pkg/amino/json_test.go similarity index 99% rename from pkgs/amino/json_test.go rename to tm2/pkg/amino/json_test.go index d94b46a6bae..81118080d89 100644 --- a/pkgs/amino/json_test.go +++ b/tm2/pkg/amino/json_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/pkg" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" ) type Dummy struct{} diff --git a/pkgs/amino/libs/detrand/README.md b/tm2/pkg/amino/libs/detrand/README.md similarity index 100% rename from pkgs/amino/libs/detrand/README.md rename to tm2/pkg/amino/libs/detrand/README.md diff --git a/pkgs/amino/libs/detrand/detrand.go b/tm2/pkg/amino/libs/detrand/detrand.go similarity index 100% rename from pkgs/amino/libs/detrand/detrand.go rename to tm2/pkg/amino/libs/detrand/detrand.go diff --git a/pkgs/amino/libs/press/press.go b/tm2/pkg/amino/libs/press/press.go similarity index 98% rename from pkgs/amino/libs/press/press.go rename to tm2/pkg/amino/libs/press/press.go index eff7f1a115c..f29b28a54ef 100755 --- a/pkgs/amino/libs/press/press.go +++ b/tm2/pkg/amino/libs/press/press.go @@ -5,7 +5,7 @@ import ( "math/rand" "strings" - "github.com/gnolang/gno/pkgs/amino/libs/detrand" + "github.com/gnolang/gno/tm2/pkg/amino/libs/detrand" ) type line struct { diff --git a/pkgs/amino/libs/press/press_test.go b/tm2/pkg/amino/libs/press/press_test.go similarity index 100% rename from pkgs/amino/libs/press/press_test.go rename to tm2/pkg/amino/libs/press/press_test.go diff --git a/pkgs/amino/pkg/pkg.go b/tm2/pkg/amino/pkg/pkg.go similarity index 100% rename from pkgs/amino/pkg/pkg.go rename to tm2/pkg/amino/pkg/pkg.go diff --git a/pkgs/amino/pkg/pkg_test.go b/tm2/pkg/amino/pkg/pkg_test.go similarity index 96% rename from pkgs/amino/pkg/pkg_test.go rename to tm2/pkg/amino/pkg/pkg_test.go index ce076dc4b80..2be0b0cefe3 100644 --- a/pkgs/amino/pkg/pkg_test.go +++ b/tm2/pkg/amino/pkg/pkg_test.go @@ -40,7 +40,7 @@ func TestNewPackage(t *testing.T) { func TestFullNameForType(t *testing.T) { // The Go package depends on how this test is invoked. - // Sometimes it is "github.com/gnolang/gno/pkgs/amino/packagepkg_test". + // Sometimes it is "github.com/gnolang/gno/tm2/pkg/amino/packagepkg_test". // Sometimes it is "command-line-arguments" // Sometimes it is "command-line-arguments_test" gopkg := reflect.TypeOf(Foo{}).PkgPath() diff --git a/pkgs/amino/pkg/pkgset.go b/tm2/pkg/amino/pkg/pkgset.go similarity index 100% rename from pkgs/amino/pkg/pkgset.go rename to tm2/pkg/amino/pkg/pkgset.go diff --git a/pkgs/amino/reflect.go b/tm2/pkg/amino/reflect.go similarity index 100% rename from pkgs/amino/reflect.go rename to tm2/pkg/amino/reflect.go diff --git a/pkgs/amino/reflect_test.go b/tm2/pkg/amino/reflect_test.go similarity index 99% rename from pkgs/amino/reflect_test.go rename to tm2/pkg/amino/reflect_test.go index 7ccb317a561..c5c7b6b5c83 100644 --- a/pkgs/amino/reflect_test.go +++ b/tm2/pkg/amino/reflect_test.go @@ -14,8 +14,8 @@ import ( "github.com/jaekwon/testify/require" proto "google.golang.org/protobuf/proto" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) //------------------------------------- diff --git a/pkgs/amino/repr_test.go b/tm2/pkg/amino/repr_test.go similarity index 97% rename from pkgs/amino/repr_test.go rename to tm2/pkg/amino/repr_test.go index 292236418fe..5fb31515fb6 100644 --- a/pkgs/amino/repr_test.go +++ b/tm2/pkg/amino/repr_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/gnolang/gno/pkgs/amino/pkg" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/amino/strings.go b/tm2/pkg/amino/strings.go similarity index 100% rename from pkgs/amino/strings.go rename to tm2/pkg/amino/strings.go diff --git a/pkgs/amino/tests/.gitignore b/tm2/pkg/amino/tests/.gitignore similarity index 100% rename from pkgs/amino/tests/.gitignore rename to tm2/pkg/amino/tests/.gitignore diff --git a/pkgs/amino/tests/TODO.md b/tm2/pkg/amino/tests/TODO.md similarity index 100% rename from pkgs/amino/tests/TODO.md rename to tm2/pkg/amino/tests/TODO.md diff --git a/pkgs/amino/tests/cmd/genproto.go b/tm2/pkg/amino/tests/cmd/genproto.go similarity index 68% rename from pkgs/amino/tests/cmd/genproto.go rename to tm2/pkg/amino/tests/cmd/genproto.go index 67dbe8d657b..3a87d91645d 100644 --- a/pkgs/amino/tests/cmd/genproto.go +++ b/tm2/pkg/amino/tests/cmd/genproto.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gnolang/gno/pkgs/amino/genproto" - "github.com/gnolang/gno/pkgs/amino/tests" + "github.com/gnolang/gno/tm2/pkg/amino/genproto" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) func main() { diff --git a/pkgs/amino/tests/common.go b/tm2/pkg/amino/tests/common.go similarity index 100% rename from pkgs/amino/tests/common.go rename to tm2/pkg/amino/tests/common.go diff --git a/pkgs/amino/tests/fuzz/binary/binary.go b/tm2/pkg/amino/tests/fuzz/binary/binary.go similarity index 79% rename from pkgs/amino/tests/fuzz/binary/binary.go rename to tm2/pkg/amino/tests/fuzz/binary/binary.go index cbf5c347651..68b7ba4daa6 100644 --- a/pkgs/amino/tests/fuzz/binary/binary.go +++ b/tm2/pkg/amino/tests/fuzz/binary/binary.go @@ -1,8 +1,8 @@ package fuzzbinary import ( - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) //------------------------------------- diff --git a/pkgs/amino/tests/fuzz/binary/corpus/0 b/tm2/pkg/amino/tests/fuzz/binary/corpus/0 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/0 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/0 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/01acee15a5368a1fc8a155a04d59bfc6858c231e-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/01acee15a5368a1fc8a155a04d59bfc6858c231e-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/01acee15a5368a1fc8a155a04d59bfc6858c231e-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/01acee15a5368a1fc8a155a04d59bfc6858c231e-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/02fd01713e392c756d7dbca43d07eb8282cd05ef-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/02fd01713e392c756d7dbca43d07eb8282cd05ef-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/02fd01713e392c756d7dbca43d07eb8282cd05ef-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/02fd01713e392c756d7dbca43d07eb8282cd05ef-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/030b660bba10b55324f0f842882c71fb088ed235-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/030b660bba10b55324f0f842882c71fb088ed235-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/030b660bba10b55324f0f842882c71fb088ed235-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/030b660bba10b55324f0f842882c71fb088ed235-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/08390177aebf5d3dadee6cde544f5617146867a6-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/08390177aebf5d3dadee6cde544f5617146867a6-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/08390177aebf5d3dadee6cde544f5617146867a6-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/08390177aebf5d3dadee6cde544f5617146867a6-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/083b03a77d3ae9fae95fbaddb6df66a8c44bb55d-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/083b03a77d3ae9fae95fbaddb6df66a8c44bb55d-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/083b03a77d3ae9fae95fbaddb6df66a8c44bb55d-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/083b03a77d3ae9fae95fbaddb6df66a8c44bb55d-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/08fc146e8d87a80266900179b0db36efdb3899ab-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/08fc146e8d87a80266900179b0db36efdb3899ab-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/08fc146e8d87a80266900179b0db36efdb3899ab-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/08fc146e8d87a80266900179b0db36efdb3899ab-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/0d94bc42397422c854af1122fbf912fadba6a117-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/0d94bc42397422c854af1122fbf912fadba6a117-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/0d94bc42397422c854af1122fbf912fadba6a117-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/0d94bc42397422c854af1122fbf912fadba6a117-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/0e078288e8f7c32133c742abcde47b743c344c6d-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/0e078288e8f7c32133c742abcde47b743c344c6d-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/0e078288e8f7c32133c742abcde47b743c344c6d-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/0e078288e8f7c32133c742abcde47b743c344c6d-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/0ebb7f3bf45472edf8ccce1f70f7eca9e853c18b-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/0ebb7f3bf45472edf8ccce1f70f7eca9e853c18b-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/0ebb7f3bf45472edf8ccce1f70f7eca9e853c18b-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/0ebb7f3bf45472edf8ccce1f70f7eca9e853c18b-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/10 b/tm2/pkg/amino/tests/fuzz/binary/corpus/10 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/10 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/10 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/106e766e6f76b0ad1e1428b92a1c308aa1f531c4-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/106e766e6f76b0ad1e1428b92a1c308aa1f531c4-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/106e766e6f76b0ad1e1428b92a1c308aa1f531c4-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/106e766e6f76b0ad1e1428b92a1c308aa1f531c4-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/11 b/tm2/pkg/amino/tests/fuzz/binary/corpus/11 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/11 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/11 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/12 b/tm2/pkg/amino/tests/fuzz/binary/corpus/12 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/12 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/12 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/13 b/tm2/pkg/amino/tests/fuzz/binary/corpus/13 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/13 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/13 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/14 b/tm2/pkg/amino/tests/fuzz/binary/corpus/14 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/14 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/14 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/15 b/tm2/pkg/amino/tests/fuzz/binary/corpus/15 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/15 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/15 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/16 b/tm2/pkg/amino/tests/fuzz/binary/corpus/16 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/16 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/16 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/17 b/tm2/pkg/amino/tests/fuzz/binary/corpus/17 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/17 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/17 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/18 b/tm2/pkg/amino/tests/fuzz/binary/corpus/18 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/18 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/18 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/1845e51c120f6107bf4fdb7567bac6d3b9e6b7e2-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/1845e51c120f6107bf4fdb7567bac6d3b9e6b7e2-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/1845e51c120f6107bf4fdb7567bac6d3b9e6b7e2-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/1845e51c120f6107bf4fdb7567bac6d3b9e6b7e2-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/18c8318f66ad71dce07bf8acb23671d2e9374d7c-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/18c8318f66ad71dce07bf8acb23671d2e9374d7c-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/18c8318f66ad71dce07bf8acb23671d2e9374d7c-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/18c8318f66ad71dce07bf8acb23671d2e9374d7c-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/19 b/tm2/pkg/amino/tests/fuzz/binary/corpus/19 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/19 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/19 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/1a1322d7e67d0c91a419f731c8eb8655cf2f2b72-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/1a1322d7e67d0c91a419f731c8eb8655cf2f2b72-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/1a1322d7e67d0c91a419f731c8eb8655cf2f2b72-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/1a1322d7e67d0c91a419f731c8eb8655cf2f2b72-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/1a88f78548ef862732e556d1eb6cf5f1d5d97f97-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/1a88f78548ef862732e556d1eb6cf5f1d5d97f97-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/1a88f78548ef862732e556d1eb6cf5f1d5d97f97-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/1a88f78548ef862732e556d1eb6cf5f1d5d97f97-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/1d21b6d37ed0bf4b4f5db5d360e439d66899fdd4-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/1d21b6d37ed0bf4b4f5db5d360e439d66899fdd4-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/1d21b6d37ed0bf4b4f5db5d360e439d66899fdd4-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/1d21b6d37ed0bf4b4f5db5d360e439d66899fdd4-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/1f3a5764a6e389c81a4f0caa94d1167ffd746aa7-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/1f3a5764a6e389c81a4f0caa94d1167ffd746aa7-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/1f3a5764a6e389c81a4f0caa94d1167ffd746aa7-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/1f3a5764a6e389c81a4f0caa94d1167ffd746aa7-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/20 b/tm2/pkg/amino/tests/fuzz/binary/corpus/20 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/20 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/20 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/21 b/tm2/pkg/amino/tests/fuzz/binary/corpus/21 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/21 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/21 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/22 b/tm2/pkg/amino/tests/fuzz/binary/corpus/22 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/22 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/22 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/23720a6ad22800bd497cd8bde5e49a3d09e8ec12-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/23720a6ad22800bd497cd8bde5e49a3d09e8ec12-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/23720a6ad22800bd497cd8bde5e49a3d09e8ec12-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/23720a6ad22800bd497cd8bde5e49a3d09e8ec12-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/23813b040943e9aac6bd3efa6d28594466c3c07f-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/23813b040943e9aac6bd3efa6d28594466c3c07f-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/23813b040943e9aac6bd3efa6d28594466c3c07f-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/23813b040943e9aac6bd3efa6d28594466c3c07f-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/2732d31374a66ca1b6178271028a2254a544733c-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/2732d31374a66ca1b6178271028a2254a544733c-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/2732d31374a66ca1b6178271028a2254a544733c-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/2732d31374a66ca1b6178271028a2254a544733c-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/305500239502ac97489beab4b8fc31d24000e40e-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/305500239502ac97489beab4b8fc31d24000e40e-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/305500239502ac97489beab4b8fc31d24000e40e-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/305500239502ac97489beab4b8fc31d24000e40e-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/38912a28992e6257151d30d56b49071b802efb15-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/38912a28992e6257151d30d56b49071b802efb15-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/38912a28992e6257151d30d56b49071b802efb15-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/38912a28992e6257151d30d56b49071b802efb15-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/39ddd2817097366f9a0d74b2c5e835bd894de002-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/39ddd2817097366f9a0d74b2c5e835bd894de002-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/39ddd2817097366f9a0d74b2c5e835bd894de002-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/39ddd2817097366f9a0d74b2c5e835bd894de002-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/3ab4e98a5574b6d702ec59c0fea954c8383db14e-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/3ab4e98a5574b6d702ec59c0fea954c8383db14e-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/3ab4e98a5574b6d702ec59c0fea954c8383db14e-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/3ab4e98a5574b6d702ec59c0fea954c8383db14e-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/3d4c75531c90d429677736d33d08ba1915b9b8b3-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/3d4c75531c90d429677736d33d08ba1915b9b8b3-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/3d4c75531c90d429677736d33d08ba1915b9b8b3-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/3d4c75531c90d429677736d33d08ba1915b9b8b3-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/3e65b87472de8175b06c13e4b6109e4bd6272eb5-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/3e65b87472de8175b06c13e4b6109e4bd6272eb5-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/3e65b87472de8175b06c13e4b6109e4bd6272eb5-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/3e65b87472de8175b06c13e4b6109e4bd6272eb5-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/4 b/tm2/pkg/amino/tests/fuzz/binary/corpus/4 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/4 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/4 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/44dd377a6c958660caad2eedcc103b0f5dd721b2-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/44dd377a6c958660caad2eedcc103b0f5dd721b2-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/44dd377a6c958660caad2eedcc103b0f5dd721b2-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/44dd377a6c958660caad2eedcc103b0f5dd721b2-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/457fc4438b32e9e0032442bd74dbfa81dab2c9ed-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/457fc4438b32e9e0032442bd74dbfa81dab2c9ed-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/457fc4438b32e9e0032442bd74dbfa81dab2c9ed-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/457fc4438b32e9e0032442bd74dbfa81dab2c9ed-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/466c89c073c82472583c4f68b7c6bab61e75d632-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/466c89c073c82472583c4f68b7c6bab61e75d632-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/466c89c073c82472583c4f68b7c6bab61e75d632-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/466c89c073c82472583c4f68b7c6bab61e75d632-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/48618a2f076f6e8d0e13a9742e8451b37b214e9a-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/48618a2f076f6e8d0e13a9742e8451b37b214e9a-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/48618a2f076f6e8d0e13a9742e8451b37b214e9a-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/48618a2f076f6e8d0e13a9742e8451b37b214e9a-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/4ae74b45305fdf637069d16eeaca5c1640e4c7e4-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/4ae74b45305fdf637069d16eeaca5c1640e4c7e4-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/4ae74b45305fdf637069d16eeaca5c1640e4c7e4-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/4ae74b45305fdf637069d16eeaca5c1640e4c7e4-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/5 b/tm2/pkg/amino/tests/fuzz/binary/corpus/5 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/5 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/5 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/50d1b1179de48a0754bf4fec67b3b722395bfb98-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/50d1b1179de48a0754bf4fec67b3b722395bfb98-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/50d1b1179de48a0754bf4fec67b3b722395bfb98-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/50d1b1179de48a0754bf4fec67b3b722395bfb98-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/52b077a392487037791c8c66e284d22bb8a0b240-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/52b077a392487037791c8c66e284d22bb8a0b240-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/52b077a392487037791c8c66e284d22bb8a0b240-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/52b077a392487037791c8c66e284d22bb8a0b240-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/53880403e3908de2ec119993db918bea286956d5-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/53880403e3908de2ec119993db918bea286956d5-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/53880403e3908de2ec119993db918bea286956d5-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/53880403e3908de2ec119993db918bea286956d5-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/552e32d205c6a8bca82018d613d6760664ec7b47-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/552e32d205c6a8bca82018d613d6760664ec7b47-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/552e32d205c6a8bca82018d613d6760664ec7b47-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/552e32d205c6a8bca82018d613d6760664ec7b47-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/57550602b4e25b4b7423463114257c75a2316cf0-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/57550602b4e25b4b7423463114257c75a2316cf0-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/57550602b4e25b4b7423463114257c75a2316cf0-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/57550602b4e25b4b7423463114257c75a2316cf0-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/58035bb9673669c95a1a10a2251eeee03613f91d-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/58035bb9673669c95a1a10a2251eeee03613f91d-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/58035bb9673669c95a1a10a2251eeee03613f91d-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/58035bb9673669c95a1a10a2251eeee03613f91d-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/58d017d3dfa78bb3ac42af7cb8b1df45eaa14108-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/58d017d3dfa78bb3ac42af7cb8b1df45eaa14108-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/58d017d3dfa78bb3ac42af7cb8b1df45eaa14108-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/58d017d3dfa78bb3ac42af7cb8b1df45eaa14108-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/5b1cfc34db4005aa89582134618483033386e928-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/5b1cfc34db4005aa89582134618483033386e928-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/5b1cfc34db4005aa89582134618483033386e928-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/5b1cfc34db4005aa89582134618483033386e928-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/5b37f959a2e23e877770c4bfaa64427b254e0a70-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/5b37f959a2e23e877770c4bfaa64427b254e0a70-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/5b37f959a2e23e877770c4bfaa64427b254e0a70-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/5b37f959a2e23e877770c4bfaa64427b254e0a70-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/5e2f6c12b8a46245ad5100490b831f3880436b3e-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/5e2f6c12b8a46245ad5100490b831f3880436b3e-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/5e2f6c12b8a46245ad5100490b831f3880436b3e-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/5e2f6c12b8a46245ad5100490b831f3880436b3e-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/5e489d15ea9372a9aa7737dac6f54f8f7f33337a-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/5e489d15ea9372a9aa7737dac6f54f8f7f33337a-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/5e489d15ea9372a9aa7737dac6f54f8f7f33337a-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/5e489d15ea9372a9aa7737dac6f54f8f7f33337a-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/6 b/tm2/pkg/amino/tests/fuzz/binary/corpus/6 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/6 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/6 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/63663e11760bc9a81c6454a2e19d1f1efa09ed06-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/63663e11760bc9a81c6454a2e19d1f1efa09ed06-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/63663e11760bc9a81c6454a2e19d1f1efa09ed06-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/63663e11760bc9a81c6454a2e19d1f1efa09ed06-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/653e90cfaa588a467d808f02a09763f916e50e58-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/653e90cfaa588a467d808f02a09763f916e50e58-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/653e90cfaa588a467d808f02a09763f916e50e58-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/653e90cfaa588a467d808f02a09763f916e50e58-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/6546865c0c1d0c684e8af4c091561e64cd175558-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/6546865c0c1d0c684e8af4c091561e64cd175558-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/6546865c0c1d0c684e8af4c091561e64cd175558-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/6546865c0c1d0c684e8af4c091561e64cd175558-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/6e00143b704015374af032ba7f4e2af6733540bc-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/6e00143b704015374af032ba7f4e2af6733540bc-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/6e00143b704015374af032ba7f4e2af6733540bc-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/6e00143b704015374af032ba7f4e2af6733540bc-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/6ed9a0c7a9f3babc48349ddb71e0e9a30bc8a426-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/6ed9a0c7a9f3babc48349ddb71e0e9a30bc8a426-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/6ed9a0c7a9f3babc48349ddb71e0e9a30bc8a426-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/6ed9a0c7a9f3babc48349ddb71e0e9a30bc8a426-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/7 b/tm2/pkg/amino/tests/fuzz/binary/corpus/7 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/7 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/7 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/72309d3ba36dad8a37d29da7913fd03166ce463d-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/72309d3ba36dad8a37d29da7913fd03166ce463d-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/72309d3ba36dad8a37d29da7913fd03166ce463d-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/72309d3ba36dad8a37d29da7913fd03166ce463d-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/73fe3bc3d9968891c07d5f23c776fc25409e1921-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/73fe3bc3d9968891c07d5f23c776fc25409e1921-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/73fe3bc3d9968891c07d5f23c776fc25409e1921-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/73fe3bc3d9968891c07d5f23c776fc25409e1921-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/750b416f4eee7239c949fda22d00e77cfde7b8fe-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/750b416f4eee7239c949fda22d00e77cfde7b8fe-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/750b416f4eee7239c949fda22d00e77cfde7b8fe-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/750b416f4eee7239c949fda22d00e77cfde7b8fe-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/750edb320e41c096bbd46f4d65ca51a4c037fa1d-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/750edb320e41c096bbd46f4d65ca51a4c037fa1d-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/750edb320e41c096bbd46f4d65ca51a4c037fa1d-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/750edb320e41c096bbd46f4d65ca51a4c037fa1d-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/77a55e8dd56f4428497116b91d4c0c3ba932425c-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/77a55e8dd56f4428497116b91d4c0c3ba932425c-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/77a55e8dd56f4428497116b91d4c0c3ba932425c-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/77a55e8dd56f4428497116b91d4c0c3ba932425c-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/7e0f33f31146ab6b732ce190d255c0850d18dba2-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/7e0f33f31146ab6b732ce190d255c0850d18dba2-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/7e0f33f31146ab6b732ce190d255c0850d18dba2-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/7e0f33f31146ab6b732ce190d255c0850d18dba2-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/8 b/tm2/pkg/amino/tests/fuzz/binary/corpus/8 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/8 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/8 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/803c677a48762b5ee145415669003570272bfe54-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/803c677a48762b5ee145415669003570272bfe54-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/803c677a48762b5ee145415669003570272bfe54-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/803c677a48762b5ee145415669003570272bfe54-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/80ec71c2de3f52fd31acfb36fd812475c5ad79c3-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/80ec71c2de3f52fd31acfb36fd812475c5ad79c3-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/80ec71c2de3f52fd31acfb36fd812475c5ad79c3-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/80ec71c2de3f52fd31acfb36fd812475c5ad79c3-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/80f9dae973cfcd7ce6412458af61777869f959f5-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/80f9dae973cfcd7ce6412458af61777869f959f5-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/80f9dae973cfcd7ce6412458af61777869f959f5-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/80f9dae973cfcd7ce6412458af61777869f959f5-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/826ce2217f5b7e5225cceb62300c45308e526f9f-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/826ce2217f5b7e5225cceb62300c45308e526f9f-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/826ce2217f5b7e5225cceb62300c45308e526f9f-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/826ce2217f5b7e5225cceb62300c45308e526f9f-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/865b10f898a7ff8210e9dff2c036da993ed9473b-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/865b10f898a7ff8210e9dff2c036da993ed9473b-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/865b10f898a7ff8210e9dff2c036da993ed9473b-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/865b10f898a7ff8210e9dff2c036da993ed9473b-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/88d7e5805b9cbba29ba5f207f5af26534a0753a7-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/88d7e5805b9cbba29ba5f207f5af26534a0753a7-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/88d7e5805b9cbba29ba5f207f5af26534a0753a7-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/88d7e5805b9cbba29ba5f207f5af26534a0753a7-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/8a0a9994df0d4178aef4bac188abd872630fe8e0-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/8a0a9994df0d4178aef4bac188abd872630fe8e0-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/8a0a9994df0d4178aef4bac188abd872630fe8e0-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/8a0a9994df0d4178aef4bac188abd872630fe8e0-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/8b94e70d4dd630ef5a16057aa9c8af5cc4335729-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/8b94e70d4dd630ef5a16057aa9c8af5cc4335729-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/8b94e70d4dd630ef5a16057aa9c8af5cc4335729-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/8b94e70d4dd630ef5a16057aa9c8af5cc4335729-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/8c8a41178e62c995bcbd605c14c6666ba1a861ba-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/8c8a41178e62c995bcbd605c14c6666ba1a861ba-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/8c8a41178e62c995bcbd605c14c6666ba1a861ba-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/8c8a41178e62c995bcbd605c14c6666ba1a861ba-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/8eb163265937e85a41027db275fa5898adeaa460-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/8eb163265937e85a41027db275fa5898adeaa460-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/8eb163265937e85a41027db275fa5898adeaa460-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/8eb163265937e85a41027db275fa5898adeaa460-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/9 b/tm2/pkg/amino/tests/fuzz/binary/corpus/9 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/9 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/9 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/9123a619a390ada508c078d1ec73b75004360949-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/9123a619a390ada508c078d1ec73b75004360949-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/9123a619a390ada508c078d1ec73b75004360949-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/9123a619a390ada508c078d1ec73b75004360949-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/9699090e884830ad5d5802b6d847362037505f84-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/9699090e884830ad5d5802b6d847362037505f84-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/9699090e884830ad5d5802b6d847362037505f84-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/9699090e884830ad5d5802b6d847362037505f84-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/97650185b02b58197a42e293b89eab4596b7bcf0-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/97650185b02b58197a42e293b89eab4596b7bcf0-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/97650185b02b58197a42e293b89eab4596b7bcf0-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/97650185b02b58197a42e293b89eab4596b7bcf0-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/976d6676b833079042b43c9452a029f4ed4309e2-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/976d6676b833079042b43c9452a029f4ed4309e2-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/976d6676b833079042b43c9452a029f4ed4309e2-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/976d6676b833079042b43c9452a029f4ed4309e2-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/98781eb8e14ed3b9651f13ceb2585d06b0250655-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/98781eb8e14ed3b9651f13ceb2585d06b0250655-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/98781eb8e14ed3b9651f13ceb2585d06b0250655-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/98781eb8e14ed3b9651f13ceb2585d06b0250655-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/98d6d3fe31c91fd5728e089d436139cd04e10928-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/98d6d3fe31c91fd5728e089d436139cd04e10928-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/98d6d3fe31c91fd5728e089d436139cd04e10928-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/98d6d3fe31c91fd5728e089d436139cd04e10928-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/990b91c7304bf24b5ff69b33c2fa0acd39f4bf88-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/990b91c7304bf24b5ff69b33c2fa0acd39f4bf88-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/990b91c7304bf24b5ff69b33c2fa0acd39f4bf88-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/990b91c7304bf24b5ff69b33c2fa0acd39f4bf88-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/9c7bff3023d0b9f5c303307ffd7095fdd3bd8e54-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/9c7bff3023d0b9f5c303307ffd7095fdd3bd8e54-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/9c7bff3023d0b9f5c303307ffd7095fdd3bd8e54-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/9c7bff3023d0b9f5c303307ffd7095fdd3bd8e54-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/9f41a2692b3608d6b2bb35ad344fd1818adaff1f-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/9f41a2692b3608d6b2bb35ad344fd1818adaff1f-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/9f41a2692b3608d6b2bb35ad344fd1818adaff1f-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/9f41a2692b3608d6b2bb35ad344fd1818adaff1f-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a0f4018832c5a0d07c41360b8833d98dd8dadfb6-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a0f4018832c5a0d07c41360b8833d98dd8dadfb6-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a0f4018832c5a0d07c41360b8833d98dd8dadfb6-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a0f4018832c5a0d07c41360b8833d98dd8dadfb6-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a1a9b3709ab30f4cc48207c5288cf01cce3fa222-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a1a9b3709ab30f4cc48207c5288cf01cce3fa222-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a1a9b3709ab30f4cc48207c5288cf01cce3fa222-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a1a9b3709ab30f4cc48207c5288cf01cce3fa222-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a30500eb505f87caf21c35bb62ded318e23cecda-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a30500eb505f87caf21c35bb62ded318e23cecda-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a30500eb505f87caf21c35bb62ded318e23cecda-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a30500eb505f87caf21c35bb62ded318e23cecda-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a33235d9f709539a4803ec8dbbc5438a3de55643-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a33235d9f709539a4803ec8dbbc5438a3de55643-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a33235d9f709539a4803ec8dbbc5438a3de55643-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a33235d9f709539a4803ec8dbbc5438a3de55643-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a5c5777b00475a841ae4ed3e6f69cce78ff816b4-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a5c5777b00475a841ae4ed3e6f69cce78ff816b4-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a5c5777b00475a841ae4ed3e6f69cce78ff816b4-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a5c5777b00475a841ae4ed3e6f69cce78ff816b4-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a7e530350d4f467a32c02825a534f53b18893858-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a7e530350d4f467a32c02825a534f53b18893858-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a7e530350d4f467a32c02825a534f53b18893858-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a7e530350d4f467a32c02825a534f53b18893858-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a7f8e9f3d94d1040571591b269471266791cf43d-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a7f8e9f3d94d1040571591b269471266791cf43d-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a7f8e9f3d94d1040571591b269471266791cf43d-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a7f8e9f3d94d1040571591b269471266791cf43d-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a9440ad272efbbe5dea62e73666c5abc8388d451-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a9440ad272efbbe5dea62e73666c5abc8388d451-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a9440ad272efbbe5dea62e73666c5abc8388d451-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a9440ad272efbbe5dea62e73666c5abc8388d451-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/a9a31bcb5b023beb2b6110636bfada5761ec30e0-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/a9a31bcb5b023beb2b6110636bfada5761ec30e0-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/a9a31bcb5b023beb2b6110636bfada5761ec30e0-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/a9a31bcb5b023beb2b6110636bfada5761ec30e0-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/abd6f66e704214f49a9be1ad0482c87550f61707-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/abd6f66e704214f49a9be1ad0482c87550f61707-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/abd6f66e704214f49a9be1ad0482c87550f61707-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/abd6f66e704214f49a9be1ad0482c87550f61707-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/acf85168fca9555943b822a47a49986b89ca3ef6-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/acf85168fca9555943b822a47a49986b89ca3ef6-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/acf85168fca9555943b822a47a49986b89ca3ef6-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/acf85168fca9555943b822a47a49986b89ca3ef6-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/b0d9576c843f7816bf13cfd85254e4c0c62eabd3-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/b0d9576c843f7816bf13cfd85254e4c0c62eabd3-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/b0d9576c843f7816bf13cfd85254e4c0c62eabd3-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/b0d9576c843f7816bf13cfd85254e4c0c62eabd3-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/b2dd533afcb461f92fc56d063072861748c86fff-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/b2dd533afcb461f92fc56d063072861748c86fff-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/b2dd533afcb461f92fc56d063072861748c86fff-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/b2dd533afcb461f92fc56d063072861748c86fff-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/b8617806994447076daad3fcb680af5ef4b6a3b8-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/b8617806994447076daad3fcb680af5ef4b6a3b8-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/b8617806994447076daad3fcb680af5ef4b6a3b8-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/b8617806994447076daad3fcb680af5ef4b6a3b8-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/bbd777ed7dc26f941d37dc36b2c3e7d54031b1f6-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/bbd777ed7dc26f941d37dc36b2c3e7d54031b1f6-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/bbd777ed7dc26f941d37dc36b2c3e7d54031b1f6-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/bbd777ed7dc26f941d37dc36b2c3e7d54031b1f6-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/c582dc207165d070c663eba26165aadb9e565309-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/c582dc207165d070c663eba26165aadb9e565309-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/c582dc207165d070c663eba26165aadb9e565309-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/c582dc207165d070c663eba26165aadb9e565309-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/c62e6f09746f527b21df3925ec818108b3235bf4-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/c62e6f09746f527b21df3925ec818108b3235bf4-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/c62e6f09746f527b21df3925ec818108b3235bf4-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/c62e6f09746f527b21df3925ec818108b3235bf4-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/c76c8abda1b618aeae69b4fc7d80f56a7c076d30-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/c76c8abda1b618aeae69b4fc7d80f56a7c076d30-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/c76c8abda1b618aeae69b4fc7d80f56a7c076d30-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/c76c8abda1b618aeae69b4fc7d80f56a7c076d30-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/c897adf6db4243e588d054bebfeb891896774b7f-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/c897adf6db4243e588d054bebfeb891896774b7f-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/c897adf6db4243e588d054bebfeb891896774b7f-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/c897adf6db4243e588d054bebfeb891896774b7f-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/cf39a414421728611921f34c423d6e4ec74e8482-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/cf39a414421728611921f34c423d6e4ec74e8482-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/cf39a414421728611921f34c423d6e4ec74e8482-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/cf39a414421728611921f34c423d6e4ec74e8482-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/d26a3f267aa64d8f69e9f5f1bfca108ecda43bc7-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/d26a3f267aa64d8f69e9f5f1bfca108ecda43bc7-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/d26a3f267aa64d8f69e9f5f1bfca108ecda43bc7-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/d26a3f267aa64d8f69e9f5f1bfca108ecda43bc7-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/d44aff14216476b1f9c0900a13f0aac8e76cfd37-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/d44aff14216476b1f9c0900a13f0aac8e76cfd37-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/d44aff14216476b1f9c0900a13f0aac8e76cfd37-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/d44aff14216476b1f9c0900a13f0aac8e76cfd37-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/d67191e6f4d64ab9f32aa4825e1e35813e78c469-4 b/tm2/pkg/amino/tests/fuzz/binary/corpus/d67191e6f4d64ab9f32aa4825e1e35813e78c469-4 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/d67191e6f4d64ab9f32aa4825e1e35813e78c469-4 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/d67191e6f4d64ab9f32aa4825e1e35813e78c469-4 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/d95ef7afab00d7a8c7b6340855385151b57db1a7-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/d95ef7afab00d7a8c7b6340855385151b57db1a7-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/d95ef7afab00d7a8c7b6340855385151b57db1a7-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/d95ef7afab00d7a8c7b6340855385151b57db1a7-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/dae0a930dad9d6b2c471859c1068fbe7f552a16c-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/dae0a930dad9d6b2c471859c1068fbe7f552a16c-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/dae0a930dad9d6b2c471859c1068fbe7f552a16c-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/dae0a930dad9d6b2c471859c1068fbe7f552a16c-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/dde0cae37f4cfc4fa27054714930cb3ebe11f28c-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/dde0cae37f4cfc4fa27054714930cb3ebe11f28c-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/dde0cae37f4cfc4fa27054714930cb3ebe11f28c-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/dde0cae37f4cfc4fa27054714930cb3ebe11f28c-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/de21aec9ee53801fd96413268f1b4868a8c6f803-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/de21aec9ee53801fd96413268f1b4868a8c6f803-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/de21aec9ee53801fd96413268f1b4868a8c6f803-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/de21aec9ee53801fd96413268f1b4868a8c6f803-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/e084c3298741aa39668a06d29605a6ee36b3737a-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/e084c3298741aa39668a06d29605a6ee36b3737a-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/e084c3298741aa39668a06d29605a6ee36b3737a-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/e084c3298741aa39668a06d29605a6ee36b3737a-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/e1f20eb546ba170cb46a828a0b2e2d920c37d3aa-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/e1f20eb546ba170cb46a828a0b2e2d920c37d3aa-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/e1f20eb546ba170cb46a828a0b2e2d920c37d3aa-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/e1f20eb546ba170cb46a828a0b2e2d920c37d3aa-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/e3487402d9843c4b9bd9ed7bf31dc68d6a11aa01-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/e3487402d9843c4b9bd9ed7bf31dc68d6a11aa01-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/e3487402d9843c4b9bd9ed7bf31dc68d6a11aa01-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/e3487402d9843c4b9bd9ed7bf31dc68d6a11aa01-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/e7708501405299b732d7015536ce26da05f99cfa-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/e7708501405299b732d7015536ce26da05f99cfa-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/e7708501405299b732d7015536ce26da05f99cfa-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/e7708501405299b732d7015536ce26da05f99cfa-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/e886084b84143f308ae202930340bf60b7269c89-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/e886084b84143f308ae202930340bf60b7269c89-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/e886084b84143f308ae202930340bf60b7269c89-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/e886084b84143f308ae202930340bf60b7269c89-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/eae84ea9fa17c9f742d3c2b756903513a8b355df-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/eae84ea9fa17c9f742d3c2b756903513a8b355df-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/eae84ea9fa17c9f742d3c2b756903513a8b355df-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/eae84ea9fa17c9f742d3c2b756903513a8b355df-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/ef697127acdc2370298cf11b1f5272a065e01272-3 b/tm2/pkg/amino/tests/fuzz/binary/corpus/ef697127acdc2370298cf11b1f5272a065e01272-3 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/ef697127acdc2370298cf11b1f5272a065e01272-3 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/ef697127acdc2370298cf11b1f5272a065e01272-3 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f08b72dcfcdd73dea6edc9b2c8b50002aefa09bb-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f08b72dcfcdd73dea6edc9b2c8b50002aefa09bb-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f08b72dcfcdd73dea6edc9b2c8b50002aefa09bb-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f08b72dcfcdd73dea6edc9b2c8b50002aefa09bb-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f2f8728b5f813864ed2763c8fabbb4a84d92187f-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f2f8728b5f813864ed2763c8fabbb4a84d92187f-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f2f8728b5f813864ed2763c8fabbb4a84d92187f-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f2f8728b5f813864ed2763c8fabbb4a84d92187f-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f43c1fc17fe691399bbadbb79393e9de235e98e4-4 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f43c1fc17fe691399bbadbb79393e9de235e98e4-4 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f43c1fc17fe691399bbadbb79393e9de235e98e4-4 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f43c1fc17fe691399bbadbb79393e9de235e98e4-4 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f60ab6608822f845897af9f9a2aa7fd469e70184-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f60ab6608822f845897af9f9a2aa7fd469e70184-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f60ab6608822f845897af9f9a2aa7fd469e70184-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f60ab6608822f845897af9f9a2aa7fd469e70184-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f7c51214a5556b9edd4c29ec6262bc8b44b381a5-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f7c51214a5556b9edd4c29ec6262bc8b44b381a5-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f7c51214a5556b9edd4c29ec6262bc8b44b381a5-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f7c51214a5556b9edd4c29ec6262bc8b44b381a5-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f8c3a77c909268fc9824319e55598e895093bbf9-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f8c3a77c909268fc9824319e55598e895093bbf9-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f8c3a77c909268fc9824319e55598e895093bbf9-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f8c3a77c909268fc9824319e55598e895093bbf9-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f9c21675026cc5e66ee678a9c4ca2ac551fd848b-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f9c21675026cc5e66ee678a9c4ca2ac551fd848b-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f9c21675026cc5e66ee678a9c4ca2ac551fd848b-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f9c21675026cc5e66ee678a9c4ca2ac551fd848b-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/f9eae1951902d3785a035cd5ed64a4982bf07809-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/f9eae1951902d3785a035cd5ed64a4982bf07809-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/f9eae1951902d3785a035cd5ed64a4982bf07809-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/f9eae1951902d3785a035cd5ed64a4982bf07809-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/fab0344d1e124eff1a9498f5d375660d846168d2-1 b/tm2/pkg/amino/tests/fuzz/binary/corpus/fab0344d1e124eff1a9498f5d375660d846168d2-1 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/fab0344d1e124eff1a9498f5d375660d846168d2-1 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/fab0344d1e124eff1a9498f5d375660d846168d2-1 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/fb585f1e087fa14cf381c27175627d44cfc42945-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/fb585f1e087fa14cf381c27175627d44cfc42945-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/fb585f1e087fa14cf381c27175627d44cfc42945-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/fb585f1e087fa14cf381c27175627d44cfc42945-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/fef7ee8417ac1760f53384731355dec62f858f27-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/fef7ee8417ac1760f53384731355dec62f858f27-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/fef7ee8417ac1760f53384731355dec62f858f27-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/fef7ee8417ac1760f53384731355dec62f858f27-2 diff --git a/pkgs/amino/tests/fuzz/binary/corpus/ff2bd68ad466755d5f20227f47556f9db3bbc91d-2 b/tm2/pkg/amino/tests/fuzz/binary/corpus/ff2bd68ad466755d5f20227f47556f9db3bbc91d-2 similarity index 100% rename from pkgs/amino/tests/fuzz/binary/corpus/ff2bd68ad466755d5f20227f47556f9db3bbc91d-2 rename to tm2/pkg/amino/tests/fuzz/binary/corpus/ff2bd68ad466755d5f20227f47556f9db3bbc91d-2 diff --git a/pkgs/amino/tests/fuzz/binary/debug/main.go b/tm2/pkg/amino/tests/fuzz/binary/debug/main.go similarity index 80% rename from pkgs/amino/tests/fuzz/binary/debug/main.go rename to tm2/pkg/amino/tests/fuzz/binary/debug/main.go index 90ec69faad9..323d80fb154 100644 --- a/pkgs/amino/tests/fuzz/binary/debug/main.go +++ b/tm2/pkg/amino/tests/fuzz/binary/debug/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) func main() { diff --git a/pkgs/amino/tests/fuzz/binary/init-corpus/main.go b/tm2/pkg/amino/tests/fuzz/binary/init-corpus/main.go similarity index 98% rename from pkgs/amino/tests/fuzz/binary/init-corpus/main.go rename to tm2/pkg/amino/tests/fuzz/binary/init-corpus/main.go index 5c9985d3ff0..4365db0f03c 100644 --- a/pkgs/amino/tests/fuzz/binary/init-corpus/main.go +++ b/tm2/pkg/amino/tests/fuzz/binary/init-corpus/main.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) func main() { diff --git a/pkgs/amino/tests/fuzz/json/debug/main.go b/tm2/pkg/amino/tests/fuzz/json/debug/main.go similarity index 78% rename from pkgs/amino/tests/fuzz/json/debug/main.go rename to tm2/pkg/amino/tests/fuzz/json/debug/main.go index d372f07c0fc..892ff943381 100644 --- a/pkgs/amino/tests/fuzz/json/debug/main.go +++ b/tm2/pkg/amino/tests/fuzz/json/debug/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) func main() { diff --git a/pkgs/amino/tests/fuzz/json/json.go b/tm2/pkg/amino/tests/fuzz/json/json.go similarity index 78% rename from pkgs/amino/tests/fuzz/json/json.go rename to tm2/pkg/amino/tests/fuzz/json/json.go index 795cda630b0..b214bd7498b 100644 --- a/pkgs/amino/tests/fuzz/json/json.go +++ b/tm2/pkg/amino/tests/fuzz/json/json.go @@ -1,8 +1,8 @@ package fuzzjson import ( - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) //------------------------------------- diff --git a/pkgs/amino/tests/package.go b/tm2/pkg/amino/tests/package.go similarity index 94% rename from pkgs/amino/tests/package.go rename to tm2/pkg/amino/tests/package.go index 8fb643bc710..a8b7692db93 100644 --- a/pkgs/amino/tests/package.go +++ b/tm2/pkg/amino/tests/package.go @@ -3,7 +3,7 @@ package tests import ( "reflect" - "github.com/gnolang/gno/pkgs/amino/pkg" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" ) // Creates one much like amino.RegisterPackage, but without registration. @@ -13,7 +13,7 @@ import ( // NOTE: This package registration is independent of test registration. // See tests/common.go StructTypes etc to add to tests. var Package = pkg.NewPackage( - "github.com/gnolang/gno/pkgs/amino/tests", + "github.com/gnolang/gno/tm2/pkg/amino/tests", "tests", pkg.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/amino/tests/proto/github.com/tendermint/go-amino-x/tests/types.proto b/tm2/pkg/amino/tests/proto/github.com/tendermint/go-amino-x/tests/types.proto similarity index 99% rename from pkgs/amino/tests/proto/github.com/tendermint/go-amino-x/tests/types.proto rename to tm2/pkg/amino/tests/proto/github.com/tendermint/go-amino-x/tests/types.proto index dd9f149b1c2..e9a427211f7 100644 --- a/pkgs/amino/tests/proto/github.com/tendermint/go-amino-x/tests/types.proto +++ b/tm2/pkg/amino/tests/proto/github.com/tendermint/go-amino-x/tests/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tests; -option go_package = "github.com/gnolang/gno/pkgs/amino/tests/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/tests/pb"; // imports import "google/protobuf/timestamp.proto"; diff --git a/pkgs/amino/tests/proto3/proto/compat.proto b/tm2/pkg/amino/tests/proto3/proto/compat.proto similarity index 100% rename from pkgs/amino/tests/proto3/proto/compat.proto rename to tm2/pkg/amino/tests/proto3/proto/compat.proto diff --git a/pkgs/amino/tests/proto3/proto3_compat_test.go b/tm2/pkg/amino/tests/proto3/proto3_compat_test.go similarity index 98% rename from pkgs/amino/tests/proto3/proto3_compat_test.go rename to tm2/pkg/amino/tests/proto3/proto3_compat_test.go index ff4fdea92bb..276a89cef66 100644 --- a/pkgs/amino/tests/proto3/proto3_compat_test.go +++ b/tm2/pkg/amino/tests/proto3/proto3_compat_test.go @@ -18,10 +18,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" - p3 "github.com/gnolang/gno/pkgs/amino/tests/proto3/proto" + p3 "github.com/gnolang/gno/tm2/pkg/amino/tests/proto3/proto" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" ) // This file checks basic proto3 compatibility by checking encoding of some test-vectors generated by using protoc. diff --git a/pkgs/amino/tests/tests.proto b/tm2/pkg/amino/tests/tests.proto similarity index 99% rename from pkgs/amino/tests/tests.proto rename to tm2/pkg/amino/tests/tests.proto index 4d0fa6d2d39..8a9598dded9 100644 --- a/pkgs/amino/tests/tests.proto +++ b/tm2/pkg/amino/tests/tests.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tests; -option go_package = "github.com/gnolang/gno/pkgs/amino/tests/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/amino/tests/pb"; // imports import "google/protobuf/timestamp.proto"; diff --git a/pkgs/amino/time2_test.go b/tm2/pkg/amino/time2_test.go similarity index 100% rename from pkgs/amino/time2_test.go rename to tm2/pkg/amino/time2_test.go diff --git a/pkgs/amino/tools.mk b/tm2/pkg/amino/tools.mk similarity index 100% rename from pkgs/amino/tools.mk rename to tm2/pkg/amino/tools.mk diff --git a/pkgs/amino/utils.go b/tm2/pkg/amino/utils.go similarity index 100% rename from pkgs/amino/utils.go rename to tm2/pkg/amino/utils.go diff --git a/pkgs/amino/version.go b/tm2/pkg/amino/version.go similarity index 100% rename from pkgs/amino/version.go rename to tm2/pkg/amino/version.go diff --git a/pkgs/amino/wellknown.go b/tm2/pkg/amino/wellknown.go similarity index 100% rename from pkgs/amino/wellknown.go rename to tm2/pkg/amino/wellknown.go diff --git a/pkgs/amino/wellknown_test.go b/tm2/pkg/amino/wellknown_test.go similarity index 95% rename from pkgs/amino/wellknown_test.go rename to tm2/pkg/amino/wellknown_test.go index 1e61cfdbe41..3b91ffc77a5 100644 --- a/pkgs/amino/wellknown_test.go +++ b/tm2/pkg/amino/wellknown_test.go @@ -3,8 +3,8 @@ package amino_test import ( "testing" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/tests" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/tests" "github.com/jaekwon/testify/assert" ) diff --git a/pkgs/async/async.go b/tm2/pkg/async/async.go similarity index 99% rename from pkgs/async/async.go rename to tm2/pkg/async/async.go index aff5a3cda6b..389475958f1 100644 --- a/pkgs/async/async.go +++ b/tm2/pkg/async/async.go @@ -3,7 +3,7 @@ package async import ( "sync/atomic" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) //---------------------------------------- diff --git a/pkgs/async/async_test.go b/tm2/pkg/async/async_test.go similarity index 99% rename from pkgs/async/async_test.go rename to tm2/pkg/async/async_test.go index 78e8b10eb6d..f82e32312f0 100644 --- a/pkgs/async/async_test.go +++ b/tm2/pkg/async/async_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) func TestParallel(t *testing.T) { diff --git a/pkgs/autofile/README.md b/tm2/pkg/autofile/README.md similarity index 100% rename from pkgs/autofile/README.md rename to tm2/pkg/autofile/README.md diff --git a/pkgs/autofile/autofile.go b/tm2/pkg/autofile/autofile.go similarity index 98% rename from pkgs/autofile/autofile.go rename to tm2/pkg/autofile/autofile.go index da7b800d9f9..205554a7644 100644 --- a/pkgs/autofile/autofile.go +++ b/tm2/pkg/autofile/autofile.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" ) /* AutoFile usage diff --git a/pkgs/autofile/autofile.go.bak b/tm2/pkg/autofile/autofile.go.bak similarity index 99% rename from pkgs/autofile/autofile.go.bak rename to tm2/pkg/autofile/autofile.go.bak index ab4e9ade8c0..42e9f5188d1 100644 --- a/pkgs/autofile/autofile.go.bak +++ b/tm2/pkg/autofile/autofile.go.bak @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" ) /* AutoFile usage diff --git a/pkgs/autofile/autofile_test.go b/tm2/pkg/autofile/autofile_test.go similarity index 98% rename from pkgs/autofile/autofile_test.go rename to tm2/pkg/autofile/autofile_test.go index b421e501172..d50bdca3ce0 100644 --- a/pkgs/autofile/autofile_test.go +++ b/tm2/pkg/autofile/autofile_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - osm "github.com/gnolang/gno/pkgs/os" + osm "github.com/gnolang/gno/tm2/pkg/os" ) func TestSIGHUP(t *testing.T) { diff --git a/pkgs/autofile/cmd/logjack.go b/tm2/pkg/autofile/cmd/logjack.go similarity index 95% rename from pkgs/autofile/cmd/logjack.go rename to tm2/pkg/autofile/cmd/logjack.go index ffa345cbdb1..419a8b5a195 100644 --- a/pkgs/autofile/cmd/logjack.go +++ b/tm2/pkg/autofile/cmd/logjack.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - auto "github.com/gnolang/gno/pkgs/autofile" - "github.com/gnolang/gno/pkgs/flow" - osm "github.com/gnolang/gno/pkgs/os" + auto "github.com/gnolang/gno/tm2/pkg/autofile" + "github.com/gnolang/gno/tm2/pkg/flow" + osm "github.com/gnolang/gno/tm2/pkg/os" ) const ( diff --git a/pkgs/autofile/group.go b/tm2/pkg/autofile/group.go similarity index 99% rename from pkgs/autofile/group.go rename to tm2/pkg/autofile/group.go index d55392291ad..3350e1e62c5 100644 --- a/pkgs/autofile/group.go +++ b/tm2/pkg/autofile/group.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/service" ) const ( diff --git a/pkgs/autofile/group_test.go b/tm2/pkg/autofile/group_test.go similarity index 98% rename from pkgs/autofile/group_test.go rename to tm2/pkg/autofile/group_test.go index bd03ea750c2..6face4630d1 100644 --- a/pkgs/autofile/group_test.go +++ b/tm2/pkg/autofile/group_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/random" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/random" ) func createTestGroupWithHeadSizeLimit(t *testing.T, headSizeLimit int64) *Group { diff --git a/pkgs/bech32/LICENSE b/tm2/pkg/bech32/LICENSE similarity index 100% rename from pkgs/bech32/LICENSE rename to tm2/pkg/bech32/LICENSE diff --git a/pkgs/bech32/bech32.go b/tm2/pkg/bech32/bech32.go similarity index 96% rename from pkgs/bech32/bech32.go rename to tm2/pkg/bech32/bech32.go index d9064cd6332..eae93647119 100644 --- a/pkgs/bech32/bech32.go +++ b/tm2/pkg/bech32/bech32.go @@ -2,7 +2,7 @@ package bech32 import ( "github.com/btcsuite/btcd/btcutil/bech32" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // ConvertAndEncode encodes []byte to bech32. diff --git a/pkgs/bech32/bech32_test.go b/tm2/pkg/bech32/bech32_test.go similarity index 93% rename from pkgs/bech32/bech32_test.go rename to tm2/pkg/bech32/bech32_test.go index 7f655d5ccc9..557507cef57 100644 --- a/pkgs/bech32/bech32_test.go +++ b/tm2/pkg/bech32/bech32_test.go @@ -6,8 +6,8 @@ import ( "encoding/hex" "testing" - "github.com/gnolang/gno/pkgs/bech32" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/bech32" + "github.com/gnolang/gno/tm2/pkg/crypto" "github.com/jaekwon/testify/assert" ) diff --git a/pkgs/bft/abci/README.md b/tm2/pkg/bft/abci/README.md similarity index 100% rename from pkgs/bft/abci/README.md rename to tm2/pkg/bft/abci/README.md diff --git a/pkgs/bft/abci/client/client.go b/tm2/pkg/bft/abci/client/client.go similarity index 97% rename from pkgs/bft/abci/client/client.go rename to tm2/pkg/bft/abci/client/client.go index 0d21c5c12d8..b3d5a945839 100644 --- a/pkgs/bft/abci/client/client.go +++ b/tm2/pkg/bft/abci/client/client.go @@ -3,8 +3,8 @@ package abcicli import ( "sync" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/service" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/service" ) const ( diff --git a/pkgs/bft/abci/client/local_client.go b/tm2/pkg/bft/abci/client/local_client.go similarity index 98% rename from pkgs/bft/abci/client/local_client.go rename to tm2/pkg/bft/abci/client/local_client.go index c15b14bd794..28ae6877da7 100644 --- a/pkgs/bft/abci/client/local_client.go +++ b/tm2/pkg/bft/abci/client/local_client.go @@ -3,8 +3,8 @@ package abcicli import ( "sync" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/service" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/service" ) var _ Client = (*localClient)(nil) diff --git a/pkgs/bft/abci/example/counter/counter.go b/tm2/pkg/bft/abci/example/counter/counter.go similarity index 96% rename from pkgs/bft/abci/example/counter/counter.go rename to tm2/pkg/bft/abci/example/counter/counter.go index c5d7438b096..7ffb57d6349 100644 --- a/pkgs/bft/abci/example/counter/counter.go +++ b/tm2/pkg/bft/abci/example/counter/counter.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "fmt" - "github.com/gnolang/gno/pkgs/bft/abci/example/errors" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/errors" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) type CounterApplication struct { diff --git a/pkgs/bft/abci/example/errors/errors.go b/tm2/pkg/bft/abci/example/errors/errors.go similarity index 100% rename from pkgs/bft/abci/example/errors/errors.go rename to tm2/pkg/bft/abci/example/errors/errors.go diff --git a/pkgs/bft/abci/example/kvstore/helpers.go b/tm2/pkg/bft/abci/example/kvstore/helpers.go similarity index 87% rename from pkgs/bft/abci/example/kvstore/helpers.go rename to tm2/pkg/bft/abci/example/kvstore/helpers.go index 04d6897ede7..b72b4da4778 100644 --- a/pkgs/bft/abci/example/kvstore/helpers.go +++ b/tm2/pkg/bft/abci/example/kvstore/helpers.go @@ -1,9 +1,9 @@ package kvstore import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/random" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/random" ) // RandVal creates one random validator, with a key derived diff --git a/pkgs/bft/abci/example/kvstore/kvstore.go b/tm2/pkg/bft/abci/example/kvstore/kvstore.go similarity index 95% rename from pkgs/bft/abci/example/kvstore/kvstore.go rename to tm2/pkg/bft/abci/example/kvstore/kvstore.go index 8e90d54734b..8e2a930e698 100644 --- a/pkgs/bft/abci/example/kvstore/kvstore.go +++ b/tm2/pkg/bft/abci/example/kvstore/kvstore.go @@ -6,9 +6,9 @@ import ( "encoding/json" "fmt" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - abciver "github.com/gnolang/gno/pkgs/bft/abci/version" - dbm "github.com/gnolang/gno/pkgs/db" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + abciver "github.com/gnolang/gno/tm2/pkg/bft/abci/version" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) var ( diff --git a/pkgs/bft/abci/example/kvstore/kvstore_test.go b/tm2/pkg/bft/abci/example/kvstore/kvstore_test.go similarity index 98% rename from pkgs/bft/abci/example/kvstore/kvstore_test.go rename to tm2/pkg/bft/abci/example/kvstore/kvstore_test.go index 179f3ef658f..62f5582108e 100644 --- a/pkgs/bft/abci/example/kvstore/kvstore_test.go +++ b/tm2/pkg/bft/abci/example/kvstore/kvstore_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) const ( diff --git a/pkgs/bft/abci/example/kvstore/persistent_kvstore.go b/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go similarity index 96% rename from pkgs/bft/abci/example/kvstore/persistent_kvstore.go rename to tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go index 30a67376891..09c827d1433 100644 --- a/pkgs/bft/abci/example/kvstore/persistent_kvstore.go +++ b/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go @@ -6,12 +6,12 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/abci/example/errors" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/errors" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/log" ) const ( diff --git a/pkgs/bft/abci/types/abci.proto b/tm2/pkg/bft/abci/types/abci.proto similarity index 96% rename from pkgs/bft/abci/types/abci.proto rename to tm2/pkg/bft/abci/types/abci.proto index 523c8af60fb..2494c94b702 100644 --- a/pkgs/bft/abci/types/abci.proto +++ b/tm2/pkg/bft/abci/types/abci.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package abci; -option go_package = "github.com/gnolang/gno/pkgs/bft/abci/types/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/bft/abci/types/pb"; // imports -import "github.com/gnolang/gno/pkgs/crypto/merkle/merkle.proto"; +import "github.com/gnolang/gno/tm2/pkg/crypto/merkle/merkle.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto"; diff --git a/pkgs/bft/abci/types/application.go b/tm2/pkg/bft/abci/types/application.go similarity index 100% rename from pkgs/bft/abci/types/application.go rename to tm2/pkg/bft/abci/types/application.go diff --git a/pkgs/bft/abci/types/mock_types.go b/tm2/pkg/bft/abci/types/mock_types.go similarity index 100% rename from pkgs/bft/abci/types/mock_types.go rename to tm2/pkg/bft/abci/types/mock_types.go diff --git a/pkgs/bft/abci/types/package.go b/tm2/pkg/bft/abci/types/package.go similarity index 90% rename from pkgs/bft/abci/types/package.go rename to tm2/pkg/bft/abci/types/package.go index e7b6aef5bd4..04da7d98b22 100644 --- a/pkgs/bft/abci/types/package.go +++ b/tm2/pkg/bft/abci/types/package.go @@ -1,12 +1,12 @@ package abci import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/abci/types", + "github.com/gnolang/gno/tm2/pkg/bft/abci/types", "abci", amino.GetCallersDirname(), ). diff --git a/pkgs/bft/abci/types/params.go b/tm2/pkg/bft/abci/types/params.go similarity index 89% rename from pkgs/bft/abci/types/params.go rename to tm2/pkg/bft/abci/types/params.go index 490de88289e..ac714d92dcd 100644 --- a/pkgs/bft/abci/types/params.go +++ b/tm2/pkg/bft/abci/types/params.go @@ -1,8 +1,8 @@ package abci import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) func (params ValidatorParams) IsValidPubKeyTypeURL(pubKeyTypeURL string) bool { diff --git a/pkgs/bft/abci/types/types.go b/tm2/pkg/bft/abci/types/types.go similarity index 98% rename from pkgs/bft/abci/types/types.go rename to tm2/pkg/bft/abci/types/types.go index 87e1820b078..637d09b92a3 100644 --- a/pkgs/bft/abci/types/types.go +++ b/tm2/pkg/bft/abci/types/types.go @@ -3,8 +3,8 @@ package abci import ( "time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" ) // ---------------------------------------- diff --git a/pkgs/bft/abci/types/util.go b/tm2/pkg/bft/abci/types/util.go similarity index 96% rename from pkgs/bft/abci/types/util.go rename to tm2/pkg/bft/abci/types/util.go index 4ea0e783d33..603e59b2950 100644 --- a/pkgs/bft/abci/types/util.go +++ b/tm2/pkg/bft/abci/types/util.go @@ -4,7 +4,7 @@ import ( "bytes" "sort" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) //------------------------------------------------------------------------------ diff --git a/pkgs/bft/abci/version/version.go b/tm2/pkg/bft/abci/version/version.go similarity index 100% rename from pkgs/bft/abci/version/version.go rename to tm2/pkg/bft/abci/version/version.go diff --git a/tm2/pkg/bft/blockchain/blockchain.proto b/tm2/pkg/bft/blockchain/blockchain.proto new file mode 100644 index 00000000000..a618d5abf49 --- /dev/null +++ b/tm2/pkg/bft/blockchain/blockchain.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; +package tm; + +option go_package = "github.com/gnolang/gno/tm2/pkg/bft/blockchain/pb"; + +// imports +import "github.com/gnolang/gno/tm2/pkg/bft/types/types.proto"; +import "github.com/gnolang/gno/tm2/pkg/bft/abci/types/abci.proto"; +import "github.com/gnolang/gno/tm2/pkg/crypto/merkle/merkle.proto"; +import "github.com/gnolang/gno/tm2/pkg/bitarray/bitarray.proto"; + +// messages +message BlockRequest { + sint64 Height = 1; +} + +message BlockResponse { + Block Block = 1; +} + +message NoBlockResponse { + sint64 Height = 1; +} + +message StatusRequest { + sint64 Height = 1; +} + +message StatusResponse { + sint64 Height = 1; +} \ No newline at end of file diff --git a/pkgs/bft/blockchain/package.go b/tm2/pkg/bft/blockchain/package.go similarity index 74% rename from pkgs/bft/blockchain/package.go rename to tm2/pkg/bft/blockchain/package.go index 1b54e079ab5..2a0a9809faa 100644 --- a/pkgs/bft/blockchain/package.go +++ b/tm2/pkg/bft/blockchain/package.go @@ -1,12 +1,12 @@ package blockchain import ( - "github.com/gnolang/gno/pkgs/amino" - btypes "github.com/gnolang/gno/pkgs/bft/types" + "github.com/gnolang/gno/tm2/pkg/amino" + btypes "github.com/gnolang/gno/tm2/pkg/bft/types" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/blockchain", + "github.com/gnolang/gno/tm2/pkg/bft/blockchain", "tm", amino.GetCallersDirname(), ).WithDependencies( diff --git a/pkgs/bft/blockchain/pool.go b/tm2/pkg/bft/blockchain/pool.go similarity index 98% rename from pkgs/bft/blockchain/pool.go rename to tm2/pkg/bft/blockchain/pool.go index 32dc0a879fb..a44926ec7b2 100644 --- a/pkgs/bft/blockchain/pool.go +++ b/tm2/pkg/bft/blockchain/pool.go @@ -8,11 +8,11 @@ import ( "sync/atomic" "time" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/flow" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/flow" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/service" ) /* diff --git a/pkgs/bft/blockchain/pool_test.go b/tm2/pkg/bft/blockchain/pool_test.go similarity index 96% rename from pkgs/bft/blockchain/pool_test.go rename to tm2/pkg/bft/blockchain/pool_test.go index d6458b83dc2..79205bff5ce 100644 --- a/pkgs/bft/blockchain/pool_test.go +++ b/tm2/pkg/bft/blockchain/pool_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/random" ) func init() { diff --git a/pkgs/bft/blockchain/reactor.go b/tm2/pkg/bft/blockchain/reactor.go similarity index 98% rename from pkgs/bft/blockchain/reactor.go rename to tm2/pkg/bft/blockchain/reactor.go index 5f92db77bc7..007f7ccfb1c 100644 --- a/pkgs/bft/blockchain/reactor.go +++ b/tm2/pkg/bft/blockchain/reactor.go @@ -6,12 +6,12 @@ import ( "reflect" "time" - "github.com/gnolang/gno/pkgs/amino" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/store" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" + "github.com/gnolang/gno/tm2/pkg/amino" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/store" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" ) const ( diff --git a/pkgs/bft/blockchain/reactor_test.go b/tm2/pkg/bft/blockchain/reactor_test.go similarity index 94% rename from pkgs/bft/blockchain/reactor_test.go rename to tm2/pkg/bft/blockchain/reactor_test.go index aae3927b5d8..f4265e0f78d 100644 --- a/pkgs/bft/blockchain/reactor_test.go +++ b/tm2/pkg/bft/blockchain/reactor_test.go @@ -8,19 +8,19 @@ import ( "github.com/stretchr/testify/assert" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cfg "github.com/gnolang/gno/pkgs/bft/config" - "github.com/gnolang/gno/pkgs/bft/mempool/mock" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/store" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/testutils" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/store" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/testutils" ) var config *cfg.Config diff --git a/pkgs/bft/blockchain/version/version.go b/tm2/pkg/bft/blockchain/version/version.go similarity index 71% rename from pkgs/bft/blockchain/version/version.go rename to tm2/pkg/bft/blockchain/version/version.go index 5449b5eb60d..433393693f0 100644 --- a/pkgs/bft/blockchain/version/version.go +++ b/tm2/pkg/bft/blockchain/version/version.go @@ -1,7 +1,7 @@ package bcver import ( - types "github.com/gnolang/gno/pkgs/bft/types/version" + types "github.com/gnolang/gno/tm2/pkg/bft/types/version" ) const Version = "v1.0.0-rc.0" diff --git a/pkgs/bft/config/config.go b/tm2/pkg/bft/config/config.go similarity index 96% rename from pkgs/bft/config/config.go rename to tm2/pkg/bft/config/config.go index 317221ca47a..576bf0ff76f 100644 --- a/pkgs/bft/config/config.go +++ b/tm2/pkg/bft/config/config.go @@ -5,13 +5,13 @@ import ( "os" "path/filepath" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cns "github.com/gnolang/gno/pkgs/bft/consensus/config" - mem "github.com/gnolang/gno/pkgs/bft/mempool/config" - rpc "github.com/gnolang/gno/pkgs/bft/rpc/config" - "github.com/gnolang/gno/pkgs/errors" - osm "github.com/gnolang/gno/pkgs/os" - p2p "github.com/gnolang/gno/pkgs/p2p/config" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cns "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" + mem "github.com/gnolang/gno/tm2/pkg/bft/mempool/config" + rpc "github.com/gnolang/gno/tm2/pkg/bft/rpc/config" + "github.com/gnolang/gno/tm2/pkg/errors" + osm "github.com/gnolang/gno/tm2/pkg/os" + p2p "github.com/gnolang/gno/tm2/pkg/p2p/config" ) // Config defines the top level configuration for a Tendermint node diff --git a/pkgs/bft/config/toml.go b/tm2/pkg/bft/config/toml.go similarity index 99% rename from pkgs/bft/config/toml.go rename to tm2/pkg/bft/config/toml.go index 3ea01ab3037..abb2ab33e17 100644 --- a/pkgs/bft/config/toml.go +++ b/tm2/pkg/bft/config/toml.go @@ -8,7 +8,7 @@ import ( "path/filepath" "text/template" - osm "github.com/gnolang/gno/pkgs/os" + osm "github.com/gnolang/gno/tm2/pkg/os" "github.com/pelletier/go-toml" ) diff --git a/pkgs/bft/config/toml_test.go b/tm2/pkg/bft/config/toml_test.go similarity index 100% rename from pkgs/bft/config/toml_test.go rename to tm2/pkg/bft/config/toml_test.go diff --git a/pkgs/bft/config/utils.go b/tm2/pkg/bft/config/utils.go similarity index 100% rename from pkgs/bft/config/utils.go rename to tm2/pkg/bft/config/utils.go diff --git a/pkgs/bft/consensus/README.md b/tm2/pkg/bft/consensus/README.md similarity index 100% rename from pkgs/bft/consensus/README.md rename to tm2/pkg/bft/consensus/README.md diff --git a/pkgs/bft/consensus/byzantine_test.go b/tm2/pkg/bft/consensus/byzantine_test.go similarity index 100% rename from pkgs/bft/consensus/byzantine_test.go rename to tm2/pkg/bft/consensus/byzantine_test.go diff --git a/pkgs/bft/consensus/common_test.go b/tm2/pkg/bft/consensus/common_test.go similarity index 96% rename from pkgs/bft/consensus/common_test.go rename to tm2/pkg/bft/consensus/common_test.go index 8325e98f01b..7424305c00a 100644 --- a/pkgs/bft/consensus/common_test.go +++ b/tm2/pkg/bft/consensus/common_test.go @@ -12,25 +12,25 @@ import ( "testing" "time" - abcicli "github.com/gnolang/gno/pkgs/bft/abci/client" - "github.com/gnolang/gno/pkgs/bft/abci/example/counter" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cfg "github.com/gnolang/gno/pkgs/bft/config" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - "github.com/gnolang/gno/pkgs/bft/privval" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/store" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/colors" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/p2p" + abcicli "github.com/gnolang/gno/tm2/pkg/bft/abci/client" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/counter" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + "github.com/gnolang/gno/tm2/pkg/bft/privval" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/store" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/colors" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/p2p" ) const ( diff --git a/pkgs/bft/consensus/config/config.go b/tm2/pkg/bft/consensus/config/config.go similarity index 100% rename from pkgs/bft/consensus/config/config.go rename to tm2/pkg/bft/consensus/config/config.go diff --git a/pkgs/bft/consensus/config/utils.go b/tm2/pkg/bft/consensus/config/utils.go similarity index 100% rename from pkgs/bft/consensus/config/utils.go rename to tm2/pkg/bft/consensus/config/utils.go diff --git a/pkgs/bft/consensus/consensus.proto b/tm2/pkg/bft/consensus/consensus.proto similarity index 76% rename from pkgs/bft/consensus/consensus.proto rename to tm2/pkg/bft/consensus/consensus.proto index df338db7fb9..1859ab28153 100644 --- a/pkgs/bft/consensus/consensus.proto +++ b/tm2/pkg/bft/consensus/consensus.proto @@ -1,14 +1,14 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/bft/consensus/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/bft/consensus/pb"; // imports -import "github.com/gnolang/gno/pkgs/bft/consensus/types/cstypes.proto"; -import "github.com/gnolang/gno/pkgs/bft/abci/types/abci.proto"; -import "github.com/gnolang/gno/pkgs/crypto/merkle/merkle.proto"; -import "github.com/gnolang/gno/pkgs/bft/types/types.proto"; -import "github.com/gnolang/gno/pkgs/bitarray/bitarray.proto"; +import "github.com/gnolang/gno/tm2/pkg/bft/consensus/types/cstypes.proto"; +import "github.com/gnolang/gno/tm2/pkg/bft/abci/types/abci.proto"; +import "github.com/gnolang/gno/tm2/pkg/crypto/merkle/merkle.proto"; +import "github.com/gnolang/gno/tm2/pkg/bft/types/types.proto"; +import "github.com/gnolang/gno/tm2/pkg/bitarray/bitarray.proto"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/pkgs/bft/consensus/debug.go b/tm2/pkg/bft/consensus/debug.go similarity index 100% rename from pkgs/bft/consensus/debug.go rename to tm2/pkg/bft/consensus/debug.go diff --git a/pkgs/bft/consensus/mempool_test.go b/tm2/pkg/bft/consensus/mempool_test.go similarity index 96% rename from pkgs/bft/consensus/mempool_test.go rename to tm2/pkg/bft/consensus/mempool_test.go index 04ebffa8542..b9c04cabbed 100644 --- a/pkgs/bft/consensus/mempool_test.go +++ b/tm2/pkg/bft/consensus/mempool_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/bft/abci/example/errors" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/errors" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) // for testing diff --git a/pkgs/bft/consensus/package.go b/tm2/pkg/bft/consensus/package.go similarity index 72% rename from pkgs/bft/consensus/package.go rename to tm2/pkg/bft/consensus/package.go index 206e56b4d01..cde059fa56a 100644 --- a/pkgs/bft/consensus/package.go +++ b/tm2/pkg/bft/consensus/package.go @@ -1,13 +1,13 @@ package consensus import ( - "github.com/gnolang/gno/pkgs/amino" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/types" + "github.com/gnolang/gno/tm2/pkg/amino" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/consensus", + "github.com/gnolang/gno/tm2/pkg/bft/consensus", "tm", amino.GetCallersDirname(), ). diff --git a/pkgs/bft/consensus/reactor.go b/tm2/pkg/bft/consensus/reactor.go similarity index 99% rename from pkgs/bft/consensus/reactor.go rename to tm2/pkg/bft/consensus/reactor.go index 8ecb5f2ce67..ab7f3b55e92 100644 --- a/pkgs/bft/consensus/reactor.go +++ b/tm2/pkg/bft/consensus/reactor.go @@ -6,16 +6,16 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/amino" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" + "github.com/gnolang/gno/tm2/pkg/amino" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" ) const ( diff --git a/pkgs/bft/consensus/reactor_test.go b/tm2/pkg/bft/consensus/reactor_test.go similarity index 97% rename from pkgs/bft/consensus/reactor_test.go rename to tm2/pkg/bft/consensus/reactor_test.go index 2e50c97e8ac..2194d4d007d 100644 --- a/pkgs/bft/consensus/reactor_test.go +++ b/tm2/pkg/bft/consensus/reactor_test.go @@ -8,20 +8,20 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - cfg "github.com/gnolang/gno/pkgs/bft/config" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/p2p/mock" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/p2p/mock" + "github.com/gnolang/gno/tm2/pkg/testutils" ) // ---------------------------------------------- diff --git a/pkgs/bft/consensus/replay.go b/tm2/pkg/bft/consensus/replay.go similarity index 97% rename from pkgs/bft/consensus/replay.go rename to tm2/pkg/bft/consensus/replay.go index a48e15c91bb..16b4ba3fa87 100644 --- a/pkgs/bft/consensus/replay.go +++ b/tm2/pkg/bft/consensus/replay.go @@ -9,16 +9,16 @@ import ( "reflect" "time" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/mempool/mock" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - walm "github.com/gnolang/gno/pkgs/bft/wal" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + walm "github.com/gnolang/gno/tm2/pkg/bft/wal" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" ) var crc32c = crc32.MakeTable(crc32.Castagnoli) diff --git a/pkgs/bft/consensus/replay_file.go b/tm2/pkg/bft/consensus/replay_file.go similarity index 92% rename from pkgs/bft/consensus/replay_file.go rename to tm2/pkg/bft/consensus/replay_file.go index bb815a1bd1d..780240e3216 100644 --- a/pkgs/bft/consensus/replay_file.go +++ b/tm2/pkg/bft/consensus/replay_file.go @@ -9,19 +9,19 @@ import ( "strconv" "strings" - cfg "github.com/gnolang/gno/pkgs/bft/config" - cnscfg "github.com/gnolang/gno/pkgs/bft/consensus/config" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/mempool/mock" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/store" - walm "github.com/gnolang/gno/pkgs/bft/wal" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + cnscfg "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/store" + walm "github.com/gnolang/gno/tm2/pkg/bft/wal" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" ) const ( diff --git a/pkgs/bft/consensus/replay_test.go b/tm2/pkg/bft/consensus/replay_test.go similarity index 97% rename from pkgs/bft/consensus/replay_test.go rename to tm2/pkg/bft/consensus/replay_test.go index 6d500cd8ae5..3174207ef8d 100644 --- a/pkgs/bft/consensus/replay_test.go +++ b/tm2/pkg/bft/consensus/replay_test.go @@ -17,23 +17,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cfg "github.com/gnolang/gno/pkgs/bft/config" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/mempool/mock" - "github.com/gnolang/gno/pkgs/bft/privval" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - walm "github.com/gnolang/gno/pkgs/bft/wal" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" + "github.com/gnolang/gno/tm2/pkg/bft/privval" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + walm "github.com/gnolang/gno/tm2/pkg/bft/wal" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/testutils" ) func TestMain(m *testing.M) { diff --git a/pkgs/bft/consensus/state.go b/tm2/pkg/bft/consensus/state.go similarity index 98% rename from pkgs/bft/consensus/state.go rename to tm2/pkg/bft/consensus/state.go index 5d623b1dc89..988a455f117 100644 --- a/pkgs/bft/consensus/state.go +++ b/tm2/pkg/bft/consensus/state.go @@ -9,21 +9,21 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/amino" - cnscfg "github.com/gnolang/gno/pkgs/bft/consensus/config" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/fail" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - walm "github.com/gnolang/gno/pkgs/bft/wal" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/amino" + cnscfg "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/fail" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + walm "github.com/gnolang/gno/tm2/pkg/bft/wal" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/service" ) // ----------------------------------------------------------------------------- diff --git a/pkgs/bft/consensus/state_test.go b/tm2/pkg/bft/consensus/state_test.go similarity index 99% rename from pkgs/bft/consensus/state_test.go rename to tm2/pkg/bft/consensus/state_test.go index e084d49677f..1587fa03057 100644 --- a/pkgs/bft/consensus/state_test.go +++ b/tm2/pkg/bft/consensus/state_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/events" - p2pmock "github.com/gnolang/gno/pkgs/p2p/mock" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/testutils" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/events" + p2pmock "github.com/gnolang/gno/tm2/pkg/p2p/mock" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/testutils" ) /* diff --git a/pkgs/bft/consensus/ticker.go b/tm2/pkg/bft/consensus/ticker.go similarity index 97% rename from pkgs/bft/consensus/ticker.go rename to tm2/pkg/bft/consensus/ticker.go index 0aec87bb1d0..c4f660aae16 100644 --- a/pkgs/bft/consensus/ticker.go +++ b/tm2/pkg/bft/consensus/ticker.go @@ -3,8 +3,8 @@ package consensus import ( "time" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/service" ) var tickBufferSize = 10 diff --git a/pkgs/bft/consensus/types/cstypes.proto b/tm2/pkg/bft/consensus/types/cstypes.proto similarity index 85% rename from pkgs/bft/consensus/types/cstypes.proto rename to tm2/pkg/bft/consensus/types/cstypes.proto index 79ef18d0580..41a20d585c6 100644 --- a/pkgs/bft/consensus/types/cstypes.proto +++ b/tm2/pkg/bft/consensus/types/cstypes.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/bft/consensus/types/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/bft/consensus/types/pb"; // imports -import "github.com/gnolang/gno/pkgs/bft/abci/types/abci.proto"; -import "github.com/gnolang/gno/pkgs/crypto/merkle/merkle.proto"; -import "github.com/gnolang/gno/pkgs/bft/types/types.proto"; -import "github.com/gnolang/gno/pkgs/bitarray/bitarray.proto"; +import "github.com/gnolang/gno/tm2/pkg/bft/abci/types/abci.proto"; +import "github.com/gnolang/gno/tm2/pkg/crypto/merkle/merkle.proto"; +import "github.com/gnolang/gno/tm2/pkg/bft/types/types.proto"; +import "github.com/gnolang/gno/tm2/pkg/bitarray/bitarray.proto"; import "google/protobuf/timestamp.proto"; // messages diff --git a/pkgs/bft/consensus/types/events.go b/tm2/pkg/bft/consensus/types/events.go similarity index 97% rename from pkgs/bft/consensus/types/events.go rename to tm2/pkg/bft/consensus/types/events.go index b4e532d4d0f..85114f09f53 100644 --- a/pkgs/bft/consensus/types/events.go +++ b/tm2/pkg/bft/consensus/types/events.go @@ -3,8 +3,8 @@ package cstypes import ( "fmt" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/bitarray" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/bitarray" ) type ConsensusEvent interface { diff --git a/pkgs/bft/consensus/types/height_vote_set.go b/tm2/pkg/bft/consensus/types/height_vote_set.go similarity index 98% rename from pkgs/bft/consensus/types/height_vote_set.go rename to tm2/pkg/bft/consensus/types/height_vote_set.go index 123c2d9e5b8..b81937ebd1e 100644 --- a/pkgs/bft/consensus/types/height_vote_set.go +++ b/tm2/pkg/bft/consensus/types/height_vote_set.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/p2p" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/p2p" ) type RoundVoteSet struct { diff --git a/pkgs/bft/consensus/types/height_vote_set_test.go b/tm2/pkg/bft/consensus/types/height_vote_set_test.go similarity index 92% rename from pkgs/bft/consensus/types/height_vote_set_test.go rename to tm2/pkg/bft/consensus/types/height_vote_set_test.go index 6d4e7b8d5f3..86dc4ee84f6 100644 --- a/pkgs/bft/consensus/types/height_vote_set_test.go +++ b/tm2/pkg/bft/consensus/types/height_vote_set_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - cfg "github.com/gnolang/gno/pkgs/bft/config" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" ) var config *cfg.Config // NOTE: must be reset for each _test.go file diff --git a/pkgs/bft/consensus/types/package.go b/tm2/pkg/bft/consensus/types/package.go similarity index 71% rename from pkgs/bft/consensus/types/package.go rename to tm2/pkg/bft/consensus/types/package.go index 06e79089459..9b533a59c40 100644 --- a/pkgs/bft/consensus/types/package.go +++ b/tm2/pkg/bft/consensus/types/package.go @@ -1,13 +1,13 @@ package cstypes import ( - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - btypes "github.com/gnolang/gno/pkgs/bft/types" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + btypes "github.com/gnolang/gno/tm2/pkg/bft/types" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/consensus/types", + "github.com/gnolang/gno/tm2/pkg/bft/consensus/types", "tm", amino.GetCallersDirname(), ). diff --git a/pkgs/bft/consensus/types/peer_round_state.go b/tm2/pkg/bft/consensus/types/peer_round_state.go similarity index 97% rename from pkgs/bft/consensus/types/peer_round_state.go rename to tm2/pkg/bft/consensus/types/peer_round_state.go index 8c60b4c27af..f92528657ba 100644 --- a/pkgs/bft/consensus/types/peer_round_state.go +++ b/tm2/pkg/bft/consensus/types/peer_round_state.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/bitarray" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/bitarray" ) //----------------------------------------------------------------------------- diff --git a/pkgs/bft/consensus/types/round_state.go b/tm2/pkg/bft/consensus/types/round_state.go similarity index 99% rename from pkgs/bft/consensus/types/round_state.go rename to tm2/pkg/bft/consensus/types/round_state.go index 9a8787fcc9a..a1b92a99d31 100644 --- a/pkgs/bft/consensus/types/round_state.go +++ b/tm2/pkg/bft/consensus/types/round_state.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/gnolang/gno/pkgs/bft/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) //----------------------------------------------------------------------------- diff --git a/pkgs/bft/consensus/types/round_state_test.go b/tm2/pkg/bft/consensus/types/round_state_test.go similarity index 87% rename from pkgs/bft/consensus/types/round_state_test.go rename to tm2/pkg/bft/consensus/types/round_state_test.go index 4fd9588b43b..49fe57c4c05 100644 --- a/pkgs/bft/consensus/types/round_state_test.go +++ b/tm2/pkg/bft/consensus/types/round_state_test.go @@ -3,12 +3,12 @@ package cstypes import ( "testing" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/random" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/random" ) func BenchmarkRoundStateDeepCopy(b *testing.B) { diff --git a/pkgs/bft/consensus/wal_generator.go b/tm2/pkg/bft/consensus/wal_generator.go similarity index 91% rename from pkgs/bft/consensus/wal_generator.go rename to tm2/pkg/bft/consensus/wal_generator.go index e159f4f72cb..dff1cca1446 100644 --- a/pkgs/bft/consensus/wal_generator.go +++ b/tm2/pkg/bft/consensus/wal_generator.go @@ -9,20 +9,20 @@ import ( "testing" "time" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - cfg "github.com/gnolang/gno/pkgs/bft/config" - "github.com/gnolang/gno/pkgs/bft/mempool/mock" - "github.com/gnolang/gno/pkgs/bft/privval" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/store" - "github.com/gnolang/gno/pkgs/bft/types" - walm "github.com/gnolang/gno/pkgs/bft/wal" - db "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" + "github.com/gnolang/gno/tm2/pkg/bft/privval" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/store" + "github.com/gnolang/gno/tm2/pkg/bft/types" + walm "github.com/gnolang/gno/tm2/pkg/bft/wal" + db "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/random" ) // WALGenerateNBlocks generates a consensus WAL. It does this by spinning up a diff --git a/pkgs/bft/consensus/wal_init.go b/tm2/pkg/bft/consensus/wal_init.go similarity index 100% rename from pkgs/bft/consensus/wal_init.go rename to tm2/pkg/bft/consensus/wal_init.go diff --git a/pkgs/bft/consensus/wal_test.go b/tm2/pkg/bft/consensus/wal_test.go similarity index 94% rename from pkgs/bft/consensus/wal_test.go rename to tm2/pkg/bft/consensus/wal_test.go index d33d97b2233..1b271fb73c7 100644 --- a/pkgs/bft/consensus/wal_test.go +++ b/tm2/pkg/bft/consensus/wal_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - auto "github.com/gnolang/gno/pkgs/autofile" - walm "github.com/gnolang/gno/pkgs/bft/wal" - "github.com/gnolang/gno/pkgs/log" + auto "github.com/gnolang/gno/tm2/pkg/autofile" + walm "github.com/gnolang/gno/tm2/pkg/bft/wal" + "github.com/gnolang/gno/tm2/pkg/log" ) const ( diff --git a/pkgs/bft/fail/fail.go b/tm2/pkg/bft/fail/fail.go similarity index 100% rename from pkgs/bft/fail/fail.go rename to tm2/pkg/bft/fail/fail.go diff --git a/pkgs/bft/mempool/bench_test.go b/tm2/pkg/bft/mempool/bench_test.go similarity index 93% rename from pkgs/bft/mempool/bench_test.go rename to tm2/pkg/bft/mempool/bench_test.go index c2a31bdef81..108719b3a41 100644 --- a/pkgs/bft/mempool/bench_test.go +++ b/tm2/pkg/bft/mempool/bench_test.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "testing" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - "github.com/gnolang/gno/pkgs/bft/proxy" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" ) func BenchmarkReap(b *testing.B) { diff --git a/pkgs/bft/mempool/cache_test.go b/tm2/pkg/bft/mempool/cache_test.go similarity index 95% rename from pkgs/bft/mempool/cache_test.go rename to tm2/pkg/bft/mempool/cache_test.go index 848b9709822..5f76d6875ea 100644 --- a/pkgs/bft/mempool/cache_test.go +++ b/tm2/pkg/bft/mempool/cache_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - "github.com/gnolang/gno/pkgs/bft/proxy" - "github.com/gnolang/gno/pkgs/bft/types" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) func TestCacheRemove(t *testing.T) { diff --git a/pkgs/bft/mempool/clist_mempool.go b/tm2/pkg/bft/mempool/clist_mempool.go similarity index 97% rename from pkgs/bft/mempool/clist_mempool.go rename to tm2/pkg/bft/mempool/clist_mempool.go index f3652c35a83..14fc52e19b2 100644 --- a/pkgs/bft/mempool/clist_mempool.go +++ b/tm2/pkg/bft/mempool/clist_mempool.go @@ -9,16 +9,16 @@ import ( "sync/atomic" "time" - auto "github.com/gnolang/gno/pkgs/autofile" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cfg "github.com/gnolang/gno/pkgs/bft/mempool/config" - "github.com/gnolang/gno/pkgs/bft/proxy" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/clist" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/maths" - osm "github.com/gnolang/gno/pkgs/os" + auto "github.com/gnolang/gno/tm2/pkg/autofile" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cfg "github.com/gnolang/gno/tm2/pkg/bft/mempool/config" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/clist" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/maths" + osm "github.com/gnolang/gno/tm2/pkg/os" ) // -------------------------------------------------------------------------------- diff --git a/pkgs/bft/mempool/clist_mempool_test.go b/tm2/pkg/bft/mempool/clist_mempool_test.go similarity index 97% rename from pkgs/bft/mempool/clist_mempool_test.go rename to tm2/pkg/bft/mempool/clist_mempool_test.go index 3950858aef3..60582f1922d 100644 --- a/pkgs/bft/mempool/clist_mempool_test.go +++ b/tm2/pkg/bft/mempool/clist_mempool_test.go @@ -13,14 +13,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/abci/example/counter" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cfg "github.com/gnolang/gno/pkgs/bft/mempool/config" - "github.com/gnolang/gno/pkgs/bft/proxy" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/counter" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cfg "github.com/gnolang/gno/tm2/pkg/bft/mempool/config" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/random" ) // A cleanupFunc cleans up any config / test files created for a particular diff --git a/pkgs/bft/mempool/config/config.go b/tm2/pkg/bft/mempool/config/config.go similarity index 97% rename from pkgs/bft/mempool/config/config.go rename to tm2/pkg/bft/mempool/config/config.go index 2ca0af39738..06e8d98672f 100644 --- a/pkgs/bft/mempool/config/config.go +++ b/tm2/pkg/bft/mempool/config/config.go @@ -1,6 +1,6 @@ package config -import "github.com/gnolang/gno/pkgs/errors" +import "github.com/gnolang/gno/tm2/pkg/errors" //----------------------------------------------------------------------------- // MempoolConfig diff --git a/pkgs/bft/mempool/config/utils.go b/tm2/pkg/bft/mempool/config/utils.go similarity index 100% rename from pkgs/bft/mempool/config/utils.go rename to tm2/pkg/bft/mempool/config/utils.go diff --git a/pkgs/bft/mempool/doc.go b/tm2/pkg/bft/mempool/doc.go similarity index 100% rename from pkgs/bft/mempool/doc.go rename to tm2/pkg/bft/mempool/doc.go diff --git a/pkgs/bft/mempool/errors.go b/tm2/pkg/bft/mempool/errors.go similarity index 95% rename from pkgs/bft/mempool/errors.go rename to tm2/pkg/bft/mempool/errors.go index d48fa320c03..b9c9989a5da 100644 --- a/pkgs/bft/mempool/errors.go +++ b/tm2/pkg/bft/mempool/errors.go @@ -3,7 +3,7 @@ package mempool import ( "fmt" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // ErrTxInCache is returned to the client if we saw tx earlier diff --git a/pkgs/bft/mempool/mempool.go b/tm2/pkg/bft/mempool/mempool.go similarity index 97% rename from pkgs/bft/mempool/mempool.go rename to tm2/pkg/bft/mempool/mempool.go index ef7de331692..6f822eb99ff 100644 --- a/pkgs/bft/mempool/mempool.go +++ b/tm2/pkg/bft/mempool/mempool.go @@ -1,8 +1,8 @@ package mempool import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) // Mempool defines the mempool interface. diff --git a/pkgs/bft/mempool/mempool.proto b/tm2/pkg/bft/mempool/mempool.proto similarity index 54% rename from pkgs/bft/mempool/mempool.proto rename to tm2/pkg/bft/mempool/mempool.proto index 511601c019b..7eb0a7c8ce5 100644 --- a/pkgs/bft/mempool/mempool.proto +++ b/tm2/pkg/bft/mempool/mempool.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/bft/mempool/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/bft/mempool/pb"; // messages message TxMessage { diff --git a/pkgs/bft/mempool/mock/mock.go b/tm2/pkg/bft/mempool/mock/mock.go similarity index 86% rename from pkgs/bft/mempool/mock/mock.go rename to tm2/pkg/bft/mempool/mock/mock.go index 7de6746f62f..a64a98227ee 100644 --- a/pkgs/bft/mempool/mock/mock.go +++ b/tm2/pkg/bft/mempool/mock/mock.go @@ -1,10 +1,10 @@ package mock import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/clist" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/clist" ) // Mempool is an empty implementation of a Mempool, useful for testing. diff --git a/pkgs/bft/mempool/package.go b/tm2/pkg/bft/mempool/package.go similarity index 65% rename from pkgs/bft/mempool/package.go rename to tm2/pkg/bft/mempool/package.go index a2794fc01c9..913ee0aa10a 100644 --- a/pkgs/bft/mempool/package.go +++ b/tm2/pkg/bft/mempool/package.go @@ -1,11 +1,11 @@ package mempool import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/mempool", + "github.com/gnolang/gno/tm2/pkg/bft/mempool", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/bft/mempool/reactor.go b/tm2/pkg/bft/mempool/reactor.go similarity index 96% rename from pkgs/bft/mempool/reactor.go rename to tm2/pkg/bft/mempool/reactor.go index 514da7ec460..f6ee67b3fc4 100644 --- a/pkgs/bft/mempool/reactor.go +++ b/tm2/pkg/bft/mempool/reactor.go @@ -7,12 +7,12 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/amino" - cfg "github.com/gnolang/gno/pkgs/bft/mempool/config" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/clist" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" + "github.com/gnolang/gno/tm2/pkg/amino" + cfg "github.com/gnolang/gno/tm2/pkg/bft/mempool/config" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/clist" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" ) const ( diff --git a/pkgs/bft/mempool/reactor_test.go b/tm2/pkg/bft/mempool/reactor_test.go similarity index 92% rename from pkgs/bft/mempool/reactor_test.go rename to tm2/pkg/bft/mempool/reactor_test.go index bbd5ad96727..c3b77fb46df 100644 --- a/pkgs/bft/mempool/reactor_test.go +++ b/tm2/pkg/bft/mempool/reactor_test.go @@ -9,17 +9,17 @@ import ( "github.com/fortytw2/leaktest" "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - memcfg "github.com/gnolang/gno/pkgs/bft/mempool/config" - "github.com/gnolang/gno/pkgs/bft/proxy" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/colors" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - p2pcfg "github.com/gnolang/gno/pkgs/p2p/config" - "github.com/gnolang/gno/pkgs/p2p/mock" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + memcfg "github.com/gnolang/gno/tm2/pkg/bft/mempool/config" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/colors" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + p2pcfg "github.com/gnolang/gno/tm2/pkg/p2p/config" + "github.com/gnolang/gno/tm2/pkg/p2p/mock" + "github.com/gnolang/gno/tm2/pkg/testutils" ) type peerState struct { diff --git a/pkgs/bft/node/doc.go b/tm2/pkg/bft/node/doc.go similarity index 100% rename from pkgs/bft/node/doc.go rename to tm2/pkg/bft/node/doc.go diff --git a/pkgs/bft/node/id.go b/tm2/pkg/bft/node/id.go similarity index 91% rename from pkgs/bft/node/id.go rename to tm2/pkg/bft/node/id.go index 35a190d57b1..821b55a268f 100644 --- a/pkgs/bft/node/id.go +++ b/tm2/pkg/bft/node/id.go @@ -3,7 +3,7 @@ package node import ( "time" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) type NodeID struct { diff --git a/pkgs/bft/node/node.go b/tm2/pkg/bft/node/node.go similarity index 95% rename from pkgs/bft/node/node.go rename to tm2/pkg/bft/node/node.go index 514f11ecfff..fbf36af9b28 100644 --- a/pkgs/bft/node/node.go +++ b/tm2/pkg/bft/node/node.go @@ -13,34 +13,34 @@ import ( "github.com/gnolang/cors" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - bc "github.com/gnolang/gno/pkgs/bft/blockchain" - cfg "github.com/gnolang/gno/pkgs/bft/config" - cs "github.com/gnolang/gno/pkgs/bft/consensus" - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - "github.com/gnolang/gno/pkgs/bft/privval" - "github.com/gnolang/gno/pkgs/bft/proxy" - rpccore "github.com/gnolang/gno/pkgs/bft/rpc/core" - _ "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpcserver "github.com/gnolang/gno/pkgs/bft/rpc/lib/server" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/state/txindex" - "github.com/gnolang/gno/pkgs/events" - - //"github.com/gnolang/gno/pkgs/bft/state/txindex/kv" - "github.com/gnolang/gno/pkgs/bft/state/txindex/null" - "github.com/gnolang/gno/pkgs/bft/store" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/bft/version" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/service" - verset "github.com/gnolang/gno/pkgs/versionset" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + bc "github.com/gnolang/gno/tm2/pkg/bft/blockchain" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + cs "github.com/gnolang/gno/tm2/pkg/bft/consensus" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + "github.com/gnolang/gno/tm2/pkg/bft/privval" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + rpccore "github.com/gnolang/gno/tm2/pkg/bft/rpc/core" + _ "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpcserver "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/server" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/state/txindex" + "github.com/gnolang/gno/tm2/pkg/events" + + //"github.com/gnolang/gno/tm2/pkg/bft/state/txindex/kv" + "github.com/gnolang/gno/tm2/pkg/bft/state/txindex/null" + "github.com/gnolang/gno/tm2/pkg/bft/store" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/bft/version" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/service" + verset "github.com/gnolang/gno/tm2/pkg/versionset" ) //------------------------------------------------------------------------------ @@ -469,7 +469,7 @@ func NewNode(config *cfg.Config, pubKey := privValidator.GetPubKey() if pubKey == nil { - // TODO: GetPubKey should return errors - https://github.com/gnolang/gno/pkgs/bft/issues/3602 + // TODO: GetPubKey should return errors - https://github.com/gnolang/gno/tm2/pkg/bft/issues/3602 return nil, errors.New("could not retrieve public key from private validator") } @@ -688,7 +688,7 @@ func (n *Node) startRPC() ([]net.Listener, error) { config.MaxOpenConnections = n.config.RPC.MaxOpenConnections // If necessary adjust global WriteTimeout to ensure it's greater than // TimeoutBroadcastTxCommit. - // See https://github.com/gnolang/gno/pkgs/bft/issues/3435 + // See https://github.com/gnolang/gno/tm2/pkg/bft/issues/3435 if config.WriteTimeout <= n.config.RPC.TimeoutBroadcastTxCommit { config.WriteTimeout = n.config.RPC.TimeoutBroadcastTxCommit + 1*time.Second } diff --git a/pkgs/bft/node/node_test.go b/tm2/pkg/bft/node/node_test.go similarity index 92% rename from pkgs/bft/node/node_test.go rename to tm2/pkg/bft/node/node_test.go index 9d9ad7f0eba..2352df49762 100644 --- a/pkgs/bft/node/node_test.go +++ b/tm2/pkg/bft/node/node_test.go @@ -11,21 +11,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - cfg "github.com/gnolang/gno/pkgs/bft/config" - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - "github.com/gnolang/gno/pkgs/bft/privval" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - p2pmock "github.com/gnolang/gno/pkgs/p2p/mock" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + "github.com/gnolang/gno/tm2/pkg/bft/privval" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + p2pmock "github.com/gnolang/gno/tm2/pkg/p2p/mock" + "github.com/gnolang/gno/tm2/pkg/random" ) func TestNodeStartStop(t *testing.T) { diff --git a/pkgs/bft/privval/doc.go b/tm2/pkg/bft/privval/doc.go similarity index 100% rename from pkgs/bft/privval/doc.go rename to tm2/pkg/bft/privval/doc.go diff --git a/pkgs/bft/privval/errors.go b/tm2/pkg/bft/privval/errors.go similarity index 100% rename from pkgs/bft/privval/errors.go rename to tm2/pkg/bft/privval/errors.go diff --git a/pkgs/bft/privval/file.go b/tm2/pkg/bft/privval/file.go similarity index 97% rename from pkgs/bft/privval/file.go rename to tm2/pkg/bft/privval/file.go index ef8c44e1bc4..4af1e9e24a6 100644 --- a/pkgs/bft/privval/file.go +++ b/tm2/pkg/bft/privval/file.go @@ -7,12 +7,12 @@ import ( "os" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - osm "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + osm "github.com/gnolang/gno/tm2/pkg/os" ) // TODO: type ? diff --git a/pkgs/bft/privval/file_test.go b/tm2/pkg/bft/privval/file_test.go similarity index 98% rename from pkgs/bft/privval/file_test.go rename to tm2/pkg/bft/privval/file_test.go index 1d2824360a3..306db4177e5 100644 --- a/pkgs/bft/privval/file_test.go +++ b/tm2/pkg/bft/privval/file_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" ) func TestGenLoadValidator(t *testing.T) { diff --git a/pkgs/bft/privval/messages.go b/tm2/pkg/bft/privval/messages.go similarity index 93% rename from pkgs/bft/privval/messages.go rename to tm2/pkg/bft/privval/messages.go index 0d39de98616..cc9f562edc4 100644 --- a/pkgs/bft/privval/messages.go +++ b/tm2/pkg/bft/privval/messages.go @@ -1,8 +1,8 @@ package privval import ( - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // SignerMessage is sent between Signer Clients and Servers. diff --git a/pkgs/bft/privval/package.go b/tm2/pkg/bft/privval/package.go similarity index 81% rename from pkgs/bft/privval/package.go rename to tm2/pkg/bft/privval/package.go index 0d02049aaa9..02935c33e4e 100644 --- a/pkgs/bft/privval/package.go +++ b/tm2/pkg/bft/privval/package.go @@ -1,11 +1,11 @@ package privval import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/privval", + "github.com/gnolang/gno/tm2/pkg/bft/privval", "tm.remotesigner", amino.GetCallersDirname(), ). diff --git a/pkgs/bft/privval/signer_client.go b/tm2/pkg/bft/privval/signer_client.go similarity index 96% rename from pkgs/bft/privval/signer_client.go rename to tm2/pkg/bft/privval/signer_client.go index 1521c289d7e..3995ac1ab0f 100644 --- a/pkgs/bft/privval/signer_client.go +++ b/tm2/pkg/bft/privval/signer_client.go @@ -3,9 +3,9 @@ package privval import ( "time" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" ) // SignerClient implements PrivValidator. diff --git a/pkgs/bft/privval/signer_client_test.go b/tm2/pkg/bft/privval/signer_client_test.go similarity index 98% rename from pkgs/bft/privval/signer_client_test.go rename to tm2/pkg/bft/privval/signer_client_test.go index d0b65b296e4..1ba6b2e08d5 100644 --- a/pkgs/bft/privval/signer_client_test.go +++ b/tm2/pkg/bft/privval/signer_client_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/testutils" ) type signerTestCase struct { diff --git a/pkgs/bft/privval/signer_dialer_endpoint.go b/tm2/pkg/bft/privval/signer_dialer_endpoint.go similarity index 96% rename from pkgs/bft/privval/signer_dialer_endpoint.go rename to tm2/pkg/bft/privval/signer_dialer_endpoint.go index 6b63df19670..40a76b6cb9f 100644 --- a/pkgs/bft/privval/signer_dialer_endpoint.go +++ b/tm2/pkg/bft/privval/signer_dialer_endpoint.go @@ -3,8 +3,8 @@ package privval import ( "time" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/service" ) const ( diff --git a/pkgs/bft/privval/signer_endpoint.go b/tm2/pkg/bft/privval/signer_endpoint.go similarity index 96% rename from pkgs/bft/privval/signer_endpoint.go rename to tm2/pkg/bft/privval/signer_endpoint.go index 1098a786ded..13dd43636c4 100644 --- a/pkgs/bft/privval/signer_endpoint.go +++ b/tm2/pkg/bft/privval/signer_endpoint.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/service" ) const ( diff --git a/pkgs/bft/privval/signer_listener_endpoint.go b/tm2/pkg/bft/privval/signer_listener_endpoint.go similarity index 98% rename from pkgs/bft/privval/signer_listener_endpoint.go rename to tm2/pkg/bft/privval/signer_listener_endpoint.go index c7e5907aa3c..30ed24268ca 100644 --- a/pkgs/bft/privval/signer_listener_endpoint.go +++ b/tm2/pkg/bft/privval/signer_listener_endpoint.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/service" ) // SignerValidatorEndpointOption sets an optional parameter on the SocketVal. diff --git a/pkgs/bft/privval/signer_listener_endpoint_test.go b/tm2/pkg/bft/privval/signer_listener_endpoint_test.go similarity index 96% rename from pkgs/bft/privval/signer_listener_endpoint_test.go rename to tm2/pkg/bft/privval/signer_listener_endpoint_test.go index 5142db95405..8e5b1613454 100644 --- a/pkgs/bft/privval/signer_listener_endpoint_test.go +++ b/tm2/pkg/bft/privval/signer_listener_endpoint_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/random" ) var ( diff --git a/pkgs/bft/privval/signer_requestHandler.go b/tm2/pkg/bft/privval/signer_requestHandler.go similarity index 91% rename from pkgs/bft/privval/signer_requestHandler.go rename to tm2/pkg/bft/privval/signer_requestHandler.go index 28d1302e82b..f72abdf97de 100644 --- a/pkgs/bft/privval/signer_requestHandler.go +++ b/tm2/pkg/bft/privval/signer_requestHandler.go @@ -3,8 +3,8 @@ package privval import ( "fmt" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" ) func DefaultValidationRequestHandler(privVal types.PrivValidator, req SignerMessage, chainID string) (SignerMessage, error) { diff --git a/pkgs/bft/privval/signer_server.go b/tm2/pkg/bft/privval/signer_server.go similarity index 96% rename from pkgs/bft/privval/signer_server.go rename to tm2/pkg/bft/privval/signer_server.go index ee3b5f31e02..e5158971dfe 100644 --- a/pkgs/bft/privval/signer_server.go +++ b/tm2/pkg/bft/privval/signer_server.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/service" ) // ValidationRequestHandlerFunc handles different remoteSigner requests diff --git a/pkgs/bft/privval/socket_dialers.go b/tm2/pkg/bft/privval/socket_dialers.go similarity index 84% rename from pkgs/bft/privval/socket_dialers.go rename to tm2/pkg/bft/privval/socket_dialers.go index 0d2e5c56546..916d253a0cd 100644 --- a/pkgs/bft/privval/socket_dialers.go +++ b/tm2/pkg/bft/privval/socket_dialers.go @@ -4,10 +4,10 @@ import ( "net" "time" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/errors" - osm "github.com/gnolang/gno/pkgs/os" - p2pconn "github.com/gnolang/gno/pkgs/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/errors" + osm "github.com/gnolang/gno/tm2/pkg/os" + p2pconn "github.com/gnolang/gno/tm2/pkg/p2p/conn" ) // Socket errors. diff --git a/pkgs/bft/privval/socket_dialers_test.go b/tm2/pkg/bft/privval/socket_dialers_test.go similarity index 93% rename from pkgs/bft/privval/socket_dialers_test.go rename to tm2/pkg/bft/privval/socket_dialers_test.go index 97e2a55ae52..150b9218575 100644 --- a/pkgs/bft/privval/socket_dialers_test.go +++ b/tm2/pkg/bft/privval/socket_dialers_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/errors" ) func getDialerTestCases(t *testing.T) []dialerTestCase { diff --git a/pkgs/bft/privval/socket_listeners.go b/tm2/pkg/bft/privval/socket_listeners.go similarity index 98% rename from pkgs/bft/privval/socket_listeners.go rename to tm2/pkg/bft/privval/socket_listeners.go index b3b1e6fdf8b..85bbe32525f 100644 --- a/pkgs/bft/privval/socket_listeners.go +++ b/tm2/pkg/bft/privval/socket_listeners.go @@ -4,8 +4,8 @@ import ( "net" "time" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - p2pconn "github.com/gnolang/gno/pkgs/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + p2pconn "github.com/gnolang/gno/tm2/pkg/p2p/conn" ) const ( diff --git a/pkgs/bft/privval/socket_listeners_test.go b/tm2/pkg/bft/privval/socket_listeners_test.go similarity index 98% rename from pkgs/bft/privval/socket_listeners_test.go rename to tm2/pkg/bft/privval/socket_listeners_test.go index cf96f5f911e..a3630903197 100644 --- a/pkgs/bft/privval/socket_listeners_test.go +++ b/tm2/pkg/bft/privval/socket_listeners_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/gnolang/gno/pkgs/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" ) // ------------------------------------------- diff --git a/pkgs/bft/privval/utils.go b/tm2/pkg/bft/privval/utils.go similarity index 87% rename from pkgs/bft/privval/utils.go rename to tm2/pkg/bft/privval/utils.go index d980ba08de0..c190235ddf3 100644 --- a/pkgs/bft/privval/utils.go +++ b/tm2/pkg/bft/privval/utils.go @@ -4,10 +4,10 @@ import ( "fmt" "net" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" ) // IsConnTimeout returns a boolean indicating whether the error is known to diff --git a/pkgs/bft/privval/utils_test.go b/tm2/pkg/bft/privval/utils_test.go similarity index 88% rename from pkgs/bft/privval/utils_test.go rename to tm2/pkg/bft/privval/utils_test.go index ee8bb2588c0..6e5562e4cbd 100644 --- a/pkgs/bft/privval/utils_test.go +++ b/tm2/pkg/bft/privval/utils_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) func TestIsConnTimeoutForNonTimeoutErrors(t *testing.T) { diff --git a/pkgs/bft/proxy/app_conn.go b/tm2/pkg/bft/proxy/app_conn.go similarity index 97% rename from pkgs/bft/proxy/app_conn.go rename to tm2/pkg/bft/proxy/app_conn.go index 1c0b105a88d..0bb3c76f331 100644 --- a/pkgs/bft/proxy/app_conn.go +++ b/tm2/pkg/bft/proxy/app_conn.go @@ -1,8 +1,8 @@ package proxy import ( - abcicli "github.com/gnolang/gno/pkgs/bft/abci/client" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abcicli "github.com/gnolang/gno/tm2/pkg/bft/abci/client" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) //---------------------------------------------------------------------------------------- diff --git a/pkgs/bft/proxy/client.go b/tm2/pkg/bft/proxy/client.go similarity index 87% rename from pkgs/bft/proxy/client.go rename to tm2/pkg/bft/proxy/client.go index 5215f1c7fb9..73cf9f0d828 100644 --- a/pkgs/bft/proxy/client.go +++ b/tm2/pkg/bft/proxy/client.go @@ -3,10 +3,10 @@ package proxy import ( "sync" - abcicli "github.com/gnolang/gno/pkgs/bft/abci/client" - "github.com/gnolang/gno/pkgs/bft/abci/example/counter" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abcicli "github.com/gnolang/gno/tm2/pkg/bft/abci/client" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/counter" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) // NewABCIClient returns newly connected client diff --git a/pkgs/bft/proxy/multi_app_conn.go b/tm2/pkg/bft/proxy/multi_app_conn.go similarity index 97% rename from pkgs/bft/proxy/multi_app_conn.go rename to tm2/pkg/bft/proxy/multi_app_conn.go index c71843fd0c4..b820dbcb286 100644 --- a/pkgs/bft/proxy/multi_app_conn.go +++ b/tm2/pkg/bft/proxy/multi_app_conn.go @@ -1,8 +1,8 @@ package proxy import ( - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/service" ) //----------------------------- diff --git a/pkgs/bft/rpc/client/examples_test.go b/tm2/pkg/bft/rpc/client/examples_test.go similarity index 93% rename from pkgs/bft/rpc/client/examples_test.go rename to tm2/pkg/bft/rpc/client/examples_test.go index 2bbf6c8adf6..bad20cc9b4f 100644 --- a/pkgs/bft/rpc/client/examples_test.go +++ b/tm2/pkg/bft/rpc/client/examples_test.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctest "github.com/gnolang/gno/pkgs/bft/rpc/test" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctest "github.com/gnolang/gno/tm2/pkg/bft/rpc/test" ) func ExampleHTTP_simple() { diff --git a/pkgs/bft/rpc/client/helpers.go b/tm2/pkg/bft/rpc/client/helpers.go similarity index 96% rename from pkgs/bft/rpc/client/helpers.go rename to tm2/pkg/bft/rpc/client/helpers.go index 198eb61ab1a..a3299909f82 100644 --- a/pkgs/bft/rpc/client/helpers.go +++ b/tm2/pkg/bft/rpc/client/helpers.go @@ -3,7 +3,7 @@ package client import ( "time" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // Waiter is informed of current height, decided whether to quit early diff --git a/pkgs/bft/rpc/client/helpers_test.go b/tm2/pkg/bft/rpc/client/helpers_test.go similarity index 91% rename from pkgs/bft/rpc/client/helpers_test.go rename to tm2/pkg/bft/rpc/client/helpers_test.go index a5a1d10415e..a58ed5adfd6 100644 --- a/pkgs/bft/rpc/client/helpers_test.go +++ b/tm2/pkg/bft/rpc/client/helpers_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - "github.com/gnolang/gno/pkgs/bft/rpc/client/mock" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client/mock" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/random" ) func TestWaitForHeight(t *testing.T) { diff --git a/pkgs/bft/rpc/client/httpclient.go b/tm2/pkg/bft/rpc/client/httpclient.go similarity index 98% rename from pkgs/bft/rpc/client/httpclient.go rename to tm2/pkg/bft/rpc/client/httpclient.go index b4dfbc79601..c7295e327ed 100644 --- a/pkgs/bft/rpc/client/httpclient.go +++ b/tm2/pkg/bft/rpc/client/httpclient.go @@ -3,10 +3,10 @@ package client import ( "net/http" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpcclient "github.com/gnolang/gno/pkgs/bft/rpc/lib/client" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/errors" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/client" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/errors" ) /* diff --git a/pkgs/bft/rpc/client/interface.go b/tm2/pkg/bft/rpc/client/interface.go similarity index 96% rename from pkgs/bft/rpc/client/interface.go rename to tm2/pkg/bft/rpc/client/interface.go index d59a8db3427..a24e95f94bd 100644 --- a/pkgs/bft/rpc/client/interface.go +++ b/tm2/pkg/bft/rpc/client/interface.go @@ -21,8 +21,8 @@ implementation. */ import ( - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - "github.com/gnolang/gno/pkgs/bft/types" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) // Client wraps most important rpc calls a client would make. diff --git a/pkgs/bft/rpc/client/localclient.go b/tm2/pkg/bft/rpc/client/localclient.go similarity index 93% rename from pkgs/bft/rpc/client/localclient.go rename to tm2/pkg/bft/rpc/client/localclient.go index 4d0bedda766..20209f74071 100644 --- a/pkgs/bft/rpc/client/localclient.go +++ b/tm2/pkg/bft/rpc/client/localclient.go @@ -1,12 +1,12 @@ package client import ( - nm "github.com/gnolang/gno/pkgs/bft/node" - "github.com/gnolang/gno/pkgs/bft/rpc/core" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/log" + nm "github.com/gnolang/gno/tm2/pkg/bft/node" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/core" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/log" ) /* diff --git a/pkgs/bft/rpc/client/main_test.go b/tm2/pkg/bft/rpc/client/main_test.go similarity index 74% rename from pkgs/bft/rpc/client/main_test.go rename to tm2/pkg/bft/rpc/client/main_test.go index faa787a17a8..58dd9538412 100644 --- a/pkgs/bft/rpc/client/main_test.go +++ b/tm2/pkg/bft/rpc/client/main_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - nm "github.com/gnolang/gno/pkgs/bft/node" - rpctest "github.com/gnolang/gno/pkgs/bft/rpc/test" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + nm "github.com/gnolang/gno/tm2/pkg/bft/node" + rpctest "github.com/gnolang/gno/tm2/pkg/bft/rpc/test" ) var node *nm.Node diff --git a/pkgs/bft/rpc/client/mock/abci.go b/tm2/pkg/bft/rpc/client/mock/abci.go similarity index 96% rename from pkgs/bft/rpc/client/mock/abci.go rename to tm2/pkg/bft/rpc/client/mock/abci.go index db1ca8698f1..af09fa6c43a 100644 --- a/pkgs/bft/rpc/client/mock/abci.go +++ b/tm2/pkg/bft/rpc/client/mock/abci.go @@ -1,10 +1,10 @@ package mock import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - "github.com/gnolang/gno/pkgs/bft/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) // ABCIApp will send all abci related request to the named app, diff --git a/pkgs/bft/rpc/client/mock/abci_test.go b/tm2/pkg/bft/rpc/client/mock/abci_test.go similarity index 93% rename from pkgs/bft/rpc/client/mock/abci_test.go rename to tm2/pkg/bft/rpc/client/mock/abci_test.go index 824e5ea8a27..08019807f33 100644 --- a/pkgs/bft/rpc/client/mock/abci_test.go +++ b/tm2/pkg/bft/rpc/client/mock/abci_test.go @@ -7,13 +7,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - "github.com/gnolang/gno/pkgs/bft/rpc/client/mock" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client/mock" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/errors" ) func TestABCIMock(t *testing.T) { diff --git a/pkgs/bft/rpc/client/mock/client.go b/tm2/pkg/bft/rpc/client/mock/client.go similarity index 93% rename from pkgs/bft/rpc/client/mock/client.go rename to tm2/pkg/bft/rpc/client/mock/client.go index 26d6ea121d4..f7a617da9fe 100644 --- a/pkgs/bft/rpc/client/mock/client.go +++ b/tm2/pkg/bft/rpc/client/mock/client.go @@ -17,12 +17,12 @@ want to directly call a tendermint node in process, you can use the import ( "reflect" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - "github.com/gnolang/gno/pkgs/bft/rpc/core" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/core" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/service" ) // Client wraps arbitrary implementations of the various interfaces. diff --git a/pkgs/bft/rpc/client/mock/status.go b/tm2/pkg/bft/rpc/client/mock/status.go similarity index 89% rename from pkgs/bft/rpc/client/mock/status.go rename to tm2/pkg/bft/rpc/client/mock/status.go index 5d7be935f0a..e5a1d84209b 100644 --- a/pkgs/bft/rpc/client/mock/status.go +++ b/tm2/pkg/bft/rpc/client/mock/status.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/gnolang/gno/pkgs/bft/rpc/client" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" ) // StatusMock returns the result specified by the Call diff --git a/pkgs/bft/rpc/client/mock/status_test.go b/tm2/pkg/bft/rpc/client/mock/status_test.go similarity index 90% rename from pkgs/bft/rpc/client/mock/status_test.go rename to tm2/pkg/bft/rpc/client/mock/status_test.go index c9d1245fb72..ad2f998eed7 100644 --- a/pkgs/bft/rpc/client/mock/status_test.go +++ b/tm2/pkg/bft/rpc/client/mock/status_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/rpc/client/mock" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client/mock" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" ) func TestStatus(t *testing.T) { diff --git a/pkgs/bft/rpc/client/rpc_test.go b/tm2/pkg/bft/rpc/client/rpc_test.go similarity index 98% rename from pkgs/bft/rpc/client/rpc_test.go rename to tm2/pkg/bft/rpc/client/rpc_test.go index e3424e5ac9c..7b649e1dda8 100644 --- a/pkgs/bft/rpc/client/rpc_test.go +++ b/tm2/pkg/bft/rpc/client/rpc_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpcclient "github.com/gnolang/gno/pkgs/bft/rpc/lib/client" - rpctest "github.com/gnolang/gno/pkgs/bft/rpc/test" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/maths" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/client" + rpctest "github.com/gnolang/gno/tm2/pkg/bft/rpc/test" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/maths" ) func getHTTPClient() *client.HTTP { diff --git a/pkgs/bft/rpc/client/types.go b/tm2/pkg/bft/rpc/client/types.go similarity index 100% rename from pkgs/bft/rpc/client/types.go rename to tm2/pkg/bft/rpc/client/types.go diff --git a/pkgs/bft/rpc/config/config.go b/tm2/pkg/bft/rpc/config/config.go similarity index 98% rename from pkgs/bft/rpc/config/config.go rename to tm2/pkg/bft/rpc/config/config.go index 85459bbc611..8fa151644e7 100644 --- a/pkgs/bft/rpc/config/config.go +++ b/tm2/pkg/bft/rpc/config/config.go @@ -59,7 +59,7 @@ type RPCConfig struct { // How long to wait for a tx to be committed during /broadcast_tx_commit // WARNING: Using a value larger than 10s will result in increasing the // global HTTP write timeout, which applies to all connections and endpoints. - // See https://github.com/gnolang/gno/pkgs/bft/issues/3435 + // See https://github.com/gnolang/gno/tm2/pkg/bft/issues/3435 TimeoutBroadcastTxCommit time.Duration `toml:"timeout_broadcast_tx_commit"` // Maximum size of request body, in bytes diff --git a/pkgs/bft/rpc/config/utils.go b/tm2/pkg/bft/rpc/config/utils.go similarity index 100% rename from pkgs/bft/rpc/config/utils.go rename to tm2/pkg/bft/rpc/config/utils.go diff --git a/pkgs/bft/rpc/core/README.md b/tm2/pkg/bft/rpc/core/README.md similarity index 100% rename from pkgs/bft/rpc/core/README.md rename to tm2/pkg/bft/rpc/core/README.md diff --git a/pkgs/bft/rpc/core/abci.go b/tm2/pkg/bft/rpc/core/abci.go similarity index 93% rename from pkgs/bft/rpc/core/abci.go rename to tm2/pkg/bft/rpc/core/abci.go index d949efbdf94..aef90052f58 100644 --- a/pkgs/bft/rpc/core/abci.go +++ b/tm2/pkg/bft/rpc/core/abci.go @@ -1,9 +1,9 @@ package core import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" ) // Query the application for some information. diff --git a/pkgs/bft/rpc/core/blocks.go b/tm2/pkg/bft/rpc/core/blocks.go similarity index 97% rename from pkgs/bft/rpc/core/blocks.go rename to tm2/pkg/bft/rpc/core/blocks.go index 34951868a28..7603a1d5c1b 100644 --- a/pkgs/bft/rpc/core/blocks.go +++ b/tm2/pkg/bft/rpc/core/blocks.go @@ -3,11 +3,11 @@ package core import ( "fmt" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/maths" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/maths" ) // Get block headers for minHeight <= height <= maxHeight. diff --git a/pkgs/bft/rpc/core/blocks_test.go b/tm2/pkg/bft/rpc/core/blocks_test.go similarity index 100% rename from pkgs/bft/rpc/core/blocks_test.go rename to tm2/pkg/bft/rpc/core/blocks_test.go diff --git a/pkgs/bft/rpc/core/consensus.go b/tm2/pkg/bft/rpc/core/consensus.go similarity index 97% rename from pkgs/bft/rpc/core/consensus.go rename to tm2/pkg/bft/rpc/core/consensus.go index 4660629777b..a552252f8c0 100644 --- a/pkgs/bft/rpc/core/consensus.go +++ b/tm2/pkg/bft/rpc/core/consensus.go @@ -1,11 +1,11 @@ package core import ( - cm "github.com/gnolang/gno/pkgs/bft/consensus" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" + cm "github.com/gnolang/gno/tm2/pkg/bft/consensus" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) // Get the validator set at the given block height. diff --git a/pkgs/bft/rpc/core/dev.go b/tm2/pkg/bft/rpc/core/dev.go similarity index 92% rename from pkgs/bft/rpc/core/dev.go rename to tm2/pkg/bft/rpc/core/dev.go index 6563f0dae76..a11c931b123 100644 --- a/pkgs/bft/rpc/core/dev.go +++ b/tm2/pkg/bft/rpc/core/dev.go @@ -4,8 +4,8 @@ import ( "os" "runtime/pprof" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" ) // UnsafeFlushMempool removes all transactions from the mempool. diff --git a/pkgs/bft/rpc/core/doc.go b/tm2/pkg/bft/rpc/core/doc.go similarity index 96% rename from pkgs/bft/rpc/core/doc.go rename to tm2/pkg/bft/rpc/core/doc.go index b96cf7074c8..2cdbe51fbb1 100644 --- a/pkgs/bft/rpc/core/doc.go +++ b/tm2/pkg/bft/rpc/core/doc.go @@ -8,7 +8,7 @@ Tendermint supports the following RPC protocols: * JSONRPC over websockets Tendermint RPC is built using our own RPC library which contains its own set of documentation and tests. -See it here: https://github.com/gnolang/gno/pkgs/bft/tree/master/rpc/lib +See it here: https://github.com/gnolang/gno/tm2/pkg/bft/tree/master/rpc/lib ## Configuration diff --git a/pkgs/bft/rpc/core/doc_template.txt b/tm2/pkg/bft/rpc/core/doc_template.txt similarity index 100% rename from pkgs/bft/rpc/core/doc_template.txt rename to tm2/pkg/bft/rpc/core/doc_template.txt diff --git a/pkgs/bft/rpc/core/health.go b/tm2/pkg/bft/rpc/core/health.go similarity index 84% rename from pkgs/bft/rpc/core/health.go rename to tm2/pkg/bft/rpc/core/health.go index a0d509b1971..f036ba9b896 100644 --- a/pkgs/bft/rpc/core/health.go +++ b/tm2/pkg/bft/rpc/core/health.go @@ -1,8 +1,8 @@ package core import ( - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" ) // Get node health. Returns empty result (200 OK) on success, no response - in diff --git a/pkgs/bft/rpc/core/mempool.go b/tm2/pkg/bft/rpc/core/mempool.go similarity index 95% rename from pkgs/bft/rpc/core/mempool.go rename to tm2/pkg/bft/rpc/core/mempool.go index a44db75e996..ba3750574ce 100644 --- a/pkgs/bft/rpc/core/mempool.go +++ b/tm2/pkg/bft/rpc/core/mempool.go @@ -5,14 +5,14 @@ import ( "sync" "time" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/service" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/service" ) // ----------------------------------------------------------------------------- @@ -31,7 +31,7 @@ import ( // 1. malicious node can drop or pretend it had committed your tx // 2. malicious proposer (not necessary the one you're communicating with) can // drop transactions, which might become valid in the future -// (https://github.com/gnolang/gno/pkgs/bft/issues/3322) +// (https://github.com/gnolang/gno/tm2/pkg/bft/issues/3322) // 3. node can be offline // // Please refer to @@ -97,7 +97,7 @@ func BroadcastTxAsync(ctx *rpctypes.Context, tx types.Tx) (*ctypes.ResultBroadca // 1. malicious node can drop or pretend it had committed your tx // 2. malicious proposer (not necessary the one you're communicating with) can // drop transactions, which might become valid in the future -// (https://github.com/gnolang/gno/pkgs/bft/issues/3322) +// (https://github.com/gnolang/gno/tm2/pkg/bft/issues/3322) // // Please refer to // https://tendermint.com/docs/tendermint-core/using-tendermint.html#formatting diff --git a/pkgs/bft/rpc/core/net.go b/tm2/pkg/bft/rpc/core/net.go similarity index 97% rename from pkgs/bft/rpc/core/net.go rename to tm2/pkg/bft/rpc/core/net.go index 36305eb1064..975d5ed822f 100644 --- a/pkgs/bft/rpc/core/net.go +++ b/tm2/pkg/bft/rpc/core/net.go @@ -1,9 +1,9 @@ package core import ( - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/errors" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/errors" ) // Get network info. diff --git a/pkgs/bft/rpc/core/net_test.go b/tm2/pkg/bft/rpc/core/net_test.go similarity index 88% rename from pkgs/bft/rpc/core/net_test.go rename to tm2/pkg/bft/rpc/core/net_test.go index a84b349801e..42bf79fcce1 100644 --- a/pkgs/bft/rpc/core/net_test.go +++ b/tm2/pkg/bft/rpc/core/net_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - p2pcfg "github.com/gnolang/gno/pkgs/p2p/config" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + p2pcfg "github.com/gnolang/gno/tm2/pkg/p2p/config" ) func TestUnsafeDialSeeds(t *testing.T) { diff --git a/pkgs/bft/rpc/core/pipe.go b/tm2/pkg/bft/rpc/core/pipe.go similarity index 82% rename from pkgs/bft/rpc/core/pipe.go rename to tm2/pkg/bft/rpc/core/pipe.go index 858ac489ef8..fd6c8fc0692 100644 --- a/pkgs/bft/rpc/core/pipe.go +++ b/tm2/pkg/bft/rpc/core/pipe.go @@ -3,20 +3,20 @@ package core import ( "fmt" - "github.com/gnolang/gno/pkgs/bft/consensus" - cnscfg "github.com/gnolang/gno/pkgs/bft/consensus/config" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - "github.com/gnolang/gno/pkgs/bft/proxy" - cfg "github.com/gnolang/gno/pkgs/bft/rpc/config" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/state/txindex" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" + "github.com/gnolang/gno/tm2/pkg/bft/consensus" + cnscfg "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + cfg "github.com/gnolang/gno/tm2/pkg/bft/rpc/config" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/state/txindex" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" ) const ( diff --git a/pkgs/bft/rpc/core/pipe_test.go b/tm2/pkg/bft/rpc/core/pipe_test.go similarity index 100% rename from pkgs/bft/rpc/core/pipe_test.go rename to tm2/pkg/bft/rpc/core/pipe_test.go diff --git a/pkgs/bft/rpc/core/routes.go b/tm2/pkg/bft/rpc/core/routes.go similarity index 97% rename from pkgs/bft/rpc/core/routes.go rename to tm2/pkg/bft/rpc/core/routes.go index 042e23be904..127d9367f95 100644 --- a/pkgs/bft/rpc/core/routes.go +++ b/tm2/pkg/bft/rpc/core/routes.go @@ -1,7 +1,7 @@ package core import ( - rpc "github.com/gnolang/gno/pkgs/bft/rpc/lib/server" + rpc "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/server" ) // TODO: better system than "unsafe" prefix diff --git a/pkgs/bft/rpc/core/status.go b/tm2/pkg/bft/rpc/core/status.go similarity index 94% rename from pkgs/bft/rpc/core/status.go rename to tm2/pkg/bft/rpc/core/status.go index 4d41cfc4972..5aaf0761ea1 100644 --- a/pkgs/bft/rpc/core/status.go +++ b/tm2/pkg/bft/rpc/core/status.go @@ -3,10 +3,10 @@ package core import ( "time" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) // Get Tendermint status including node info, pubkey, latest block diff --git a/pkgs/bft/rpc/core/tx.go b/tm2/pkg/bft/rpc/core/tx.go similarity index 95% rename from pkgs/bft/rpc/core/tx.go rename to tm2/pkg/bft/rpc/core/tx.go index 9079f03fdf0..d471e4fa52a 100644 --- a/pkgs/bft/rpc/core/tx.go +++ b/tm2/pkg/bft/rpc/core/tx.go @@ -5,13 +5,13 @@ package core import ( "fmt" - cmn "github.com/gnolang/gno/pkgs/common" + cmn "github.com/gnolang/gno/tm2/pkg/common" - tmquery "github.com/gnolang/gno/pkgs/pubsub/query" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/bft/state/txindex/null" - "github.com/gnolang/gno/pkgs/bft/types" + tmquery "github.com/gnolang/gno/tm2/pkg/pubsub/query" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/bft/state/txindex/null" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) // Tx allows you to query the transaction results. `nil` could mean the diff --git a/pkgs/bft/rpc/core/types/responses.go b/tm2/pkg/bft/rpc/core/types/responses.go similarity index 93% rename from pkgs/bft/rpc/core/types/responses.go rename to tm2/pkg/bft/rpc/core/types/responses.go index 1392e676dff..2874517147d 100644 --- a/pkgs/bft/rpc/core/types/responses.go +++ b/tm2/pkg/bft/rpc/core/types/responses.go @@ -4,13 +4,13 @@ import ( "encoding/json" "time" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cnscfg "github.com/gnolang/gno/pkgs/bft/consensus/config" - cstypes "github.com/gnolang/gno/pkgs/bft/consensus/types" - "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/p2p" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cnscfg "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" + cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" + "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/p2p" ) // List of blocks diff --git a/pkgs/bft/rpc/core/types/responses_test.go b/tm2/pkg/bft/rpc/core/types/responses_test.go similarity index 94% rename from pkgs/bft/rpc/core/types/responses_test.go rename to tm2/pkg/bft/rpc/core/types/responses_test.go index 848624c19ec..d309a6b63a1 100644 --- a/pkgs/bft/rpc/core/types/responses_test.go +++ b/tm2/pkg/bft/rpc/core/types/responses_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/p2p" + "github.com/gnolang/gno/tm2/pkg/p2p" ) func TestStatusIndexer(t *testing.T) { diff --git a/pkgs/bft/rpc/lib/client/args_test.go b/tm2/pkg/bft/rpc/lib/client/args_test.go similarity index 100% rename from pkgs/bft/rpc/lib/client/args_test.go rename to tm2/pkg/bft/rpc/lib/client/args_test.go diff --git a/pkgs/bft/rpc/lib/client/http_client.go b/tm2/pkg/bft/rpc/lib/client/http_client.go similarity index 98% rename from pkgs/bft/rpc/lib/client/http_client.go rename to tm2/pkg/bft/rpc/lib/client/http_client.go index 9f0ffda1af4..d5708f97d40 100644 --- a/pkgs/bft/rpc/lib/client/http_client.go +++ b/tm2/pkg/bft/rpc/lib/client/http_client.go @@ -12,10 +12,10 @@ import ( "strings" "sync" - "github.com/gnolang/gno/pkgs/amino" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/amino" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/random" ) const ( diff --git a/pkgs/bft/rpc/lib/client/integration_test.go b/tm2/pkg/bft/rpc/lib/client/integration_test.go similarity index 98% rename from pkgs/bft/rpc/lib/client/integration_test.go rename to tm2/pkg/bft/rpc/lib/client/integration_test.go index 6db58a4f145..14f3716e964 100644 --- a/pkgs/bft/rpc/lib/client/integration_test.go +++ b/tm2/pkg/bft/rpc/lib/client/integration_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/log" ) func TestWSClientReconnectWithJitter(t *testing.T) { diff --git a/pkgs/bft/rpc/lib/client/ws_client.go b/tm2/pkg/bft/rpc/lib/client/ws_client.go similarity index 98% rename from pkgs/bft/rpc/lib/client/ws_client.go rename to tm2/pkg/bft/rpc/lib/client/ws_client.go index d40a3416d93..040437d11ff 100644 --- a/pkgs/bft/rpc/lib/client/ws_client.go +++ b/tm2/pkg/bft/rpc/lib/client/ws_client.go @@ -9,10 +9,10 @@ import ( "sync" "time" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/service" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/service" "github.com/gorilla/websocket" ) diff --git a/pkgs/bft/rpc/lib/client/ws_client_test.go b/tm2/pkg/bft/rpc/lib/client/ws_client_test.go similarity index 97% rename from pkgs/bft/rpc/lib/client/ws_client_test.go rename to tm2/pkg/bft/rpc/lib/client/ws_client_test.go index 55bce7d8697..b3a495f25b2 100644 --- a/pkgs/bft/rpc/lib/client/ws_client_test.go +++ b/tm2/pkg/bft/rpc/lib/client/ws_client_test.go @@ -13,8 +13,8 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/log" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/log" ) var wsCallTimeout = 5 * time.Second diff --git a/pkgs/bft/rpc/lib/doc.go b/tm2/pkg/bft/rpc/lib/doc.go similarity index 92% rename from pkgs/bft/rpc/lib/doc.go rename to tm2/pkg/bft/rpc/lib/doc.go index 25889f0bb25..9b76f8a38ca 100644 --- a/pkgs/bft/rpc/lib/doc.go +++ b/tm2/pkg/bft/rpc/lib/doc.go @@ -79,6 +79,6 @@ // // # Examples // -// - [Tendermint](https://github.com/gnolang/gno/pkgs/bft/blob/master/rpc/core/routes.go) -// - [tm-monitor](https://github.com/gnolang/gno/pkgs/bft/blob/master/tools/tm-monitor/rpc.go) +// - [Tendermint](https://github.com/gnolang/gno/tm2/pkg/bft/blob/master/rpc/core/routes.go) +// - [tm-monitor](https://github.com/gnolang/gno/tm2/pkg/bft/blob/master/tools/tm-monitor/rpc.go) package rpc diff --git a/pkgs/bft/rpc/lib/rpc_test.go b/tm2/pkg/bft/rpc/lib/rpc_test.go similarity index 96% rename from pkgs/bft/rpc/lib/rpc_test.go rename to tm2/pkg/bft/rpc/lib/rpc_test.go index 36d4cfc544a..2c1aebaae14 100644 --- a/pkgs/bft/rpc/lib/rpc_test.go +++ b/tm2/pkg/bft/rpc/lib/rpc_test.go @@ -15,13 +15,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/colors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/colors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/random" - client "github.com/gnolang/gno/pkgs/bft/rpc/lib/client" - server "github.com/gnolang/gno/pkgs/bft/rpc/lib/server" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" + client "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/client" + server "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/server" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" ) // Client and Server should work over tcp or unix sockets diff --git a/pkgs/bft/rpc/lib/server/handlers.go b/tm2/pkg/bft/rpc/lib/server/handlers.go similarity index 98% rename from pkgs/bft/rpc/lib/server/handlers.go rename to tm2/pkg/bft/rpc/lib/server/handlers.go index 5f24ea118a5..aa3fadd4d18 100644 --- a/pkgs/bft/rpc/lib/server/handlers.go +++ b/tm2/pkg/bft/rpc/lib/server/handlers.go @@ -16,11 +16,11 @@ import ( "github.com/gorilla/websocket" - "github.com/gnolang/gno/pkgs/amino" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/amino" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/service" ) // RegisterRPCFuncs adds a route for each function in the funcMap, as well as general jsonrpc and websocket handlers for all functions. @@ -741,7 +741,7 @@ func (wsc *wsConnection) writeRoutine() { } // All writes to the websocket must (re)set the write deadline. -// If some writes don't set it while others do, they may timeout incorrectly (https://github.com/gnolang/gno/pkgs/bft/issues/553) +// If some writes don't set it while others do, they may timeout incorrectly (https://github.com/gnolang/gno/tm2/pkg/bft/issues/553) func (wsc *wsConnection) writeMessageWithDeadline(msgType int, msg []byte) error { if err := wsc.baseConn.SetWriteDeadline(time.Now().Add(wsc.writeWait)); err != nil { return err diff --git a/pkgs/bft/rpc/lib/server/handlers_test.go b/tm2/pkg/bft/rpc/lib/server/handlers_test.go similarity index 97% rename from pkgs/bft/rpc/lib/server/handlers_test.go rename to tm2/pkg/bft/rpc/lib/server/handlers_test.go index 33fe649a4fe..8bf2cc0f7f1 100644 --- a/pkgs/bft/rpc/lib/server/handlers_test.go +++ b/tm2/pkg/bft/rpc/lib/server/handlers_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - rs "github.com/gnolang/gno/pkgs/bft/rpc/lib/server" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/log" + rs "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/server" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/log" ) ////////////////////////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ func statusOK(code int) bool { return code >= 200 && code <= 299 } // Ensure that nefarious/unintended inputs to `params` // do not crash our RPC handlers. -// See Issue https://github.com/gnolang/gno/pkgs/bft/issues/708. +// See Issue https://github.com/gnolang/gno/tm2/pkg/bft/issues/708. func TestRPCParams(t *testing.T) { mux := testMux() tests := []struct { diff --git a/pkgs/bft/rpc/lib/server/http_params.go b/tm2/pkg/bft/rpc/lib/server/http_params.go similarity index 98% rename from pkgs/bft/rpc/lib/server/http_params.go rename to tm2/pkg/bft/rpc/lib/server/http_params.go index dec154874e7..32fdedd2f50 100644 --- a/pkgs/bft/rpc/lib/server/http_params.go +++ b/tm2/pkg/bft/rpc/lib/server/http_params.go @@ -6,7 +6,7 @@ import ( "regexp" "strconv" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) var ( diff --git a/pkgs/bft/rpc/lib/server/http_server.go b/tm2/pkg/bft/rpc/lib/server/http_server.go similarity index 97% rename from pkgs/bft/rpc/lib/server/http_server.go rename to tm2/pkg/bft/rpc/lib/server/http_server.go index 4ca0dcd52d5..7eb1e63ede5 100644 --- a/pkgs/bft/rpc/lib/server/http_server.go +++ b/tm2/pkg/bft/rpc/lib/server/http_server.go @@ -13,9 +13,9 @@ import ( "golang.org/x/net/netutil" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" ) // Config is a RPC server configuration. diff --git a/pkgs/bft/rpc/lib/server/http_server_test.go b/tm2/pkg/bft/rpc/lib/server/http_server_test.go similarity index 98% rename from pkgs/bft/rpc/lib/server/http_server_test.go rename to tm2/pkg/bft/rpc/lib/server/http_server_test.go index 3c4e3bb69a5..6e9f3bc9d07 100644 --- a/pkgs/bft/rpc/lib/server/http_server_test.go +++ b/tm2/pkg/bft/rpc/lib/server/http_server_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/log" ) func TestMaxOpenConnections(t *testing.T) { diff --git a/pkgs/bft/rpc/lib/server/parse_test.go b/tm2/pkg/bft/rpc/lib/server/parse_test.go similarity index 98% rename from pkgs/bft/rpc/lib/server/parse_test.go rename to tm2/pkg/bft/rpc/lib/server/parse_test.go index fba283fb68f..a28dd255f23 100644 --- a/pkgs/bft/rpc/lib/server/parse_test.go +++ b/tm2/pkg/bft/rpc/lib/server/parse_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - types "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" + types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" ) func TestParseJSONMap(t *testing.T) { diff --git a/pkgs/bft/rpc/lib/server/test.crt b/tm2/pkg/bft/rpc/lib/server/test.crt similarity index 100% rename from pkgs/bft/rpc/lib/server/test.crt rename to tm2/pkg/bft/rpc/lib/server/test.crt diff --git a/pkgs/bft/rpc/lib/server/test.key b/tm2/pkg/bft/rpc/lib/server/test.key similarity index 100% rename from pkgs/bft/rpc/lib/server/test.key rename to tm2/pkg/bft/rpc/lib/server/test.key diff --git a/pkgs/bft/rpc/lib/test/data.json b/tm2/pkg/bft/rpc/lib/test/data.json similarity index 100% rename from pkgs/bft/rpc/lib/test/data.json rename to tm2/pkg/bft/rpc/lib/test/data.json diff --git a/pkgs/bft/rpc/lib/test/integration_test.sh b/tm2/pkg/bft/rpc/lib/test/integration_test.sh similarity index 100% rename from pkgs/bft/rpc/lib/test/integration_test.sh rename to tm2/pkg/bft/rpc/lib/test/integration_test.sh diff --git a/pkgs/bft/rpc/lib/test/main.go b/tm2/pkg/bft/rpc/lib/test/main.go similarity index 79% rename from pkgs/bft/rpc/lib/test/main.go rename to tm2/pkg/bft/rpc/lib/test/main.go index 6b595d3b17c..fe7fc49c65e 100644 --- a/pkgs/bft/rpc/lib/test/main.go +++ b/tm2/pkg/bft/rpc/lib/test/main.go @@ -5,11 +5,11 @@ import ( "net/http" "os" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" - rpcserver "github.com/gnolang/gno/pkgs/bft/rpc/lib/server" - rpctypes "github.com/gnolang/gno/pkgs/bft/rpc/lib/types" + rpcserver "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/server" + rpctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" ) var routes = map[string]*rpcserver.RPCFunc{ diff --git a/pkgs/bft/rpc/lib/types/types.go b/tm2/pkg/bft/rpc/lib/types/types.go similarity index 99% rename from pkgs/bft/rpc/lib/types/types.go rename to tm2/pkg/bft/rpc/lib/types/types.go index ee67d2b86e3..65cafd79fe5 100644 --- a/pkgs/bft/rpc/lib/types/types.go +++ b/tm2/pkg/bft/rpc/lib/types/types.go @@ -8,8 +8,8 @@ import ( "reflect" "strings" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/errors" ) // a wrapper to emulate a sum type: jsonrpcid = string | int diff --git a/pkgs/bft/rpc/lib/types/types_test.go b/tm2/pkg/bft/rpc/lib/types/types_test.go similarity index 98% rename from pkgs/bft/rpc/lib/types/types_test.go rename to tm2/pkg/bft/rpc/lib/types/types_test.go index 0ec4f854b41..e047c69bd77 100644 --- a/pkgs/bft/rpc/lib/types/types_test.go +++ b/tm2/pkg/bft/rpc/lib/types/types_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) type SampleResult struct { diff --git a/pkgs/bft/rpc/test/helpers.go b/tm2/pkg/bft/rpc/test/helpers.go similarity index 88% rename from pkgs/bft/rpc/test/helpers.go rename to tm2/pkg/bft/rpc/test/helpers.go index 7820ef31e0c..d8e1a498600 100644 --- a/pkgs/bft/rpc/test/helpers.go +++ b/tm2/pkg/bft/rpc/test/helpers.go @@ -7,15 +7,15 @@ import ( "strings" "time" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cfg "github.com/gnolang/gno/pkgs/bft/config" - nm "github.com/gnolang/gno/pkgs/bft/node" - "github.com/gnolang/gno/pkgs/bft/privval" - "github.com/gnolang/gno/pkgs/bft/proxy" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - rpcclient "github.com/gnolang/gno/pkgs/bft/rpc/lib/client" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + nm "github.com/gnolang/gno/tm2/pkg/bft/node" + "github.com/gnolang/gno/tm2/pkg/bft/privval" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/client" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" ) // Options helps with specifying some parameters for our RPC testing for greater diff --git a/pkgs/bft/state/errors.go b/tm2/pkg/bft/state/errors.go similarity index 100% rename from pkgs/bft/state/errors.go rename to tm2/pkg/bft/state/errors.go diff --git a/pkgs/bft/state/execution.go b/tm2/pkg/bft/state/execution.go similarity index 96% rename from pkgs/bft/state/execution.go rename to tm2/pkg/bft/state/execution.go index 8daaf31138f..e7920459172 100644 --- a/pkgs/bft/state/execution.go +++ b/tm2/pkg/bft/state/execution.go @@ -3,18 +3,18 @@ package state import ( "fmt" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/fail" - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - "github.com/gnolang/gno/pkgs/bft/proxy" - "github.com/gnolang/gno/pkgs/bft/types" - typesver "github.com/gnolang/gno/pkgs/bft/types/version" - tmver "github.com/gnolang/gno/pkgs/bft/version" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/fail" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + "github.com/gnolang/gno/tm2/pkg/bft/types" + typesver "github.com/gnolang/gno/tm2/pkg/bft/types/version" + tmver "github.com/gnolang/gno/tm2/pkg/bft/version" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" ) //----------------------------------------------------------------------------- diff --git a/pkgs/bft/state/execution_test.go b/tm2/pkg/bft/state/execution_test.go similarity index 93% rename from pkgs/bft/state/execution_test.go rename to tm2/pkg/bft/state/execution_test.go index 5ecbf844764..849c87d3359 100644 --- a/pkgs/bft/state/execution_test.go +++ b/tm2/pkg/bft/state/execution_test.go @@ -7,19 +7,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/async" - "github.com/gnolang/gno/pkgs/bft/abci/example/kvstore" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/mempool/mock" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/async" + "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/log" ) var ( diff --git a/pkgs/bft/state/export_test.go b/tm2/pkg/bft/state/export_test.go similarity index 94% rename from pkgs/bft/state/export_test.go rename to tm2/pkg/bft/state/export_test.go index fbf0ff9f5a4..cdebf3e852d 100644 --- a/pkgs/bft/state/export_test.go +++ b/tm2/pkg/bft/state/export_test.go @@ -1,9 +1,9 @@ package state import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) // diff --git a/pkgs/bft/state/helpers_test.go b/tm2/pkg/bft/state/helpers_test.go similarity index 95% rename from pkgs/bft/state/helpers_test.go rename to tm2/pkg/bft/state/helpers_test.go index d4a11abb4b9..219baaf0f55 100644 --- a/pkgs/bft/state/helpers_test.go +++ b/tm2/pkg/bft/state/helpers_test.go @@ -4,14 +4,14 @@ import ( "bytes" "fmt" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/proxy" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - dbm "github.com/gnolang/gno/pkgs/db" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/proxy" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) type paramsChangeTestCase struct { diff --git a/pkgs/bft/state/services.go b/tm2/pkg/bft/state/services.go similarity index 95% rename from pkgs/bft/state/services.go rename to tm2/pkg/bft/state/services.go index 726c90f9776..5f697c01ccb 100644 --- a/pkgs/bft/state/services.go +++ b/tm2/pkg/bft/state/services.go @@ -1,7 +1,7 @@ package state import ( - "github.com/gnolang/gno/pkgs/bft/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) //------------------------------------------------------ diff --git a/pkgs/bft/state/state.go b/tm2/pkg/bft/state/state.go similarity index 95% rename from pkgs/bft/state/state.go rename to tm2/pkg/bft/state/state.go index 8d1404167b5..e0de2b2ad34 100644 --- a/pkgs/bft/state/state.go +++ b/tm2/pkg/bft/state/state.go @@ -6,13 +6,13 @@ import ( "os" "time" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - typesver "github.com/gnolang/gno/pkgs/bft/types/version" - tmver "github.com/gnolang/gno/pkgs/bft/version" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + typesver "github.com/gnolang/gno/tm2/pkg/bft/types/version" + tmver "github.com/gnolang/gno/tm2/pkg/bft/version" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // database keys diff --git a/pkgs/bft/state/state_test.go b/tm2/pkg/bft/state/state_test.go similarity index 99% rename from pkgs/bft/state/state_test.go rename to tm2/pkg/bft/state/state_test.go index da9fdfc38a2..f2a31e70b0b 100644 --- a/pkgs/bft/state/state_test.go +++ b/tm2/pkg/bft/state/state_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - cfg "github.com/gnolang/gno/pkgs/bft/config" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/random" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/random" ) // setupTestCase does setup common to all test cases. diff --git a/pkgs/bft/state/store.go b/tm2/pkg/bft/state/store.go similarity index 97% rename from pkgs/bft/state/store.go rename to tm2/pkg/bft/state/store.go index a6b2d6b94dd..0f54ec547d2 100644 --- a/pkgs/bft/state/store.go +++ b/tm2/pkg/bft/state/store.go @@ -3,12 +3,12 @@ package state import ( "fmt" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/maths" - osm "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/maths" + osm "github.com/gnolang/gno/tm2/pkg/os" ) const ( diff --git a/pkgs/bft/state/store_test.go b/tm2/pkg/bft/state/store_test.go similarity index 92% rename from pkgs/bft/state/store_test.go rename to tm2/pkg/bft/state/store_test.go index 534fd8a2244..2b73c7ca1cf 100644 --- a/pkgs/bft/state/store_test.go +++ b/tm2/pkg/bft/state/store_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cfg "github.com/gnolang/gno/pkgs/bft/config" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) func TestStoreLoadValidators(t *testing.T) { diff --git a/pkgs/bft/state/tx_filter.go b/tm2/pkg/bft/state/tx_filter.go similarity index 70% rename from pkgs/bft/state/tx_filter.go rename to tm2/pkg/bft/state/tx_filter.go index 3da42c16618..8f45936e10c 100644 --- a/pkgs/bft/state/tx_filter.go +++ b/tm2/pkg/bft/state/tx_filter.go @@ -1,8 +1,8 @@ package state import ( - mempl "github.com/gnolang/gno/pkgs/bft/mempool" - "github.com/gnolang/gno/pkgs/bft/types" + mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool" + "github.com/gnolang/gno/tm2/pkg/bft/types" ) // TxPreCheck returns a function to filter transactions before processing. diff --git a/pkgs/bft/state/txindex/indexer.go b/tm2/pkg/bft/state/txindex/indexer.go similarity index 100% rename from pkgs/bft/state/txindex/indexer.go rename to tm2/pkg/bft/state/txindex/indexer.go diff --git a/pkgs/bft/state/txindex/indexer_service.go b/tm2/pkg/bft/state/txindex/indexer_service.go similarity index 88% rename from pkgs/bft/state/txindex/indexer_service.go rename to tm2/pkg/bft/state/txindex/indexer_service.go index 7e8b9fb62be..fb5c3068ae4 100644 --- a/pkgs/bft/state/txindex/indexer_service.go +++ b/tm2/pkg/bft/state/txindex/indexer_service.go @@ -1,8 +1,8 @@ package txindex import ( - "github.com/gnolang/gno/pkgs/events" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/events" + "github.com/gnolang/gno/tm2/pkg/service" ) // IndexerService connects event bus and transaction indexer together in order diff --git a/pkgs/bft/state/txindex/null/null.go b/tm2/pkg/bft/state/txindex/null/null.go similarity index 92% rename from pkgs/bft/state/txindex/null/null.go rename to tm2/pkg/bft/state/txindex/null/null.go index fe5bc654c0a..ed90013b9a9 100644 --- a/pkgs/bft/state/txindex/null/null.go +++ b/tm2/pkg/bft/state/txindex/null/null.go @@ -1,7 +1,7 @@ package null import ( - "github.com/gnolang/gno/pkgs/bft/state/txindex" + "github.com/gnolang/gno/tm2/pkg/bft/state/txindex" ) var _ txindex.TxIndexer = (*TxIndex)(nil) diff --git a/pkgs/bft/state/validation.go b/tm2/pkg/bft/state/validation.go similarity index 97% rename from pkgs/bft/state/validation.go rename to tm2/pkg/bft/state/validation.go index 0fe72592314..10628a5be84 100644 --- a/pkgs/bft/state/validation.go +++ b/tm2/pkg/bft/state/validation.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" + "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) // ----------------------------------------------------- diff --git a/pkgs/bft/state/validation_test.go b/tm2/pkg/bft/state/validation_test.go similarity index 93% rename from pkgs/bft/state/validation_test.go rename to tm2/pkg/bft/state/validation_test.go index 41cc99edb35..94aafe92694 100644 --- a/pkgs/bft/state/validation_test.go +++ b/tm2/pkg/bft/state/validation_test.go @@ -6,14 +6,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/bft/mempool/mock" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/log" ) const validationTestsStopHeight int64 = 10 diff --git a/pkgs/bft/store/store.go b/tm2/pkg/bft/store/store.go similarity index 97% rename from pkgs/bft/store/store.go rename to tm2/pkg/bft/store/store.go index 642372c0cea..e7671d8033e 100644 --- a/pkgs/bft/store/store.go +++ b/tm2/pkg/bft/store/store.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" ) /* diff --git a/pkgs/bft/store/store_test.go b/tm2/pkg/bft/store/store_test.go similarity index 97% rename from pkgs/bft/store/store_test.go rename to tm2/pkg/bft/store/store_test.go index e4b6019330e..1dc0bda833c 100644 --- a/pkgs/bft/store/store_test.go +++ b/tm2/pkg/bft/store/store_test.go @@ -12,14 +12,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - cfg "github.com/gnolang/gno/pkgs/bft/config" - sm "github.com/gnolang/gno/pkgs/bft/state" - "github.com/gnolang/gno/pkgs/bft/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/amino" + cfg "github.com/gnolang/gno/tm2/pkg/bft/config" + sm "github.com/gnolang/gno/tm2/pkg/bft/state" + "github.com/gnolang/gno/tm2/pkg/bft/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" ) // A cleanupFunc cleans up any config / test files created for a particular diff --git a/pkgs/bft/types/block.go b/tm2/pkg/bft/types/block.go similarity index 98% rename from pkgs/bft/types/block.go rename to tm2/pkg/bft/types/block.go index 68df8dda958..b9ca0e405df 100644 --- a/pkgs/bft/types/block.go +++ b/tm2/pkg/bft/types/block.go @@ -7,14 +7,14 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/amino" - typesver "github.com/gnolang/gno/pkgs/bft/types/version" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/maths" + "github.com/gnolang/gno/tm2/pkg/amino" + typesver "github.com/gnolang/gno/tm2/pkg/bft/types/version" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/maths" ) // Block defines the atomic unit of a Tendermint blockchain. diff --git a/pkgs/bft/types/block_meta.go b/tm2/pkg/bft/types/block_meta.go similarity index 100% rename from pkgs/bft/types/block_meta.go rename to tm2/pkg/bft/types/block_meta.go diff --git a/pkgs/bft/types/block_test.go b/tm2/pkg/bft/types/block_test.go similarity index 97% rename from pkgs/bft/types/block_test.go rename to tm2/pkg/bft/types/block_test.go index 818f96626ca..5b49e0c392e 100644 --- a/pkgs/bft/types/block_test.go +++ b/tm2/pkg/bft/types/block_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - typesver "github.com/gnolang/gno/pkgs/bft/types/version" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/amino" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + typesver "github.com/gnolang/gno/tm2/pkg/bft/types/version" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/random" ) func TestBlockValidateBasic(t *testing.T) { diff --git a/pkgs/bft/types/canonical.go b/tm2/pkg/bft/types/canonical.go similarity index 97% rename from pkgs/bft/types/canonical.go rename to tm2/pkg/bft/types/canonical.go index ee9793d394a..f3709fec89e 100644 --- a/pkgs/bft/types/canonical.go +++ b/tm2/pkg/bft/types/canonical.go @@ -3,7 +3,7 @@ package types import ( "time" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" ) // Canonical* wraps the structs in types for amino encoding them for use in SignBytes / the Signable interface. diff --git a/pkgs/bft/types/encoding_helper.go b/tm2/pkg/bft/types/encoding_helper.go similarity index 87% rename from pkgs/bft/types/encoding_helper.go rename to tm2/pkg/bft/types/encoding_helper.go index f3c4889ffe6..16f069320d2 100644 --- a/pkgs/bft/types/encoding_helper.go +++ b/tm2/pkg/bft/types/encoding_helper.go @@ -1,7 +1,7 @@ package types import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) // bytesOrNil returns nil if the input is nil, otherwise returns diff --git a/pkgs/bft/types/errors.go b/tm2/pkg/bft/types/errors.go similarity index 100% rename from pkgs/bft/types/errors.go rename to tm2/pkg/bft/types/errors.go diff --git a/pkgs/bft/types/events.go b/tm2/pkg/bft/types/events.go similarity index 92% rename from pkgs/bft/types/events.go rename to tm2/pkg/bft/types/events.go index 906be2146ce..b691681e746 100644 --- a/pkgs/bft/types/events.go +++ b/tm2/pkg/bft/types/events.go @@ -1,8 +1,8 @@ package types import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/events" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/events" ) // TMEvent implements events.Event. diff --git a/pkgs/bft/types/evidence.go b/tm2/pkg/bft/types/evidence.go similarity index 98% rename from pkgs/bft/types/evidence.go rename to tm2/pkg/bft/types/evidence.go index 9ef4b6fc2a8..26cf1aaa8ca 100644 --- a/pkgs/bft/types/evidence.go +++ b/tm2/pkg/bft/types/evidence.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ( diff --git a/pkgs/bft/types/evidence_test.go b/tm2/pkg/bft/types/evidence_test.go similarity index 96% rename from pkgs/bft/types/evidence_test.go rename to tm2/pkg/bft/types/evidence_test.go index c4d256a69b3..4efc61f8be7 100644 --- a/pkgs/bft/types/evidence_test.go +++ b/tm2/pkg/bft/types/evidence_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) type voteData struct { diff --git a/pkgs/bft/types/fingerprint.go b/tm2/pkg/bft/types/fingerprint.go similarity index 100% rename from pkgs/bft/types/fingerprint.go rename to tm2/pkg/bft/types/fingerprint.go diff --git a/pkgs/bft/types/genesis.go b/tm2/pkg/bft/types/genesis.go similarity index 93% rename from pkgs/bft/types/genesis.go rename to tm2/pkg/bft/types/genesis.go index e20dbd00d8e..f881e068558 100644 --- a/pkgs/bft/types/genesis.go +++ b/tm2/pkg/bft/types/genesis.go @@ -5,12 +5,12 @@ import ( "os" "time" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" - osm "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" + osm "github.com/gnolang/gno/tm2/pkg/os" ) const ( diff --git a/pkgs/bft/types/genesis_test.go b/tm2/pkg/bft/types/genesis_test.go similarity index 96% rename from pkgs/bft/types/genesis_test.go rename to tm2/pkg/bft/types/genesis_test.go index 0c950fd837d..c8886f9bf0a 100644 --- a/pkgs/bft/types/genesis_test.go +++ b/tm2/pkg/bft/types/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/amino" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" ) func TestGenesisBad(t *testing.T) { diff --git a/pkgs/bft/types/keys.go b/tm2/pkg/bft/types/keys.go similarity index 100% rename from pkgs/bft/types/keys.go rename to tm2/pkg/bft/types/keys.go diff --git a/pkgs/bft/types/package.go b/tm2/pkg/bft/types/package.go similarity index 77% rename from pkgs/bft/types/package.go rename to tm2/pkg/bft/types/package.go index d682a1d1297..e3cedcb1d27 100644 --- a/pkgs/bft/types/package.go +++ b/tm2/pkg/bft/types/package.go @@ -1,14 +1,14 @@ package types import ( - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/types", + "github.com/gnolang/gno/tm2/pkg/bft/types", "tm", amino.GetCallersDirname(), ). diff --git a/pkgs/bft/types/params.go b/tm2/pkg/bft/types/params.go similarity index 91% rename from pkgs/bft/types/params.go rename to tm2/pkg/bft/types/params.go index ab8b513138a..e50f5c05b88 100644 --- a/pkgs/bft/types/params.go +++ b/tm2/pkg/bft/types/params.go @@ -1,10 +1,10 @@ package types import ( - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ( diff --git a/pkgs/bft/types/params_test.go b/tm2/pkg/bft/types/params_test.go similarity index 98% rename from pkgs/bft/types/params_test.go rename to tm2/pkg/bft/types/params_test.go index 0bb59b9d8b6..cb5f3244e8d 100644 --- a/pkgs/bft/types/params_test.go +++ b/tm2/pkg/bft/types/params_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) var ( diff --git a/pkgs/bft/types/part_set.go b/tm2/pkg/bft/types/part_set.go similarity index 96% rename from pkgs/bft/types/part_set.go rename to tm2/pkg/bft/types/part_set.go index 1bb43c069c6..a5cfe1d59ee 100644 --- a/pkgs/bft/types/part_set.go +++ b/tm2/pkg/bft/types/part_set.go @@ -6,11 +6,11 @@ import ( "io" "sync" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/maths" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/maths" ) var ( diff --git a/pkgs/bft/types/part_set_test.go b/tm2/pkg/bft/types/part_set_test.go similarity index 97% rename from pkgs/bft/types/part_set_test.go rename to tm2/pkg/bft/types/part_set_test.go index 348f80a9bfe..2e05daed849 100644 --- a/pkgs/bft/types/part_set_test.go +++ b/tm2/pkg/bft/types/part_set_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/random" ) const ( diff --git a/pkgs/bft/types/priv_validator.go b/tm2/pkg/bft/types/priv_validator.go similarity index 97% rename from pkgs/bft/types/priv_validator.go rename to tm2/pkg/bft/types/priv_validator.go index 73336efc4e9..46da2aa83df 100644 --- a/pkgs/bft/types/priv_validator.go +++ b/tm2/pkg/bft/types/priv_validator.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" ) // PrivValidator defines the functionality of a local Tendermint validator diff --git a/pkgs/bft/types/proposal.go b/tm2/pkg/bft/types/proposal.go similarity index 96% rename from pkgs/bft/types/proposal.go rename to tm2/pkg/bft/types/proposal.go index 676a179c116..82a7f7b156e 100644 --- a/pkgs/bft/types/proposal.go +++ b/tm2/pkg/bft/types/proposal.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/gnolang/gno/pkgs/amino" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/amino" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" ) var ( diff --git a/pkgs/bft/types/proposal_test.go b/tm2/pkg/bft/types/proposal_test.go similarity index 97% rename from pkgs/bft/types/proposal_test.go rename to tm2/pkg/bft/types/proposal_test.go index 08f3f386075..ebda33298d1 100644 --- a/pkgs/bft/types/proposal_test.go +++ b/tm2/pkg/bft/types/proposal_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) var testProposal *Proposal diff --git a/pkgs/bft/types/results.go b/tm2/pkg/bft/types/results.go similarity index 93% rename from pkgs/bft/types/results.go rename to tm2/pkg/bft/types/results.go index 8c2a074b9b7..fd2c787f9e3 100644 --- a/pkgs/bft/types/results.go +++ b/tm2/pkg/bft/types/results.go @@ -1,9 +1,9 @@ package types import ( - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" ) //----------------------------------------------------------------------------- diff --git a/pkgs/bft/types/results_test.go b/tm2/pkg/bft/types/results_test.go similarity index 97% rename from pkgs/bft/types/results_test.go rename to tm2/pkg/bft/types/results_test.go index cfebcb9342b..6db7044f6ad 100644 --- a/pkgs/bft/types/results_test.go +++ b/tm2/pkg/bft/types/results_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) func TestABCIResults(t *testing.T) { diff --git a/pkgs/bft/types/signable.go b/tm2/pkg/bft/types/signable.go similarity index 87% rename from pkgs/bft/types/signable.go rename to tm2/pkg/bft/types/signable.go index 2f53ca92f75..d0c1fed1381 100644 --- a/pkgs/bft/types/signable.go +++ b/tm2/pkg/bft/types/signable.go @@ -1,8 +1,8 @@ package types import ( - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/maths" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/maths" ) // MaxSignatureSize is a maximum allowed signature size for the Proposal diff --git a/pkgs/bft/types/signed_msg_type.go b/tm2/pkg/bft/types/signed_msg_type.go similarity index 100% rename from pkgs/bft/types/signed_msg_type.go rename to tm2/pkg/bft/types/signed_msg_type.go diff --git a/pkgs/bft/types/test_util.go b/tm2/pkg/bft/types/test_util.go similarity index 96% rename from pkgs/bft/types/test_util.go rename to tm2/pkg/bft/types/test_util.go index a56d43e923c..4ef7d7efa73 100644 --- a/pkgs/bft/types/test_util.go +++ b/tm2/pkg/bft/types/test_util.go @@ -1,7 +1,7 @@ package types import ( - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" ) func MakeCommit(blockID BlockID, height int64, round int, diff --git a/pkgs/bft/types/time/time.go b/tm2/pkg/bft/types/time/time.go similarity index 100% rename from pkgs/bft/types/time/time.go rename to tm2/pkg/bft/types/time/time.go diff --git a/pkgs/bft/types/time/time_test.go b/tm2/pkg/bft/types/time/time_test.go similarity index 100% rename from pkgs/bft/types/time/time_test.go rename to tm2/pkg/bft/types/time/time_test.go diff --git a/pkgs/bft/types/tx.go b/tm2/pkg/bft/types/tx.go similarity index 95% rename from pkgs/bft/types/tx.go rename to tm2/pkg/bft/types/tx.go index 424565d12cf..0b3a7dc5503 100644 --- a/pkgs/bft/types/tx.go +++ b/tm2/pkg/bft/types/tx.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) // Tx is an arbitrary byte array. diff --git a/pkgs/bft/types/tx_test.go b/tm2/pkg/bft/types/tx_test.go similarity index 96% rename from pkgs/bft/types/tx_test.go rename to tm2/pkg/bft/types/tx_test.go index 5c9038156f4..1470fab024d 100644 --- a/pkgs/bft/types/tx_test.go +++ b/tm2/pkg/bft/types/tx_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/testutils" ) func makeTxs(cnt, size int) Txs { diff --git a/pkgs/bft/types/types.proto b/tm2/pkg/bft/types/types.proto similarity index 91% rename from pkgs/bft/types/types.proto rename to tm2/pkg/bft/types/types.proto index c53fc8cf890..7514078f26b 100644 --- a/pkgs/bft/types/types.proto +++ b/tm2/pkg/bft/types/types.proto @@ -1,12 +1,12 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/bft/types/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/bft/types/pb"; // imports -import "github.com/gnolang/gno/pkgs/bft/abci/types/abci.proto"; -import "github.com/gnolang/gno/pkgs/crypto/merkle/merkle.proto"; -import "github.com/gnolang/gno/pkgs/bitarray/bitarray.proto"; +import "github.com/gnolang/gno/tm2/pkg/bft/abci/types/abci.proto"; +import "github.com/gnolang/gno/tm2/pkg/crypto/merkle/merkle.proto"; +import "github.com/gnolang/gno/tm2/pkg/bitarray/bitarray.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto"; diff --git a/pkgs/bft/types/validation.go b/tm2/pkg/bft/types/validation.go similarity index 91% rename from pkgs/bft/types/validation.go rename to tm2/pkg/bft/types/validation.go index a5aece66710..099e399bdb8 100644 --- a/pkgs/bft/types/validation.go +++ b/tm2/pkg/bft/types/validation.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) // ValidateTime does a basic time validation ensuring time does not drift too diff --git a/pkgs/bft/types/validator.go b/tm2/pkg/bft/types/validator.go similarity index 95% rename from pkgs/bft/types/validator.go rename to tm2/pkg/bft/types/validator.go index c4b001441c4..34d11223b4a 100644 --- a/pkgs/bft/types/validator.go +++ b/tm2/pkg/bft/types/validator.go @@ -3,9 +3,9 @@ package types import ( "fmt" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/random" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/random" ) // Volatile state for each Validator diff --git a/pkgs/bft/types/validator_set.go b/tm2/pkg/bft/types/validator_set.go similarity index 99% rename from pkgs/bft/types/validator_set.go rename to tm2/pkg/bft/types/validator_set.go index 79adc4cc485..617ceecaae5 100644 --- a/pkgs/bft/types/validator_set.go +++ b/tm2/pkg/bft/types/validator_set.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/errors" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/errors" ) // MaxTotalVotingPower - the maximum allowed total voting power. diff --git a/pkgs/bft/types/validator_set_test.go b/tm2/pkg/bft/types/validator_set_test.go similarity index 99% rename from pkgs/bft/types/validator_set_test.go rename to tm2/pkg/bft/types/validator_set_test.go index c448447c0f0..a2c38026ed8 100644 --- a/pkgs/bft/types/validator_set_test.go +++ b/tm2/pkg/bft/types/validator_set_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/amino" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/mock" - "github.com/gnolang/gno/pkgs/maths" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/amino" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/mock" + "github.com/gnolang/gno/tm2/pkg/maths" + "github.com/gnolang/gno/tm2/pkg/random" ) func TestValidatorSetBasic(t *testing.T) { diff --git a/pkgs/bft/types/version/version.go b/tm2/pkg/bft/types/version/version.go similarity index 83% rename from pkgs/bft/types/version/version.go rename to tm2/pkg/bft/types/version/version.go index 3595ab8f06a..5f77f83aa1e 100644 --- a/pkgs/bft/types/version/version.go +++ b/tm2/pkg/bft/types/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // Versioning for just the structure of the block. diff --git a/pkgs/bft/types/vote.go b/tm2/pkg/bft/types/vote.go similarity index 98% rename from pkgs/bft/types/vote.go rename to tm2/pkg/bft/types/vote.go index a774df0514b..caaaa3f8c34 100644 --- a/pkgs/bft/types/vote.go +++ b/tm2/pkg/bft/types/vote.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" ) const ( diff --git a/pkgs/bft/types/vote_set.go b/tm2/pkg/bft/types/vote_set.go similarity index 99% rename from pkgs/bft/types/vote_set.go rename to tm2/pkg/bft/types/vote_set.go index c94c53989a4..bf6200bff15 100644 --- a/pkgs/bft/types/vote_set.go +++ b/tm2/pkg/bft/types/vote_set.go @@ -6,10 +6,10 @@ import ( "strings" "sync" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bitarray" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bitarray" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ( diff --git a/pkgs/bft/types/vote_set_test.go b/tm2/pkg/bft/types/vote_set_test.go similarity index 99% rename from pkgs/bft/types/vote_set_test.go rename to tm2/pkg/bft/types/vote_set_test.go index a82136cdc1e..e3199f83edc 100644 --- a/pkgs/bft/types/vote_set_test.go +++ b/tm2/pkg/bft/types/vote_set_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/random" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/random" ) // NOTE: privValidators are in order diff --git a/pkgs/bft/types/vote_test.go b/tm2/pkg/bft/types/vote_test.go similarity index 98% rename from pkgs/bft/types/vote_test.go rename to tm2/pkg/bft/types/vote_test.go index 40ef7c34c55..1028694ebc5 100644 --- a/pkgs/bft/types/vote_test.go +++ b/tm2/pkg/bft/types/vote_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) func examplePrevote() *Vote { diff --git a/pkgs/bft/version/version.go b/tm2/pkg/bft/version/version.go similarity index 76% rename from pkgs/bft/version/version.go rename to tm2/pkg/bft/version/version.go index 9b837ee5367..3f5ce5b2593 100644 --- a/pkgs/bft/version/version.go +++ b/tm2/pkg/bft/version/version.go @@ -1,10 +1,10 @@ package version import ( - abciver "github.com/gnolang/gno/pkgs/bft/abci/version" - bcver "github.com/gnolang/gno/pkgs/bft/blockchain/version" - p2pver "github.com/gnolang/gno/pkgs/p2p/version" - verset "github.com/gnolang/gno/pkgs/versionset" + abciver "github.com/gnolang/gno/tm2/pkg/bft/abci/version" + bcver "github.com/gnolang/gno/tm2/pkg/bft/blockchain/version" + p2pver "github.com/gnolang/gno/tm2/pkg/p2p/version" + verset "github.com/gnolang/gno/tm2/pkg/versionset" ) var ( diff --git a/pkgs/bft/wal/wal.go b/tm2/pkg/bft/wal/wal.go similarity index 98% rename from pkgs/bft/wal/wal.go rename to tm2/pkg/bft/wal/wal.go index c6031b06d06..b66a34df222 100644 --- a/pkgs/bft/wal/wal.go +++ b/tm2/pkg/bft/wal/wal.go @@ -11,13 +11,13 @@ import ( "path/filepath" "time" - "github.com/gnolang/gno/pkgs/amino" - auto "github.com/gnolang/gno/pkgs/autofile" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/amino" + auto "github.com/gnolang/gno/tm2/pkg/autofile" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/service" ) const ( diff --git a/pkgs/bft/wal/wal_test.go b/tm2/pkg/bft/wal/wal_test.go similarity index 96% rename from pkgs/bft/wal/wal_test.go rename to tm2/pkg/bft/wal/wal_test.go index e81939f0814..ed03530fdb8 100644 --- a/pkgs/bft/wal/wal_test.go +++ b/tm2/pkg/bft/wal/wal_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - auto "github.com/gnolang/gno/pkgs/autofile" - tmtime "github.com/gnolang/gno/pkgs/bft/types/time" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/amino" + auto "github.com/gnolang/gno/tm2/pkg/autofile" + tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/random" ) const ( @@ -30,7 +30,7 @@ type TestMessage struct { func (TestMessage) AssertWALMessage() {} var testPackage = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bft/wal", + "github.com/gnolang/gno/tm2/pkg/bft/wal", "wal", amino.GetCallersDirname(), ). diff --git a/pkgs/bitarray/bit_array.go b/tm2/pkg/bitarray/bit_array.go similarity index 99% rename from pkgs/bitarray/bit_array.go rename to tm2/pkg/bitarray/bit_array.go index a27dda0145a..320b39e0c6a 100644 --- a/pkgs/bitarray/bit_array.go +++ b/tm2/pkg/bitarray/bit_array.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/gnolang/gno/pkgs/maths" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/maths" + "github.com/gnolang/gno/tm2/pkg/random" ) // BitArray is a thread-safe implementation of a bit array. diff --git a/pkgs/bitarray/bit_array_test.go b/tm2/pkg/bitarray/bit_array_test.go similarity index 99% rename from pkgs/bitarray/bit_array_test.go rename to tm2/pkg/bitarray/bit_array_test.go index 996ad2a0c63..a70de110790 100644 --- a/pkgs/bitarray/bit_array_test.go +++ b/tm2/pkg/bitarray/bit_array_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" ) func randBitArray(bits int) (*BitArray, []byte) { diff --git a/pkgs/bitarray/bitarray.proto b/tm2/pkg/bitarray/bitarray.proto similarity index 62% rename from pkgs/bitarray/bitarray.proto rename to tm2/pkg/bitarray/bitarray.proto index 90050ff73bc..b7ff61c7e23 100644 --- a/pkgs/bitarray/bitarray.proto +++ b/tm2/pkg/bitarray/bitarray.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/bitarray/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/bitarray/pb"; // messages message BitArray { diff --git a/pkgs/bitarray/package.go b/tm2/pkg/bitarray/package.go similarity index 65% rename from pkgs/bitarray/package.go rename to tm2/pkg/bitarray/package.go index 71b5b195f33..3f3feb8e480 100644 --- a/pkgs/bitarray/package.go +++ b/tm2/pkg/bitarray/package.go @@ -1,9 +1,9 @@ package bitarray -import "github.com/gnolang/gno/pkgs/amino" +import "github.com/gnolang/gno/tm2/pkg/amino" var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/bitarray", + "github.com/gnolang/gno/tm2/pkg/bitarray", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/clist/bench_test.go b/tm2/pkg/clist/bench_test.go similarity index 100% rename from pkgs/clist/bench_test.go rename to tm2/pkg/clist/bench_test.go diff --git a/pkgs/clist/clist.go b/tm2/pkg/clist/clist.go similarity index 100% rename from pkgs/clist/clist.go rename to tm2/pkg/clist/clist.go diff --git a/pkgs/clist/clist_test.go b/tm2/pkg/clist/clist_test.go similarity index 99% rename from pkgs/clist/clist_test.go rename to tm2/pkg/clist/clist_test.go index 1b588812416..496966d2d61 100644 --- a/pkgs/clist/clist_test.go +++ b/tm2/pkg/clist/clist_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/cmap/cmap.go b/tm2/pkg/cmap/cmap.go similarity index 100% rename from pkgs/cmap/cmap.go rename to tm2/pkg/cmap/cmap.go diff --git a/pkgs/cmap/cmap_test.go b/tm2/pkg/cmap/cmap_test.go similarity index 100% rename from pkgs/cmap/cmap_test.go rename to tm2/pkg/cmap/cmap_test.go diff --git a/pkgs/colors/colors.go b/tm2/pkg/colors/colors.go similarity index 100% rename from pkgs/colors/colors.go rename to tm2/pkg/colors/colors.go diff --git a/pkgs/commands/command.go b/tm2/pkg/commands/command.go similarity index 100% rename from pkgs/commands/command.go rename to tm2/pkg/commands/command.go diff --git a/pkgs/commands/commands_test.go b/tm2/pkg/commands/commands_test.go similarity index 100% rename from pkgs/commands/commands_test.go rename to tm2/pkg/commands/commands_test.go diff --git a/pkgs/commands/empty.go b/tm2/pkg/commands/empty.go similarity index 100% rename from pkgs/commands/empty.go rename to tm2/pkg/commands/empty.go diff --git a/pkgs/commands/io.go b/tm2/pkg/commands/io.go similarity index 100% rename from pkgs/commands/io.go rename to tm2/pkg/commands/io.go diff --git a/pkgs/commands/types.go b/tm2/pkg/commands/types.go similarity index 100% rename from pkgs/commands/types.go rename to tm2/pkg/commands/types.go diff --git a/pkgs/commands/utils.go b/tm2/pkg/commands/utils.go similarity index 100% rename from pkgs/commands/utils.go rename to tm2/pkg/commands/utils.go diff --git a/pkgs/crypto/LICENSE b/tm2/pkg/crypto/LICENSE similarity index 100% rename from pkgs/crypto/LICENSE rename to tm2/pkg/crypto/LICENSE diff --git a/pkgs/crypto/README.md b/tm2/pkg/crypto/README.md similarity index 100% rename from pkgs/crypto/README.md rename to tm2/pkg/crypto/README.md diff --git a/pkgs/crypto/amino.go b/tm2/pkg/crypto/amino.go similarity index 87% rename from pkgs/crypto/amino.go rename to tm2/pkg/crypto/amino.go index 095aeea8931..531b860c4d8 100644 --- a/pkgs/crypto/amino.go +++ b/tm2/pkg/crypto/amino.go @@ -1,7 +1,7 @@ package crypto import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) func PrivKeyFromBytes(privKeyBytes []byte) (privKey PrivKey, err error) { diff --git a/pkgs/crypto/aminoscan b/tm2/pkg/crypto/aminoscan similarity index 100% rename from pkgs/crypto/aminoscan rename to tm2/pkg/crypto/aminoscan diff --git a/pkgs/crypto/armor/armor.go b/tm2/pkg/crypto/armor/armor.go similarity index 100% rename from pkgs/crypto/armor/armor.go rename to tm2/pkg/crypto/armor/armor.go diff --git a/pkgs/crypto/armor/armor_test.go b/tm2/pkg/crypto/armor/armor_test.go similarity index 100% rename from pkgs/crypto/armor/armor_test.go rename to tm2/pkg/crypto/armor/armor_test.go diff --git a/pkgs/crypto/bcrypt/base64.go b/tm2/pkg/crypto/bcrypt/base64.go similarity index 100% rename from pkgs/crypto/bcrypt/base64.go rename to tm2/pkg/crypto/bcrypt/base64.go diff --git a/pkgs/crypto/bcrypt/bcrypt.go b/tm2/pkg/crypto/bcrypt/bcrypt.go similarity index 100% rename from pkgs/crypto/bcrypt/bcrypt.go rename to tm2/pkg/crypto/bcrypt/bcrypt.go diff --git a/pkgs/crypto/bcrypt/bcrypt_test.go b/tm2/pkg/crypto/bcrypt/bcrypt_test.go similarity index 100% rename from pkgs/crypto/bcrypt/bcrypt_test.go rename to tm2/pkg/crypto/bcrypt/bcrypt_test.go diff --git a/pkgs/crypto/bech32.go b/tm2/pkg/crypto/bech32.go similarity index 94% rename from pkgs/crypto/bech32.go rename to tm2/pkg/crypto/bech32.go index 58814722fdc..33d47ddaf12 100644 --- a/pkgs/crypto/bech32.go +++ b/tm2/pkg/crypto/bech32.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/bech32" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/bech32" ) func AddressToBech32(addr Address) string { diff --git a/pkgs/crypto/bech32_test.go b/tm2/pkg/crypto/bech32_test.go similarity index 92% rename from pkgs/crypto/bech32_test.go rename to tm2/pkg/crypto/bech32_test.go index ad7e9201717..13bdaa8e816 100644 --- a/pkgs/crypto/bech32_test.go +++ b/tm2/pkg/crypto/bech32_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" ) var invalidStrs = []string{ diff --git a/pkgs/crypto/bip39/LICENSE b/tm2/pkg/crypto/bip39/LICENSE similarity index 100% rename from pkgs/crypto/bip39/LICENSE rename to tm2/pkg/crypto/bip39/LICENSE diff --git a/pkgs/crypto/bip39/bench_test.go b/tm2/pkg/crypto/bip39/bench_test.go similarity index 100% rename from pkgs/crypto/bip39/bench_test.go rename to tm2/pkg/crypto/bip39/bench_test.go diff --git a/pkgs/crypto/bip39/bip39.go b/tm2/pkg/crypto/bip39/bip39.go similarity index 100% rename from pkgs/crypto/bip39/bip39.go rename to tm2/pkg/crypto/bip39/bip39.go diff --git a/pkgs/crypto/bip39/bip39_test.go b/tm2/pkg/crypto/bip39/bip39_test.go similarity index 100% rename from pkgs/crypto/bip39/bip39_test.go rename to tm2/pkg/crypto/bip39/bip39_test.go diff --git a/pkgs/crypto/bip39/wordlist.go b/tm2/pkg/crypto/bip39/wordlist.go similarity index 100% rename from pkgs/crypto/bip39/wordlist.go rename to tm2/pkg/crypto/bip39/wordlist.go diff --git a/pkgs/crypto/consts.go b/tm2/pkg/crypto/consts.go similarity index 100% rename from pkgs/crypto/consts.go rename to tm2/pkg/crypto/consts.go diff --git a/pkgs/crypto/crypto.go b/tm2/pkg/crypto/crypto.go similarity index 97% rename from pkgs/crypto/crypto.go rename to tm2/pkg/crypto/crypto.go index 048e8405790..e7089ca579b 100644 --- a/pkgs/crypto/crypto.go +++ b/tm2/pkg/crypto/crypto.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/bech32" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/bech32" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) // ---------------------------------------- diff --git a/pkgs/crypto/doc.go b/tm2/pkg/crypto/doc.go similarity index 100% rename from pkgs/crypto/doc.go rename to tm2/pkg/crypto/doc.go diff --git a/pkgs/crypto/ed25519/bench_test.go b/tm2/pkg/crypto/ed25519/bench_test.go similarity index 81% rename from pkgs/crypto/ed25519/bench_test.go rename to tm2/pkg/crypto/ed25519/bench_test.go index edb4bc2101c..d4ef2e628c3 100644 --- a/pkgs/crypto/ed25519/bench_test.go +++ b/tm2/pkg/crypto/ed25519/bench_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/internal/benchmarking" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/pkgs/crypto/ed25519/ed25519.go b/tm2/pkg/crypto/ed25519/ed25519.go similarity index 97% rename from pkgs/crypto/ed25519/ed25519.go rename to tm2/pkg/crypto/ed25519/ed25519.go index 608a8706c35..8976994986c 100644 --- a/pkgs/crypto/ed25519/ed25519.go +++ b/tm2/pkg/crypto/ed25519/ed25519.go @@ -7,9 +7,9 @@ import ( "golang.org/x/crypto/ed25519" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) // ------------------------------------- diff --git a/pkgs/crypto/ed25519/ed25519.proto b/tm2/pkg/crypto/ed25519/ed25519.proto similarity index 65% rename from pkgs/crypto/ed25519/ed25519.proto rename to tm2/pkg/crypto/ed25519/ed25519.proto index 057cfc6be01..35a6b4e443e 100644 --- a/pkgs/crypto/ed25519/ed25519.proto +++ b/tm2/pkg/crypto/ed25519/ed25519.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/crypto/ed25519/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/crypto/ed25519/pb"; // messages message PubKeyEd25519 { diff --git a/pkgs/crypto/ed25519/ed25519_test.go b/tm2/pkg/crypto/ed25519/ed25519_test.go similarity index 86% rename from pkgs/crypto/ed25519/ed25519_test.go rename to tm2/pkg/crypto/ed25519/ed25519_test.go index a340a89939e..c07b7ae2298 100644 --- a/pkgs/crypto/ed25519/ed25519_test.go +++ b/tm2/pkg/crypto/ed25519/ed25519_test.go @@ -3,8 +3,8 @@ package ed25519_test import ( "testing" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/crypto/ed25519/package.go b/tm2/pkg/crypto/ed25519/package.go similarity index 71% rename from pkgs/crypto/ed25519/package.go rename to tm2/pkg/crypto/ed25519/package.go index c9260839429..3849497062c 100644 --- a/pkgs/crypto/ed25519/package.go +++ b/tm2/pkg/crypto/ed25519/package.go @@ -1,11 +1,11 @@ package ed25519 import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/crypto/ed25519", + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/crypto/example_test.go b/tm2/pkg/crypto/example_test.go similarity index 95% rename from pkgs/crypto/example_test.go rename to tm2/pkg/crypto/example_test.go index 4bc3550afec..899394728d5 100644 --- a/pkgs/crypto/example_test.go +++ b/tm2/pkg/crypto/example_test.go @@ -17,7 +17,7 @@ package crypto_test import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) func ExampleSha256() { diff --git a/pkgs/crypto/hash.go b/tm2/pkg/crypto/hash.go similarity index 100% rename from pkgs/crypto/hash.go rename to tm2/pkg/crypto/hash.go diff --git a/pkgs/crypto/hd/fundraiser_test.go b/tm2/pkg/crypto/hd/fundraiser_test.go similarity index 93% rename from pkgs/crypto/hd/fundraiser_test.go rename to tm2/pkg/crypto/hd/fundraiser_test.go index 262dfe3b981..dabfd670c37 100644 --- a/pkgs/crypto/hd/fundraiser_test.go +++ b/tm2/pkg/crypto/hd/fundraiser_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/bip39" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/bip39" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" ) type addrData struct { diff --git a/pkgs/crypto/hd/hd.proto b/tm2/pkg/crypto/hd/hd.proto similarity index 72% rename from pkgs/crypto/hd/hd.proto rename to tm2/pkg/crypto/hd/hd.proto index 22a6f3ddd8d..949408bb00c 100644 --- a/pkgs/crypto/hd/hd.proto +++ b/tm2/pkg/crypto/hd/hd.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/crypto/hd/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/crypto/hd/pb"; // messages message Bip44Params { diff --git a/pkgs/crypto/hd/hdpath.go b/tm2/pkg/crypto/hd/hdpath.go similarity index 100% rename from pkgs/crypto/hd/hdpath.go rename to tm2/pkg/crypto/hd/hdpath.go diff --git a/pkgs/crypto/hd/hdpath_test.go b/tm2/pkg/crypto/hd/hdpath_test.go similarity index 99% rename from pkgs/crypto/hd/hdpath_test.go rename to tm2/pkg/crypto/hd/hdpath_test.go index 86548e36480..1e66a9fba2c 100644 --- a/pkgs/crypto/hd/hdpath_test.go +++ b/tm2/pkg/crypto/hd/hdpath_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/gnolang/gno/pkgs/crypto/bip39" + "github.com/gnolang/gno/tm2/pkg/crypto/bip39" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/crypto/hd/package.go b/tm2/pkg/crypto/hd/package.go similarity index 67% rename from pkgs/crypto/hd/package.go rename to tm2/pkg/crypto/hd/package.go index bc60f62e594..d363fffb169 100644 --- a/pkgs/crypto/hd/package.go +++ b/tm2/pkg/crypto/hd/package.go @@ -1,11 +1,11 @@ package hd import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/crypto/hd", + "github.com/gnolang/gno/tm2/pkg/crypto/hd", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/crypto/hd/test.json b/tm2/pkg/crypto/hd/test.json similarity index 100% rename from pkgs/crypto/hd/test.json rename to tm2/pkg/crypto/hd/test.json diff --git a/pkgs/crypto/internal/benchmarking/bench.go b/tm2/pkg/crypto/internal/benchmarking/bench.go similarity index 98% rename from pkgs/crypto/internal/benchmarking/bench.go rename to tm2/pkg/crypto/internal/benchmarking/bench.go index d96ae1a1b34..7dd054dff30 100644 --- a/pkgs/crypto/internal/benchmarking/bench.go +++ b/tm2/pkg/crypto/internal/benchmarking/bench.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // The code in this file is adapted from agl/ed25519. diff --git a/pkgs/crypto/keys/armor/README.md b/tm2/pkg/crypto/keys/armor/README.md similarity index 91% rename from pkgs/crypto/keys/armor/README.md rename to tm2/pkg/crypto/keys/armor/README.md index 3b3b1857583..e7887495ae2 100644 --- a/pkgs/crypto/keys/armor/README.md +++ b/tm2/pkg/crypto/keys/armor/README.md @@ -13,7 +13,7 @@ Benchmarking To run Bcrypt benchmarks: ```bash -go test -v --bench github.com/gnolang/gno/pkgs/crypto/keys/mintkey +go test -v --bench github.com/gnolang/gno/tm2/pkg/crypto/keys/mintkey ``` On the test machine (midrange ThinkPad; i7 6600U), this results in: @@ -21,7 +21,7 @@ On the test machine (midrange ThinkPad; i7 6600U), this results in: ```bash goos: linux goarch: amd64 -pkg: github.com/gnolang/gno/pkgs/crypto/keys/mintkey +pkg: github.com/gnolang/gno/tm2/pkg/crypto/keys/mintkey BenchmarkBcryptGenerateFromPassword/benchmark-security-param-9-4 50 34609268 ns/op BenchmarkBcryptGenerateFromPassword/benchmark-security-param-10-4 20 67874471 ns/op BenchmarkBcryptGenerateFromPassword/benchmark-security-param-11-4 10 135515404 ns/op @@ -30,7 +30,7 @@ BenchmarkBcryptGenerateFromPassword/benchmark-security-param-13-4 BenchmarkBcryptGenerateFromPassword/benchmark-security-param-14-4 1 1083685904 ns/op BenchmarkBcryptGenerateFromPassword/benchmark-security-param-15-4 1 2183674041 ns/op PASS -ok github.com/gnolang/gno/pkgs/crypto/keys/mintkey 12.093s +ok github.com/gnolang/gno/tm2/pkg/crypto/keys/mintkey 12.093s ``` Benchmark results are in nanoseconds, so security parameter 12 takes about a quarter of a second to generate the Bcrypt key, security param 13 takes half a second, and so on. diff --git a/pkgs/crypto/keys/armor/armor.go b/tm2/pkg/crypto/keys/armor/armor.go similarity index 93% rename from pkgs/crypto/keys/armor/armor.go rename to tm2/pkg/crypto/keys/armor/armor.go index 80e469e4f2d..e45af7f68a4 100644 --- a/pkgs/crypto/keys/armor/armor.go +++ b/tm2/pkg/crypto/keys/armor/armor.go @@ -4,12 +4,12 @@ import ( "encoding/hex" "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/armor" - "github.com/gnolang/gno/pkgs/crypto/bcrypt" - "github.com/gnolang/gno/pkgs/crypto/keys/keyerror" - "github.com/gnolang/gno/pkgs/crypto/xsalsa20symmetric" - "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/armor" + "github.com/gnolang/gno/tm2/pkg/crypto/bcrypt" + "github.com/gnolang/gno/tm2/pkg/crypto/keys/keyerror" + "github.com/gnolang/gno/tm2/pkg/crypto/xsalsa20symmetric" + "github.com/gnolang/gno/tm2/pkg/os" ) const ( diff --git a/pkgs/crypto/keys/armor/armor_bench_test.go b/tm2/pkg/crypto/keys/armor/armor_bench_test.go similarity index 85% rename from pkgs/crypto/keys/armor/armor_bench_test.go rename to tm2/pkg/crypto/keys/armor/armor_bench_test.go index 2abb03c62b7..8be74507a8d 100644 --- a/pkgs/crypto/keys/armor/armor_bench_test.go +++ b/tm2/pkg/crypto/keys/armor/armor_bench_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/bcrypt" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/bcrypt" "github.com/stretchr/testify/require" ) diff --git a/pkgs/crypto/keys/armor/armor_test.go b/tm2/pkg/crypto/keys/armor/armor_test.go similarity index 86% rename from pkgs/crypto/keys/armor/armor_test.go rename to tm2/pkg/crypto/keys/armor/armor_test.go index fd6e612e1e6..a145ba2a48b 100644 --- a/pkgs/crypto/keys/armor/armor_test.go +++ b/tm2/pkg/crypto/keys/armor/armor_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/crypto/keys/armor" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/crypto/keys/armor" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" ) func TestArmorUnarmor_PrivKey_Encrypted(t *testing.T) { diff --git a/pkgs/crypto/keys/armor/armor_unsafe.go b/tm2/pkg/crypto/keys/armor/armor_unsafe.go similarity index 87% rename from pkgs/crypto/keys/armor/armor_unsafe.go rename to tm2/pkg/crypto/keys/armor/armor_unsafe.go index 624f3d30b24..7473dad1737 100644 --- a/pkgs/crypto/keys/armor/armor_unsafe.go +++ b/tm2/pkg/crypto/keys/armor/armor_unsafe.go @@ -3,9 +3,9 @@ package armor import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/armor" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/armor" + "github.com/gnolang/gno/tm2/pkg/errors" ) var emptyArmorHeader = map[string]string{} diff --git a/pkgs/crypto/keys/armor/armor_unsafe_test.go b/tm2/pkg/crypto/keys/armor/armor_unsafe_test.go similarity index 92% rename from pkgs/crypto/keys/armor/armor_unsafe_test.go rename to tm2/pkg/crypto/keys/armor/armor_unsafe_test.go index 36caf002ea9..a61af017ff7 100644 --- a/pkgs/crypto/keys/armor/armor_unsafe_test.go +++ b/tm2/pkg/crypto/keys/armor/armor_unsafe_test.go @@ -3,7 +3,7 @@ package armor import ( "testing" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/client/add.go b/tm2/pkg/crypto/keys/client/add.go similarity index 96% rename from pkgs/crypto/keys/client/add.go rename to tm2/pkg/crypto/keys/client/add.go index 958a43870ae..5f90a9f874e 100644 --- a/pkgs/crypto/keys/client/add.go +++ b/tm2/pkg/crypto/keys/client/add.go @@ -7,11 +7,11 @@ import ( "fmt" "sort" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/bip39" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/crypto/multisig" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/bip39" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/crypto/multisig" ) type addCfg struct { diff --git a/pkgs/crypto/keys/client/add_test.go b/tm2/pkg/crypto/keys/client/add_test.go similarity index 93% rename from pkgs/crypto/keys/client/add_test.go rename to tm2/pkg/crypto/keys/client/add_test.go index 813d2ebc1c0..94cb945f113 100644 --- a/pkgs/crypto/keys/client/add_test.go +++ b/tm2/pkg/crypto/keys/client/add_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/client/addpkg.go b/tm2/pkg/crypto/keys/client/addpkg.go similarity index 92% rename from pkgs/crypto/keys/client/addpkg.go rename to tm2/pkg/crypto/keys/client/addpkg.go index 121fa40ff6e..106d6867e74 100644 --- a/pkgs/crypto/keys/client/addpkg.go +++ b/tm2/pkg/crypto/keys/client/addpkg.go @@ -1,17 +1,19 @@ package client +// TODO: move most of the logic in ROOT/gno.land/... + import ( "context" "flag" "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/errors" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/sdk/vm" - "github.com/gnolang/gno/pkgs/std" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/sdk/vm" + "github.com/gnolang/gno/tm2/pkg/std" ) type addPkgCfg struct { diff --git a/pkgs/crypto/keys/client/broadcast.go b/tm2/pkg/crypto/keys/client/broadcast.go similarity index 89% rename from pkgs/crypto/keys/client/broadcast.go rename to tm2/pkg/crypto/keys/client/broadcast.go index d3422d43f61..039a9557c38 100644 --- a/pkgs/crypto/keys/client/broadcast.go +++ b/tm2/pkg/crypto/keys/client/broadcast.go @@ -5,13 +5,13 @@ import ( "flag" "os" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/std" ) type broadcastCfg struct { diff --git a/pkgs/crypto/keys/client/call.go b/tm2/pkg/crypto/keys/client/call.go similarity index 90% rename from pkgs/crypto/keys/client/call.go rename to tm2/pkg/crypto/keys/client/call.go index e6473dd541a..fa445860e5a 100644 --- a/pkgs/crypto/keys/client/call.go +++ b/tm2/pkg/crypto/keys/client/call.go @@ -5,12 +5,12 @@ import ( "flag" "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/sdk/vm" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/sdk/vm" + "github.com/gnolang/gno/tm2/pkg/std" ) type callCfg struct { diff --git a/pkgs/crypto/keys/client/common.go b/tm2/pkg/crypto/keys/client/common.go similarity index 100% rename from pkgs/crypto/keys/client/common.go rename to tm2/pkg/crypto/keys/client/common.go diff --git a/pkgs/crypto/keys/client/delete.go b/tm2/pkg/crypto/keys/client/delete.go similarity index 95% rename from pkgs/crypto/keys/client/delete.go rename to tm2/pkg/crypto/keys/client/delete.go index 544dcdb2197..0f216d3467c 100644 --- a/pkgs/crypto/keys/client/delete.go +++ b/tm2/pkg/crypto/keys/client/delete.go @@ -5,8 +5,8 @@ import ( "errors" "flag" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" ) type deleteCfg struct { diff --git a/pkgs/crypto/keys/client/delete_test.go b/tm2/pkg/crypto/keys/client/delete_test.go similarity index 94% rename from pkgs/crypto/keys/client/delete_test.go rename to tm2/pkg/crypto/keys/client/delete_test.go index 8b3a8a78f10..b3f83f1d9a2 100644 --- a/pkgs/crypto/keys/client/delete_test.go +++ b/tm2/pkg/crypto/keys/client/delete_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/crypto/keys/client/export.go b/tm2/pkg/crypto/keys/client/export.go similarity index 96% rename from pkgs/crypto/keys/client/export.go rename to tm2/pkg/crypto/keys/client/export.go index 59eb932327d..eda04a5c92f 100644 --- a/pkgs/crypto/keys/client/export.go +++ b/tm2/pkg/crypto/keys/client/export.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" ) type exportCfg struct { diff --git a/pkgs/crypto/keys/client/export_test.go b/tm2/pkg/crypto/keys/client/export_test.go similarity index 96% rename from pkgs/crypto/keys/client/export_test.go rename to tm2/pkg/crypto/keys/client/export_test.go index 0c3371d414f..a5f1ec8f48e 100644 --- a/pkgs/crypto/keys/client/export_test.go +++ b/tm2/pkg/crypto/keys/client/export_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/client/generate.go b/tm2/pkg/crypto/keys/client/generate.go similarity index 95% rename from pkgs/crypto/keys/client/generate.go rename to tm2/pkg/crypto/keys/client/generate.go index 5014a78e948..b721e6704ce 100644 --- a/pkgs/crypto/keys/client/generate.go +++ b/tm2/pkg/crypto/keys/client/generate.go @@ -6,8 +6,8 @@ import ( "flag" "fmt" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/bip39" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/bip39" ) type generateCfg struct { diff --git a/pkgs/crypto/keys/client/generate_test.go b/tm2/pkg/crypto/keys/client/generate_test.go similarity index 97% rename from pkgs/crypto/keys/client/generate_test.go rename to tm2/pkg/crypto/keys/client/generate_test.go index 8a4b5c231c4..516912046b6 100644 --- a/pkgs/crypto/keys/client/generate_test.go +++ b/tm2/pkg/crypto/keys/client/generate_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" "github.com/stretchr/testify/require" ) diff --git a/pkgs/crypto/keys/client/helper.go b/tm2/pkg/crypto/keys/client/helper.go similarity index 87% rename from pkgs/crypto/keys/client/helper.go rename to tm2/pkg/crypto/keys/client/helper.go index 87027b7b861..42a936910f7 100644 --- a/pkgs/crypto/keys/client/helper.go +++ b/tm2/pkg/crypto/keys/client/helper.go @@ -1,6 +1,6 @@ package client -import "github.com/gnolang/gno/pkgs/crypto/bip39" +import "github.com/gnolang/gno/tm2/pkg/crypto/bip39" // generateMnemonic generates a new BIP39 mnemonic using the // provided entropy size diff --git a/pkgs/crypto/keys/client/import.go b/tm2/pkg/crypto/keys/client/import.go similarity index 96% rename from pkgs/crypto/keys/client/import.go rename to tm2/pkg/crypto/keys/client/import.go index 33434ee0b5f..5e0eeecabb5 100644 --- a/pkgs/crypto/keys/client/import.go +++ b/tm2/pkg/crypto/keys/client/import.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" ) type importCfg struct { diff --git a/pkgs/crypto/keys/client/import_test.go b/tm2/pkg/crypto/keys/client/import_test.go similarity index 97% rename from pkgs/crypto/keys/client/import_test.go rename to tm2/pkg/crypto/keys/client/import_test.go index af2d671192f..7bc00e06ec9 100644 --- a/pkgs/crypto/keys/client/import_test.go +++ b/tm2/pkg/crypto/keys/client/import_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/client/list.go b/tm2/pkg/crypto/keys/client/list.go similarity index 91% rename from pkgs/crypto/keys/client/list.go rename to tm2/pkg/crypto/keys/client/list.go index b30c9bdedb4..50be35cef43 100644 --- a/pkgs/crypto/keys/client/list.go +++ b/tm2/pkg/crypto/keys/client/list.go @@ -4,8 +4,8 @@ import ( "context" "flag" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" ) func newListCmd(rootCfg *baseCfg) *commands.Command { diff --git a/pkgs/crypto/keys/client/list_test.go b/tm2/pkg/crypto/keys/client/list_test.go similarity index 89% rename from pkgs/crypto/keys/client/list_test.go rename to tm2/pkg/crypto/keys/client/list_test.go index bcc148ad910..ee0a147f3d3 100644 --- a/pkgs/crypto/keys/client/list_test.go +++ b/tm2/pkg/crypto/keys/client/list_test.go @@ -3,9 +3,9 @@ package client import ( "testing" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/client/maketx.go b/tm2/pkg/crypto/keys/client/maketx.go similarity index 96% rename from pkgs/crypto/keys/client/maketx.go rename to tm2/pkg/crypto/keys/client/maketx.go index 95030f88964..cbcc6def0de 100644 --- a/pkgs/crypto/keys/client/maketx.go +++ b/tm2/pkg/crypto/keys/client/maketx.go @@ -3,7 +3,7 @@ package client import ( "flag" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" ) type makeTxCfg struct { diff --git a/pkgs/crypto/keys/client/query.go b/tm2/pkg/crypto/keys/client/query.go similarity index 90% rename from pkgs/crypto/keys/client/query.go rename to tm2/pkg/crypto/keys/client/query.go index 6596ec1175a..58923f8787c 100644 --- a/pkgs/crypto/keys/client/query.go +++ b/tm2/pkg/crypto/keys/client/query.go @@ -5,10 +5,10 @@ import ( "flag" "fmt" - "github.com/gnolang/gno/pkgs/bft/rpc/client" - ctypes "github.com/gnolang/gno/pkgs/bft/rpc/core/types" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" + ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/errors" ) type queryCfg struct { diff --git a/pkgs/crypto/keys/client/root.go b/tm2/pkg/crypto/keys/client/root.go similarity index 96% rename from pkgs/crypto/keys/client/root.go rename to tm2/pkg/crypto/keys/client/root.go index cb96c3009c9..2b98f11a986 100644 --- a/pkgs/crypto/keys/client/root.go +++ b/tm2/pkg/crypto/keys/client/root.go @@ -4,7 +4,7 @@ package client import ( "flag" - "github.com/gnolang/gno/pkgs/commands" + "github.com/gnolang/gno/tm2/pkg/commands" ) const ( diff --git a/pkgs/crypto/keys/client/send.go b/tm2/pkg/crypto/keys/client/send.go similarity index 88% rename from pkgs/crypto/keys/client/send.go rename to tm2/pkg/crypto/keys/client/send.go index d9c4d2b52cf..8f82778b1e3 100644 --- a/pkgs/crypto/keys/client/send.go +++ b/tm2/pkg/crypto/keys/client/send.go @@ -5,13 +5,13 @@ import ( "flag" "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/sdk/bank" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/sdk/bank" + "github.com/gnolang/gno/tm2/pkg/std" ) type sendCfg struct { diff --git a/pkgs/crypto/keys/client/sign.go b/tm2/pkg/crypto/keys/client/sign.go similarity index 95% rename from pkgs/crypto/keys/client/sign.go rename to tm2/pkg/crypto/keys/client/sign.go index 00eaf04ff18..bfc39647141 100644 --- a/pkgs/crypto/keys/client/sign.go +++ b/tm2/pkg/crypto/keys/client/sign.go @@ -7,10 +7,10 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/std" ) type signCfg struct { diff --git a/pkgs/crypto/keys/client/sign_test.go b/tm2/pkg/crypto/keys/client/sign_test.go similarity index 86% rename from pkgs/crypto/keys/client/sign_test.go rename to tm2/pkg/crypto/keys/client/sign_test.go index adb303e3a6c..6e9b1da5946 100644 --- a/pkgs/crypto/keys/client/sign_test.go +++ b/tm2/pkg/crypto/keys/client/sign_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - sdkutils "github.com/gnolang/gno/pkgs/sdk/testutils" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + sdkutils "github.com/gnolang/gno/tm2/pkg/sdk/testutils" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/client/verify.go b/tm2/pkg/crypto/keys/client/verify.go similarity index 94% rename from pkgs/crypto/keys/client/verify.go rename to tm2/pkg/crypto/keys/client/verify.go index acb06413289..3dcc5f35dee 100644 --- a/pkgs/crypto/keys/client/verify.go +++ b/tm2/pkg/crypto/keys/client/verify.go @@ -6,8 +6,8 @@ import ( "flag" "os" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" ) type verifyCfg struct { diff --git a/pkgs/crypto/keys/client/verify_test.go b/tm2/pkg/crypto/keys/client/verify_test.go similarity index 92% rename from pkgs/crypto/keys/client/verify_test.go rename to tm2/pkg/crypto/keys/client/verify_test.go index 1906c8894f4..206c14682fd 100644 --- a/pkgs/crypto/keys/client/verify_test.go +++ b/tm2/pkg/crypto/keys/client/verify_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/commands" - "github.com/gnolang/gno/pkgs/crypto/keys" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/commands" + "github.com/gnolang/gno/tm2/pkg/crypto/keys" + "github.com/gnolang/gno/tm2/pkg/testutils" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/keybase.go b/tm2/pkg/crypto/keys/keybase.go similarity index 97% rename from pkgs/crypto/keys/keybase.go rename to tm2/pkg/crypto/keys/keybase.go index 868673916d8..16b3631d188 100644 --- a/pkgs/crypto/keys/keybase.go +++ b/tm2/pkg/crypto/keys/keybase.go @@ -5,15 +5,15 @@ import ( "reflect" "strings" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/bip39" - "github.com/gnolang/gno/pkgs/crypto/hd" - "github.com/gnolang/gno/pkgs/crypto/keys/armor" - "github.com/gnolang/gno/pkgs/crypto/keys/keyerror" - "github.com/gnolang/gno/pkgs/crypto/ledger" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/bip39" + "github.com/gnolang/gno/tm2/pkg/crypto/hd" + "github.com/gnolang/gno/tm2/pkg/crypto/keys/armor" + "github.com/gnolang/gno/tm2/pkg/crypto/keys/keyerror" + "github.com/gnolang/gno/tm2/pkg/crypto/ledger" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" ) var _ Keybase = dbKeybase{} diff --git a/pkgs/crypto/keys/keybase_test.go b/tm2/pkg/crypto/keys/keybase_test.go similarity index 99% rename from pkgs/crypto/keys/keybase_test.go rename to tm2/pkg/crypto/keys/keybase_test.go index feb39581e41..987a271881b 100644 --- a/pkgs/crypto/keys/keybase_test.go +++ b/tm2/pkg/crypto/keys/keybase_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" ) func TestCreateAccountInvalidMnemonic(t *testing.T) { diff --git a/pkgs/crypto/keys/keyerror/errors.go b/tm2/pkg/crypto/keys/keyerror/errors.go similarity index 100% rename from pkgs/crypto/keys/keyerror/errors.go rename to tm2/pkg/crypto/keys/keyerror/errors.go diff --git a/pkgs/crypto/keys/keys.go b/tm2/pkg/crypto/keys/keys.go similarity index 100% rename from pkgs/crypto/keys/keys.go rename to tm2/pkg/crypto/keys/keys.go diff --git a/pkgs/crypto/keys/lazy_keybase.go b/tm2/pkg/crypto/keys/lazy_keybase.go similarity index 97% rename from pkgs/crypto/keys/lazy_keybase.go rename to tm2/pkg/crypto/keys/lazy_keybase.go index a5f81a19f4d..2b2719bfdba 100644 --- a/pkgs/crypto/keys/lazy_keybase.go +++ b/tm2/pkg/crypto/keys/lazy_keybase.go @@ -3,10 +3,10 @@ package keys import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/hd" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/hd" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/os" ) var _ Keybase = lazyKeybase{} diff --git a/pkgs/crypto/keys/package.go b/tm2/pkg/crypto/keys/package.go similarity index 75% rename from pkgs/crypto/keys/package.go rename to tm2/pkg/crypto/keys/package.go index 688086d0724..50effbea1dc 100644 --- a/pkgs/crypto/keys/package.go +++ b/tm2/pkg/crypto/keys/package.go @@ -1,11 +1,11 @@ package keys import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/crypto/keys", + "github.com/gnolang/gno/tm2/pkg/crypto/keys", "tm.keys", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/crypto/keys/types.go b/tm2/pkg/crypto/keys/types.go similarity index 97% rename from pkgs/crypto/keys/types.go rename to tm2/pkg/crypto/keys/types.go index 8196d8e750e..bba3a917b69 100644 --- a/pkgs/crypto/keys/types.go +++ b/tm2/pkg/crypto/keys/types.go @@ -3,10 +3,10 @@ package keys import ( "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/hd" - "github.com/gnolang/gno/pkgs/crypto/multisig" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/hd" + "github.com/gnolang/gno/tm2/pkg/crypto/multisig" ) // Keybase exposes operations on a generic keystore diff --git a/pkgs/crypto/keys/types_test.go b/tm2/pkg/crypto/keys/types_test.go similarity index 89% rename from pkgs/crypto/keys/types_test.go rename to tm2/pkg/crypto/keys/types_test.go index 0a4f03e1efe..a0591819a88 100644 --- a/pkgs/crypto/keys/types_test.go +++ b/tm2/pkg/crypto/keys/types_test.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "testing" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/hd" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/hd" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/keys/utils.go b/tm2/pkg/crypto/keys/utils.go similarity index 100% rename from pkgs/crypto/keys/utils.go rename to tm2/pkg/crypto/keys/utils.go diff --git a/pkgs/crypto/ledger/ledger_secp256k1.go b/tm2/pkg/crypto/ledger/ledger_secp256k1.go similarity index 97% rename from pkgs/crypto/ledger/ledger_secp256k1.go rename to tm2/pkg/crypto/ledger/ledger_secp256k1.go index f355cca7527..f0b74cd48d4 100644 --- a/pkgs/crypto/ledger/ledger_secp256k1.go +++ b/tm2/pkg/crypto/ledger/ledger_secp256k1.go @@ -6,11 +6,11 @@ import ( "github.com/btcsuite/btcd/btcec" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/hd" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/hd" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/errors" ) // discoverLedger defines a function to be invoked at runtime for discovering diff --git a/pkgs/crypto/merkle/README.md b/tm2/pkg/crypto/merkle/README.md similarity index 100% rename from pkgs/crypto/merkle/README.md rename to tm2/pkg/crypto/merkle/README.md diff --git a/pkgs/crypto/merkle/codec.go b/tm2/pkg/crypto/merkle/codec.go similarity index 68% rename from pkgs/crypto/merkle/codec.go rename to tm2/pkg/crypto/merkle/codec.go index a17d6aca1a0..be69a140d08 100644 --- a/pkgs/crypto/merkle/codec.go +++ b/tm2/pkg/crypto/merkle/codec.go @@ -1,7 +1,7 @@ package merkle import ( - amino "github.com/gnolang/gno/pkgs/amino" + amino "github.com/gnolang/gno/tm2/pkg/amino" ) var cdc *amino.Codec diff --git a/pkgs/crypto/merkle/doc.go b/tm2/pkg/crypto/merkle/doc.go similarity index 100% rename from pkgs/crypto/merkle/doc.go rename to tm2/pkg/crypto/merkle/doc.go diff --git a/pkgs/crypto/merkle/hash.go b/tm2/pkg/crypto/merkle/hash.go similarity index 89% rename from pkgs/crypto/merkle/hash.go rename to tm2/pkg/crypto/merkle/hash.go index c795e438a68..97cce61c158 100644 --- a/pkgs/crypto/merkle/hash.go +++ b/tm2/pkg/crypto/merkle/hash.go @@ -1,7 +1,7 @@ package merkle import ( - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) // TODO: make these have a large predefined capacity diff --git a/pkgs/crypto/merkle/merkle.proto b/tm2/pkg/crypto/merkle/merkle.proto similarity index 86% rename from pkgs/crypto/merkle/merkle.proto rename to tm2/pkg/crypto/merkle/merkle.proto index d53646282ad..f415caaaa2f 100644 --- a/pkgs/crypto/merkle/merkle.proto +++ b/tm2/pkg/crypto/merkle/merkle.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/crypto/merkle/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/crypto/merkle/pb"; // messages message ProofOp { diff --git a/pkgs/crypto/merkle/package.go b/tm2/pkg/crypto/merkle/package.go similarity index 70% rename from pkgs/crypto/merkle/package.go rename to tm2/pkg/crypto/merkle/package.go index f9b24c313dc..2e6ba7467aa 100644 --- a/pkgs/crypto/merkle/package.go +++ b/tm2/pkg/crypto/merkle/package.go @@ -1,11 +1,11 @@ package merkle import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/crypto/merkle", + "github.com/gnolang/gno/tm2/pkg/crypto/merkle", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/crypto/merkle/proof.go b/tm2/pkg/crypto/merkle/proof.go similarity index 98% rename from pkgs/crypto/merkle/proof.go rename to tm2/pkg/crypto/merkle/proof.go index 43050777a61..35b07d6ad41 100644 --- a/pkgs/crypto/merkle/proof.go +++ b/tm2/pkg/crypto/merkle/proof.go @@ -3,7 +3,7 @@ package merkle import ( "bytes" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) //---------------------------------------- diff --git a/pkgs/crypto/merkle/proof_key_path.go b/tm2/pkg/crypto/merkle/proof_key_path.go similarity index 98% rename from pkgs/crypto/merkle/proof_key_path.go rename to tm2/pkg/crypto/merkle/proof_key_path.go index 52c4c70e9db..278f782833c 100644 --- a/pkgs/crypto/merkle/proof_key_path.go +++ b/tm2/pkg/crypto/merkle/proof_key_path.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) /* diff --git a/pkgs/crypto/merkle/proof_key_path_test.go b/tm2/pkg/crypto/merkle/proof_key_path_test.go similarity index 100% rename from pkgs/crypto/merkle/proof_key_path_test.go rename to tm2/pkg/crypto/merkle/proof_key_path_test.go diff --git a/pkgs/crypto/merkle/proof_simple_value.go b/tm2/pkg/crypto/merkle/proof_simple_value.go similarity index 96% rename from pkgs/crypto/merkle/proof_simple_value.go rename to tm2/pkg/crypto/merkle/proof_simple_value.go index bb70e27bf38..b00635832a4 100644 --- a/pkgs/crypto/merkle/proof_simple_value.go +++ b/tm2/pkg/crypto/merkle/proof_simple_value.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ProofOpSimpleValue = "simple:v" diff --git a/pkgs/crypto/merkle/proof_test.go b/tm2/pkg/crypto/merkle/proof_test.go similarity index 97% rename from pkgs/crypto/merkle/proof_test.go rename to tm2/pkg/crypto/merkle/proof_test.go index 945a021209d..676e281ac60 100644 --- a/pkgs/crypto/merkle/proof_test.go +++ b/tm2/pkg/crypto/merkle/proof_test.go @@ -3,8 +3,8 @@ package merkle import ( "testing" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/errors" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/merkle/rfc6962_test.go b/tm2/pkg/crypto/merkle/rfc6962_test.go similarity index 98% rename from pkgs/crypto/merkle/rfc6962_test.go rename to tm2/pkg/crypto/merkle/rfc6962_test.go index fc2b467e99b..917b09015b0 100644 --- a/pkgs/crypto/merkle/rfc6962_test.go +++ b/tm2/pkg/crypto/merkle/rfc6962_test.go @@ -20,7 +20,7 @@ import ( "encoding/hex" "testing" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" ) func TestRFC6962Hasher(t *testing.T) { diff --git a/pkgs/crypto/merkle/simple_map.go b/tm2/pkg/crypto/merkle/simple_map.go similarity index 93% rename from pkgs/crypto/merkle/simple_map.go rename to tm2/pkg/crypto/merkle/simple_map.go index acadc6fb3f4..da82fb3c633 100644 --- a/pkgs/crypto/merkle/simple_map.go +++ b/tm2/pkg/crypto/merkle/simple_map.go @@ -3,9 +3,9 @@ package merkle import ( "bytes" - amino "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/std" + amino "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/std" ) // Merkle tree from a map. diff --git a/pkgs/crypto/merkle/simple_map_test.go b/tm2/pkg/crypto/merkle/simple_map_test.go similarity index 100% rename from pkgs/crypto/merkle/simple_map_test.go rename to tm2/pkg/crypto/merkle/simple_map_test.go diff --git a/pkgs/crypto/merkle/simple_proof.go b/tm2/pkg/crypto/merkle/simple_proof.go similarity index 98% rename from pkgs/crypto/merkle/simple_proof.go rename to tm2/pkg/crypto/merkle/simple_proof.go index 0946724e635..ce3a60d5ae7 100644 --- a/pkgs/crypto/merkle/simple_proof.go +++ b/tm2/pkg/crypto/merkle/simple_proof.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ( diff --git a/pkgs/crypto/merkle/simple_proof_test.go b/tm2/pkg/crypto/merkle/simple_proof_test.go similarity index 100% rename from pkgs/crypto/merkle/simple_proof_test.go rename to tm2/pkg/crypto/merkle/simple_proof_test.go diff --git a/pkgs/crypto/merkle/simple_tree.go b/tm2/pkg/crypto/merkle/simple_tree.go similarity index 100% rename from pkgs/crypto/merkle/simple_tree.go rename to tm2/pkg/crypto/merkle/simple_tree.go diff --git a/pkgs/crypto/merkle/simple_tree_test.go b/tm2/pkg/crypto/merkle/simple_tree_test.go similarity index 95% rename from pkgs/crypto/merkle/simple_tree_test.go rename to tm2/pkg/crypto/merkle/simple_tree_test.go index 65ff97eafdb..8690bae6ac3 100644 --- a/pkgs/crypto/merkle/simple_tree_test.go +++ b/tm2/pkg/crypto/merkle/simple_tree_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/testutils" ) type testItem []byte diff --git a/pkgs/crypto/merkle/types.go b/tm2/pkg/crypto/merkle/types.go similarity index 96% rename from pkgs/crypto/merkle/types.go rename to tm2/pkg/crypto/merkle/types.go index 3750031b421..b7f404c79ec 100644 --- a/pkgs/crypto/merkle/types.go +++ b/tm2/pkg/crypto/merkle/types.go @@ -3,7 +3,7 @@ package merkle import ( "io" - amino "github.com/gnolang/gno/pkgs/amino" + amino "github.com/gnolang/gno/tm2/pkg/amino" ) // Tree is a Merkle tree interface. diff --git a/pkgs/crypto/mock/mock.go b/tm2/pkg/crypto/mock/mock.go similarity index 94% rename from pkgs/crypto/mock/mock.go rename to tm2/pkg/crypto/mock/mock.go index 12d66daef9b..9ea1c5d66dc 100644 --- a/pkgs/crypto/mock/mock.go +++ b/tm2/pkg/crypto/mock/mock.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/random" ) // ------------------------------------- diff --git a/pkgs/crypto/mock/mock_test.go b/tm2/pkg/crypto/mock/mock_test.go similarity index 86% rename from pkgs/crypto/mock/mock_test.go rename to tm2/pkg/crypto/mock/mock_test.go index 088b11ee7c2..2e5f1d776bd 100644 --- a/pkgs/crypto/mock/mock_test.go +++ b/tm2/pkg/crypto/mock/mock_test.go @@ -3,8 +3,8 @@ package mock_test import ( "testing" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/mock" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/crypto/mock/package.go b/tm2/pkg/crypto/mock/package.go similarity index 70% rename from pkgs/crypto/mock/package.go rename to tm2/pkg/crypto/mock/package.go index b39f22fefc0..a89242a2899 100644 --- a/pkgs/crypto/mock/package.go +++ b/tm2/pkg/crypto/mock/package.go @@ -1,11 +1,11 @@ package mock import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/crypto/mock", + "github.com/gnolang/gno/tm2/pkg/crypto/mock", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/crypto/multisig/bitarray/compact_bit_array.go b/tm2/pkg/crypto/multisig/bitarray/compact_bit_array.go similarity index 100% rename from pkgs/crypto/multisig/bitarray/compact_bit_array.go rename to tm2/pkg/crypto/multisig/bitarray/compact_bit_array.go diff --git a/pkgs/crypto/multisig/bitarray/compact_bit_array_test.go b/tm2/pkg/crypto/multisig/bitarray/compact_bit_array_test.go similarity index 99% rename from pkgs/crypto/multisig/bitarray/compact_bit_array_test.go rename to tm2/pkg/crypto/multisig/bitarray/compact_bit_array_test.go index 2f73d456211..ecbfb64005d 100644 --- a/pkgs/crypto/multisig/bitarray/compact_bit_array_test.go +++ b/tm2/pkg/crypto/multisig/bitarray/compact_bit_array_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/crypto/multisig/multisig.proto b/tm2/pkg/crypto/multisig/multisig.proto similarity index 70% rename from pkgs/crypto/multisig/multisig.proto rename to tm2/pkg/crypto/multisig/multisig.proto index 0bb9700d93f..47667a02f02 100644 --- a/pkgs/crypto/multisig/multisig.proto +++ b/tm2/pkg/crypto/multisig/multisig.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tm; -option go_package = "github.com/gnolang/gno/pkgs/crypto/multisig/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/crypto/multisig/pb"; // imports import "google/protobuf/any.proto"; diff --git a/pkgs/crypto/multisig/multisignature.go b/tm2/pkg/crypto/multisig/multisignature.go similarity index 94% rename from pkgs/crypto/multisig/multisignature.go rename to tm2/pkg/crypto/multisig/multisignature.go index 0e23aa5bf26..c4aaf321a55 100644 --- a/pkgs/crypto/multisig/multisignature.go +++ b/tm2/pkg/crypto/multisig/multisignature.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/multisig/bitarray" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/multisig/bitarray" ) // Multisignature is used to represent the signature object used in the multisigs. diff --git a/pkgs/crypto/multisig/package.go b/tm2/pkg/crypto/multisig/package.go similarity index 68% rename from pkgs/crypto/multisig/package.go rename to tm2/pkg/crypto/multisig/package.go index 1dba2a24807..11659045fac 100644 --- a/pkgs/crypto/multisig/package.go +++ b/tm2/pkg/crypto/multisig/package.go @@ -1,11 +1,11 @@ package multisig import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/crypto/multisig", + "github.com/gnolang/gno/tm2/pkg/crypto/multisig", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/crypto/multisig/threshold_pubkey.go b/tm2/pkg/crypto/multisig/threshold_pubkey.go similarity index 97% rename from pkgs/crypto/multisig/threshold_pubkey.go rename to tm2/pkg/crypto/multisig/threshold_pubkey.go index 913d388081f..1001b2012ff 100644 --- a/pkgs/crypto/multisig/threshold_pubkey.go +++ b/tm2/pkg/crypto/multisig/threshold_pubkey.go @@ -1,8 +1,8 @@ package multisig import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // PubKeyMultisigThreshold implements a K of N threshold multisig. diff --git a/pkgs/crypto/multisig/threshold_pubkey_test.go b/tm2/pkg/crypto/multisig/threshold_pubkey_test.go similarity index 96% rename from pkgs/crypto/multisig/threshold_pubkey_test.go rename to tm2/pkg/crypto/multisig/threshold_pubkey_test.go index 01711ee48bd..9195344f423 100644 --- a/pkgs/crypto/multisig/threshold_pubkey_test.go +++ b/tm2/pkg/crypto/multisig/threshold_pubkey_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" ) // This tests multisig functionality, but it expects the first k signatures to be valid diff --git a/pkgs/crypto/random.go b/tm2/pkg/crypto/random.go similarity index 100% rename from pkgs/crypto/random.go rename to tm2/pkg/crypto/random.go diff --git a/pkgs/crypto/random_test.go b/tm2/pkg/crypto/random_test.go similarity index 92% rename from pkgs/crypto/random_test.go rename to tm2/pkg/crypto/random_test.go index d31b24cc4c4..aab505cb61c 100644 --- a/pkgs/crypto/random_test.go +++ b/tm2/pkg/crypto/random_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // the purpose of this test is primarily to ensure that the randomness diff --git a/pkgs/crypto/secp256k1/bench_test.go b/tm2/pkg/crypto/secp256k1/bench_test.go similarity index 81% rename from pkgs/crypto/secp256k1/bench_test.go rename to tm2/pkg/crypto/secp256k1/bench_test.go index 6fa10f3407f..0daf4d34f10 100644 --- a/pkgs/crypto/secp256k1/bench_test.go +++ b/tm2/pkg/crypto/secp256k1/bench_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/internal/benchmarking" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/.gitignore b/tm2/pkg/crypto/secp256k1/internal/secp256k1/.gitignore similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/.gitignore rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/.gitignore diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/LICENSE b/tm2/pkg/crypto/secp256k1/internal/secp256k1/LICENSE similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/LICENSE rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/LICENSE diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/README.md b/tm2/pkg/crypto/secp256k1/internal/secp256k1/README.md similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/README.md rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/README.md diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/curve.go b/tm2/pkg/crypto/secp256k1/internal/secp256k1/curve.go similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/curve.go rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/curve.go diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/ext.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/ext.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/ext.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/ext.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/.gitignore b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/.gitignore similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/.gitignore rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/.gitignore diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/.travis.yml b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/.travis.yml similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/.travis.yml rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/.travis.yml diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/COPYING b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/COPYING similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/COPYING rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/COPYING diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/Makefile.am b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/Makefile.am similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/Makefile.am rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/Makefile.am diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/README.md b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/README.md similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/README.md rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/README.md diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/TODO b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/TODO similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/TODO rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/TODO diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/autogen.sh b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/autogen.sh similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/autogen.sh rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/autogen.sh diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_jni_include_dir.m4 b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_jni_include_dir.m4 similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_jni_include_dir.m4 rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_jni_include_dir.m4 diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_prog_cc_for_build.m4 b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_prog_cc_for_build.m4 similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_prog_cc_for_build.m4 rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/ax_prog_cc_for_build.m4 diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/bitcoin_secp.m4 b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/bitcoin_secp.m4 similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/bitcoin_secp.m4 rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/build-aux/m4/bitcoin_secp.m4 diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/configure.ac b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/configure.ac similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/configure.ac rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/configure.ac diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_parsing.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/contrib/lax_der_privatekey_parsing.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_ecdh.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_ecdh.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_ecdh.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_ecdh.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_recovery.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_recovery.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_recovery.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/include/secp256k1_recovery.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/libsecp256k1.pc.in b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/libsecp256k1.pc.in similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/libsecp256k1.pc.in rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/libsecp256k1.pc.in diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/obj/.gitignore b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/obj/.gitignore similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/obj/.gitignore rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/obj/.gitignore diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/group_prover.sage b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/group_prover.sage similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/group_prover.sage rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/group_prover.sage diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/secp256k1.sage b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/secp256k1.sage similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/secp256k1.sage rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/secp256k1.sage diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/weierstrass_prover.sage b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/weierstrass_prover.sage similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/weierstrass_prover.sage rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/sage/weierstrass_prover.sage diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/asm/field_10x26_arm.s b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/asm/field_10x26_arm.s similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/asm/field_10x26_arm.s rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/asm/field_10x26_arm.s diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/basic-config.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/basic-config.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/basic-config.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/basic-config.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_ecdh.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_ecdh.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_ecdh.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_ecdh.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_internal.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_internal.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_internal.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_internal.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_recover.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_recover.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_recover.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_recover.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_schnorr_verify.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_schnorr_verify.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_schnorr_verify.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_schnorr_verify.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_sign.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_sign.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_sign.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_sign.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_verify.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_verify.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_verify.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/bench_verify.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecdsa_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/eckey_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_const_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_gen_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/ecmult_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_10x26_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_asm_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_asm_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_asm_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_asm_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_int128_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_int128_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_int128_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_5x52_int128_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/field_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/gen_context.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/gen_context.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/gen_context.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/gen_context.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/group_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/hash_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1.java b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1.java similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1.java rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1.java diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Test.java b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Test.java similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Test.java rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Test.java diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Util.java b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Util.java similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Util.java rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/NativeSecp256k1Util.java diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/Secp256k1Context.java b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/Secp256k1Context.java similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/Secp256k1Context.java rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org/bitcoin/Secp256k1Context.java diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_NativeSecp256k1.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/java/org_bitcoin_Secp256k1Context.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/Makefile.am.include b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/Makefile.am.include similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/Makefile.am.include rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/Makefile.am.include diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/main_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/main_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/main_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/main_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/tests_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/tests_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/tests_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/ecdh/tests_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/Makefile.am.include b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/Makefile.am.include similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/Makefile.am.include rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/Makefile.am.include diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/main_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/main_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/main_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/main_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/tests_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/tests_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/tests_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/modules/recovery/tests_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_gmp_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/num_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_4x64_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_8x32_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/scalar_low_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/secp256k1.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/secp256k1.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/secp256k1.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/secp256k1.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand_impl.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand_impl.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand_impl.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/testrand_impl.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests_exhaustive.c b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests_exhaustive.c similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests_exhaustive.c rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/tests_exhaustive.c diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/util.h b/tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/util.h similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/util.h rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/libsecp256k1/src/util.h diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/panic_cb.go b/tm2/pkg/crypto/secp256k1/internal/secp256k1/panic_cb.go similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/panic_cb.go rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/panic_cb.go diff --git a/pkgs/crypto/secp256k1/internal/secp256k1/secp256.go b/tm2/pkg/crypto/secp256k1/internal/secp256k1/secp256.go similarity index 100% rename from pkgs/crypto/secp256k1/internal/secp256k1/secp256.go rename to tm2/pkg/crypto/secp256k1/internal/secp256k1/secp256.go diff --git a/pkgs/crypto/secp256k1/package.go b/tm2/pkg/crypto/secp256k1/package.go similarity index 71% rename from pkgs/crypto/secp256k1/package.go rename to tm2/pkg/crypto/secp256k1/package.go index 4c916cf7f5a..895d7f4d258 100644 --- a/pkgs/crypto/secp256k1/package.go +++ b/tm2/pkg/crypto/secp256k1/package.go @@ -1,11 +1,11 @@ package secp256k1 import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/crypto/secp256k1", + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1", "tm", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/crypto/secp256k1/secp256k1.go b/tm2/pkg/crypto/secp256k1/secp256k1.go similarity index 98% rename from pkgs/crypto/secp256k1/secp256k1.go rename to tm2/pkg/crypto/secp256k1/secp256k1.go index 9d3495364d9..32af38bcdd9 100644 --- a/pkgs/crypto/secp256k1/secp256k1.go +++ b/tm2/pkg/crypto/secp256k1/secp256k1.go @@ -10,8 +10,8 @@ import ( "golang.org/x/crypto/ripemd160" secp256k1 "github.com/btcsuite/btcd/btcec" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" ) //------------------------------------- diff --git a/pkgs/crypto/secp256k1/secp256k1_cgo.go b/tm2/pkg/crypto/secp256k1/secp256k1_cgo.go similarity index 83% rename from pkgs/crypto/secp256k1/secp256k1_cgo.go rename to tm2/pkg/crypto/secp256k1/secp256k1_cgo.go index c2ae2bc2a50..c5c726e195a 100644 --- a/pkgs/crypto/secp256k1/secp256k1_cgo.go +++ b/tm2/pkg/crypto/secp256k1/secp256k1_cgo.go @@ -4,8 +4,8 @@ package secp256k1 import ( - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/secp256k1/internal/secp256k1" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1/internal/secp256k1" ) // Sign creates an ECDSA signature on curve Secp256k1, using SHA256 on the msg. diff --git a/pkgs/crypto/secp256k1/secp256k1_cgo_test.go b/tm2/pkg/crypto/secp256k1/secp256k1_cgo_test.go similarity index 100% rename from pkgs/crypto/secp256k1/secp256k1_cgo_test.go rename to tm2/pkg/crypto/secp256k1/secp256k1_cgo_test.go diff --git a/pkgs/crypto/secp256k1/secp256k1_internal_test.go b/tm2/pkg/crypto/secp256k1/secp256k1_internal_test.go similarity index 100% rename from pkgs/crypto/secp256k1/secp256k1_internal_test.go rename to tm2/pkg/crypto/secp256k1/secp256k1_internal_test.go diff --git a/pkgs/crypto/secp256k1/secp256k1_nocgo.go b/tm2/pkg/crypto/secp256k1/secp256k1_nocgo.go similarity index 98% rename from pkgs/crypto/secp256k1/secp256k1_nocgo.go rename to tm2/pkg/crypto/secp256k1/secp256k1_nocgo.go index e28dfc152a1..17a7acb2019 100644 --- a/pkgs/crypto/secp256k1/secp256k1_nocgo.go +++ b/tm2/pkg/crypto/secp256k1/secp256k1_nocgo.go @@ -8,7 +8,7 @@ import ( secp256k1 "github.com/btcsuite/btcd/btcec" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // used to reject malleable signatures diff --git a/pkgs/crypto/secp256k1/secp256k1_nocgo_test.go b/tm2/pkg/crypto/secp256k1/secp256k1_nocgo_test.go similarity index 100% rename from pkgs/crypto/secp256k1/secp256k1_nocgo_test.go rename to tm2/pkg/crypto/secp256k1/secp256k1_nocgo_test.go diff --git a/pkgs/crypto/secp256k1/secp256k1_test.go b/tm2/pkg/crypto/secp256k1/secp256k1_test.go similarity index 97% rename from pkgs/crypto/secp256k1/secp256k1_test.go rename to tm2/pkg/crypto/secp256k1/secp256k1_test.go index 09570be531d..86aa058f95a 100644 --- a/pkgs/crypto/secp256k1/secp256k1_test.go +++ b/tm2/pkg/crypto/secp256k1/secp256k1_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" underlyingSecp256k1 "github.com/btcsuite/btcd/btcec" ) diff --git a/pkgs/crypto/tmhash/hash.go b/tm2/pkg/crypto/tmhash/hash.go similarity index 100% rename from pkgs/crypto/tmhash/hash.go rename to tm2/pkg/crypto/tmhash/hash.go diff --git a/pkgs/crypto/tmhash/hash_test.go b/tm2/pkg/crypto/tmhash/hash_test.go similarity index 93% rename from pkgs/crypto/tmhash/hash_test.go rename to tm2/pkg/crypto/tmhash/hash_test.go index 358c6e7d2ca..4a129bb86ac 100644 --- a/pkgs/crypto/tmhash/hash_test.go +++ b/tm2/pkg/crypto/tmhash/hash_test.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "testing" - "github.com/gnolang/gno/pkgs/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/crypto/util.go b/tm2/pkg/crypto/util.go similarity index 100% rename from pkgs/crypto/util.go rename to tm2/pkg/crypto/util.go diff --git a/pkgs/crypto/version.go b/tm2/pkg/crypto/version.go similarity index 100% rename from pkgs/crypto/version.go rename to tm2/pkg/crypto/version.go diff --git a/pkgs/crypto/xchacha20poly1305/vector_test.go b/tm2/pkg/crypto/xchacha20poly1305/vector_test.go similarity index 100% rename from pkgs/crypto/xchacha20poly1305/vector_test.go rename to tm2/pkg/crypto/xchacha20poly1305/vector_test.go diff --git a/pkgs/crypto/xchacha20poly1305/xchachapoly.go b/tm2/pkg/crypto/xchacha20poly1305/xchachapoly.go similarity index 100% rename from pkgs/crypto/xchacha20poly1305/xchachapoly.go rename to tm2/pkg/crypto/xchacha20poly1305/xchachapoly.go diff --git a/pkgs/crypto/xchacha20poly1305/xchachapoly_test.go b/tm2/pkg/crypto/xchacha20poly1305/xchachapoly_test.go similarity index 100% rename from pkgs/crypto/xchacha20poly1305/xchachapoly_test.go rename to tm2/pkg/crypto/xchacha20poly1305/xchachapoly_test.go diff --git a/pkgs/crypto/xsalsa20symmetric/symmetric.go b/tm2/pkg/crypto/xsalsa20symmetric/symmetric.go similarity index 97% rename from pkgs/crypto/xsalsa20symmetric/symmetric.go rename to tm2/pkg/crypto/xsalsa20symmetric/symmetric.go index 4ab46646f36..bc693c378ee 100644 --- a/pkgs/crypto/xsalsa20symmetric/symmetric.go +++ b/tm2/pkg/crypto/xsalsa20symmetric/symmetric.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/nacl/secretbox" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // TODO, make this into a struct that implements crypto.Symmetric. diff --git a/pkgs/crypto/xsalsa20symmetric/symmetric_test.go b/tm2/pkg/crypto/xsalsa20symmetric/symmetric_test.go similarity index 90% rename from pkgs/crypto/xsalsa20symmetric/symmetric_test.go rename to tm2/pkg/crypto/xsalsa20symmetric/symmetric_test.go index a1a4d052ffd..dea965a4356 100644 --- a/pkgs/crypto/xsalsa20symmetric/symmetric_test.go +++ b/tm2/pkg/crypto/xsalsa20symmetric/symmetric_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/bcrypt" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/bcrypt" ) func TestSimple(t *testing.T) { diff --git a/pkgs/db/LICENSE b/tm2/pkg/db/LICENSE similarity index 100% rename from pkgs/db/LICENSE rename to tm2/pkg/db/LICENSE diff --git a/pkgs/db/README.md b/tm2/pkg/db/README.md similarity index 100% rename from pkgs/db/README.md rename to tm2/pkg/db/README.md diff --git a/pkgs/db/backend_test.go b/tm2/pkg/db/backend_test.go similarity index 100% rename from pkgs/db/backend_test.go rename to tm2/pkg/db/backend_test.go diff --git a/pkgs/db/badger_db.go b/tm2/pkg/db/badger_db.go similarity index 100% rename from pkgs/db/badger_db.go rename to tm2/pkg/db/badger_db.go diff --git a/pkgs/db/boltdb.go b/tm2/pkg/db/boltdb.go similarity index 100% rename from pkgs/db/boltdb.go rename to tm2/pkg/db/boltdb.go diff --git a/pkgs/db/boltdb_test.go b/tm2/pkg/db/boltdb_test.go similarity index 100% rename from pkgs/db/boltdb_test.go rename to tm2/pkg/db/boltdb_test.go diff --git a/pkgs/db/c_level_db.go b/tm2/pkg/db/c_level_db.go similarity index 100% rename from pkgs/db/c_level_db.go rename to tm2/pkg/db/c_level_db.go diff --git a/pkgs/db/c_level_db_test.go b/tm2/pkg/db/c_level_db_test.go similarity index 100% rename from pkgs/db/c_level_db_test.go rename to tm2/pkg/db/c_level_db_test.go diff --git a/pkgs/db/common_test.go b/tm2/pkg/db/common_test.go similarity index 100% rename from pkgs/db/common_test.go rename to tm2/pkg/db/common_test.go diff --git a/pkgs/db/db.go b/tm2/pkg/db/db.go similarity index 100% rename from pkgs/db/db.go rename to tm2/pkg/db/db.go diff --git a/pkgs/db/db_test.go b/tm2/pkg/db/db_test.go similarity index 100% rename from pkgs/db/db_test.go rename to tm2/pkg/db/db_test.go diff --git a/pkgs/db/fsdb.go b/tm2/pkg/db/fsdb.go similarity index 99% rename from pkgs/db/fsdb.go rename to tm2/pkg/db/fsdb.go index e50fa384e9e..aa8cea83889 100644 --- a/pkgs/db/fsdb.go +++ b/tm2/pkg/db/fsdb.go @@ -9,7 +9,7 @@ import ( "sort" "sync" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ( diff --git a/pkgs/db/go_level_db.go b/tm2/pkg/db/go_level_db.go similarity index 100% rename from pkgs/db/go_level_db.go rename to tm2/pkg/db/go_level_db.go diff --git a/pkgs/db/go_level_db_test.go b/tm2/pkg/db/go_level_db_test.go similarity index 100% rename from pkgs/db/go_level_db_test.go rename to tm2/pkg/db/go_level_db_test.go diff --git a/pkgs/db/gorocks_db.go b/tm2/pkg/db/gorocks_db.go similarity index 100% rename from pkgs/db/gorocks_db.go rename to tm2/pkg/db/gorocks_db.go diff --git a/pkgs/db/gorocks_db_test.go b/tm2/pkg/db/gorocks_db_test.go similarity index 100% rename from pkgs/db/gorocks_db_test.go rename to tm2/pkg/db/gorocks_db_test.go diff --git a/pkgs/db/grocks_db.go b/tm2/pkg/db/grocks_db.go similarity index 100% rename from pkgs/db/grocks_db.go rename to tm2/pkg/db/grocks_db.go diff --git a/pkgs/db/grocks_db_test.go b/tm2/pkg/db/grocks_db_test.go similarity index 100% rename from pkgs/db/grocks_db_test.go rename to tm2/pkg/db/grocks_db_test.go diff --git a/pkgs/db/immutable.go b/tm2/pkg/db/immutable.go similarity index 100% rename from pkgs/db/immutable.go rename to tm2/pkg/db/immutable.go diff --git a/pkgs/db/mem_batch.go b/tm2/pkg/db/mem_batch.go similarity index 100% rename from pkgs/db/mem_batch.go rename to tm2/pkg/db/mem_batch.go diff --git a/pkgs/db/mem_db.go b/tm2/pkg/db/mem_db.go similarity index 99% rename from pkgs/db/mem_db.go rename to tm2/pkg/db/mem_db.go index 3a53947d189..3d5aad71ea2 100644 --- a/pkgs/db/mem_db.go +++ b/tm2/pkg/db/mem_db.go @@ -5,7 +5,7 @@ import ( "sort" "sync" - "github.com/gnolang/gno/pkgs/strings" + "github.com/gnolang/gno/tm2/pkg/strings" ) func init() { diff --git a/pkgs/db/prefix_db.go b/tm2/pkg/db/prefix_db.go similarity index 100% rename from pkgs/db/prefix_db.go rename to tm2/pkg/db/prefix_db.go diff --git a/pkgs/db/prefix_db_test.go b/tm2/pkg/db/prefix_db_test.go similarity index 100% rename from pkgs/db/prefix_db_test.go rename to tm2/pkg/db/prefix_db_test.go diff --git a/pkgs/db/test_helpers.go b/tm2/pkg/db/test_helpers.go similarity index 100% rename from pkgs/db/test_helpers.go rename to tm2/pkg/db/test_helpers.go diff --git a/pkgs/db/types.go b/tm2/pkg/db/types.go similarity index 100% rename from pkgs/db/types.go rename to tm2/pkg/db/types.go diff --git a/pkgs/db/util.go b/tm2/pkg/db/util.go similarity index 100% rename from pkgs/db/util.go rename to tm2/pkg/db/util.go diff --git a/pkgs/db/util_test.go b/tm2/pkg/db/util_test.go similarity index 100% rename from pkgs/db/util_test.go rename to tm2/pkg/db/util_test.go diff --git a/pkgs/errors/LICENSE b/tm2/pkg/errors/LICENSE similarity index 100% rename from pkgs/errors/LICENSE rename to tm2/pkg/errors/LICENSE diff --git a/pkgs/errors/errors.go b/tm2/pkg/errors/errors.go similarity index 100% rename from pkgs/errors/errors.go rename to tm2/pkg/errors/errors.go diff --git a/pkgs/errors/errors_test.go b/tm2/pkg/errors/errors_test.go similarity index 100% rename from pkgs/errors/errors_test.go rename to tm2/pkg/errors/errors_test.go diff --git a/pkgs/events/events.go b/tm2/pkg/events/events.go similarity index 98% rename from pkgs/events/events.go rename to tm2/pkg/events/events.go index 3cb7942fd2b..a7f730454f7 100644 --- a/pkgs/events/events.go +++ b/tm2/pkg/events/events.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/service" ) // All implementors must be amino-encodable. diff --git a/pkgs/events/events_test.go b/tm2/pkg/events/events_test.go similarity index 99% rename from pkgs/events/events_test.go rename to tm2/pkg/events/events_test.go index 9d5997c1989..f3b4aa2fd82 100644 --- a/pkgs/events/events_test.go +++ b/tm2/pkg/events/events_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" ) // TestAddListenerFireOnce sets up an EventSwitch, subscribes a single diff --git a/pkgs/events/store.go b/tm2/pkg/events/store.go similarity index 93% rename from pkgs/events/store.go rename to tm2/pkg/events/store.go index 9dda4fc3dbc..bea4626394e 100644 --- a/pkgs/events/store.go +++ b/tm2/pkg/events/store.go @@ -3,7 +3,7 @@ package events import ( "fmt" - auto "github.com/gnolang/gno/pkgs/autofile" + auto "github.com/gnolang/gno/tm2/pkg/autofile" ) // StoreStream stores events to disk but is also listenaable. diff --git a/pkgs/events/subscribe.go b/tm2/pkg/events/subscribe.go similarity index 100% rename from pkgs/events/subscribe.go rename to tm2/pkg/events/subscribe.go diff --git a/pkgs/flow/LICENSE.md b/tm2/pkg/flow/LICENSE.md similarity index 100% rename from pkgs/flow/LICENSE.md rename to tm2/pkg/flow/LICENSE.md diff --git a/pkgs/flow/README.md b/tm2/pkg/flow/README.md similarity index 100% rename from pkgs/flow/README.md rename to tm2/pkg/flow/README.md diff --git a/pkgs/flow/flowrate.go b/tm2/pkg/flow/flowrate.go similarity index 100% rename from pkgs/flow/flowrate.go rename to tm2/pkg/flow/flowrate.go diff --git a/pkgs/flow/io.go b/tm2/pkg/flow/io.go similarity index 100% rename from pkgs/flow/io.go rename to tm2/pkg/flow/io.go diff --git a/pkgs/flow/io_test.go b/tm2/pkg/flow/io_test.go similarity index 100% rename from pkgs/flow/io_test.go rename to tm2/pkg/flow/io_test.go diff --git a/pkgs/flow/util.go b/tm2/pkg/flow/util.go similarity index 100% rename from pkgs/flow/util.go rename to tm2/pkg/flow/util.go diff --git a/pkgs/iavl/.gitignore b/tm2/pkg/iavl/.gitignore similarity index 100% rename from pkgs/iavl/.gitignore rename to tm2/pkg/iavl/.gitignore diff --git a/pkgs/iavl/CHANGELOG.md b/tm2/pkg/iavl/CHANGELOG.md similarity index 100% rename from pkgs/iavl/CHANGELOG.md rename to tm2/pkg/iavl/CHANGELOG.md diff --git a/pkgs/iavl/CHANGELOG_PENDING.md b/tm2/pkg/iavl/CHANGELOG_PENDING.md similarity index 100% rename from pkgs/iavl/CHANGELOG_PENDING.md rename to tm2/pkg/iavl/CHANGELOG_PENDING.md diff --git a/pkgs/iavl/CONTRIBUTING.md b/tm2/pkg/iavl/CONTRIBUTING.md similarity index 100% rename from pkgs/iavl/CONTRIBUTING.md rename to tm2/pkg/iavl/CONTRIBUTING.md diff --git a/pkgs/iavl/LICENSE b/tm2/pkg/iavl/LICENSE similarity index 100% rename from pkgs/iavl/LICENSE rename to tm2/pkg/iavl/LICENSE diff --git a/pkgs/iavl/Makefile b/tm2/pkg/iavl/Makefile similarity index 100% rename from pkgs/iavl/Makefile rename to tm2/pkg/iavl/Makefile diff --git a/pkgs/iavl/PERFORMANCE.md b/tm2/pkg/iavl/PERFORMANCE.md similarity index 100% rename from pkgs/iavl/PERFORMANCE.md rename to tm2/pkg/iavl/PERFORMANCE.md diff --git a/pkgs/iavl/POEM b/tm2/pkg/iavl/POEM similarity index 100% rename from pkgs/iavl/POEM rename to tm2/pkg/iavl/POEM diff --git a/pkgs/iavl/README.md b/tm2/pkg/iavl/README.md similarity index 100% rename from pkgs/iavl/README.md rename to tm2/pkg/iavl/README.md diff --git a/pkgs/iavl/basic_test.go b/tm2/pkg/iavl/basic_test.go similarity index 99% rename from pkgs/iavl/basic_test.go rename to tm2/pkg/iavl/basic_test.go index 59517f74961..452c7e4235a 100644 --- a/pkgs/iavl/basic_test.go +++ b/tm2/pkg/iavl/basic_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/db" + "github.com/gnolang/gno/tm2/pkg/db" ) func TestBasic(t *testing.T) { diff --git a/pkgs/iavl/benchmarks/README.md b/tm2/pkg/iavl/benchmarks/README.md similarity index 100% rename from pkgs/iavl/benchmarks/README.md rename to tm2/pkg/iavl/benchmarks/README.md diff --git a/pkgs/iavl/benchmarks/bench_test.go b/tm2/pkg/iavl/benchmarks/bench_test.go similarity index 98% rename from pkgs/iavl/benchmarks/bench_test.go rename to tm2/pkg/iavl/benchmarks/bench_test.go index b20e8623be6..d0cd878abe9 100644 --- a/pkgs/iavl/benchmarks/bench_test.go +++ b/tm2/pkg/iavl/benchmarks/bench_test.go @@ -7,8 +7,8 @@ import ( "runtime" "testing" - "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/iavl" + "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/iavl" ) const historySize = 20 diff --git a/pkgs/iavl/benchmarks/hash_test.go b/tm2/pkg/iavl/benchmarks/hash_test.go similarity index 100% rename from pkgs/iavl/benchmarks/hash_test.go rename to tm2/pkg/iavl/benchmarks/hash_test.go diff --git a/pkgs/iavl/benchmarks/results/Ethans-MBP-2717167.txt b/tm2/pkg/iavl/benchmarks/results/Ethans-MBP-2717167.txt similarity index 100% rename from pkgs/iavl/benchmarks/results/Ethans-MBP-2717167.txt rename to tm2/pkg/iavl/benchmarks/results/Ethans-MBP-2717167.txt diff --git a/pkgs/iavl/benchmarks/results/aws-c4-large-f6f41ca.txt b/tm2/pkg/iavl/benchmarks/results/aws-c4-large-f6f41ca.txt similarity index 100% rename from pkgs/iavl/benchmarks/results/aws-c4-large-f6f41ca.txt rename to tm2/pkg/iavl/benchmarks/results/aws-c4-large-f6f41ca.txt diff --git a/pkgs/iavl/benchmarks/results/digital-ocean-2gb-2717167.txt b/tm2/pkg/iavl/benchmarks/results/digital-ocean-2gb-2717167.txt similarity index 100% rename from pkgs/iavl/benchmarks/results/digital-ocean-2gb-2717167.txt rename to tm2/pkg/iavl/benchmarks/results/digital-ocean-2gb-2717167.txt diff --git a/pkgs/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-8f19f23.txt b/tm2/pkg/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-8f19f23.txt similarity index 100% rename from pkgs/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-8f19f23.txt rename to tm2/pkg/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-8f19f23.txt diff --git a/pkgs/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-c1f6d4e.txt b/tm2/pkg/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-c1f6d4e.txt similarity index 100% rename from pkgs/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-c1f6d4e.txt rename to tm2/pkg/iavl/benchmarks/results/digital-ocean-64gb-fullbench-memory-c1f6d4e.txt diff --git a/pkgs/iavl/benchmarks/setup/INSTALL_ROOT.sh b/tm2/pkg/iavl/benchmarks/setup/INSTALL_ROOT.sh similarity index 100% rename from pkgs/iavl/benchmarks/setup/INSTALL_ROOT.sh rename to tm2/pkg/iavl/benchmarks/setup/INSTALL_ROOT.sh diff --git a/pkgs/iavl/benchmarks/setup/RUN_BENCHMARKS.sh b/tm2/pkg/iavl/benchmarks/setup/RUN_BENCHMARKS.sh similarity index 100% rename from pkgs/iavl/benchmarks/setup/RUN_BENCHMARKS.sh rename to tm2/pkg/iavl/benchmarks/setup/RUN_BENCHMARKS.sh diff --git a/pkgs/iavl/cmd/iaviewer/README.md b/tm2/pkg/iavl/cmd/iaviewer/README.md similarity index 100% rename from pkgs/iavl/cmd/iaviewer/README.md rename to tm2/pkg/iavl/cmd/iaviewer/README.md diff --git a/pkgs/iavl/cmd/iaviewer/main.go b/tm2/pkg/iavl/cmd/iaviewer/main.go similarity index 97% rename from pkgs/iavl/cmd/iaviewer/main.go rename to tm2/pkg/iavl/cmd/iaviewer/main.go index c2372165f3a..37dca9f74a1 100644 --- a/pkgs/iavl/cmd/iaviewer/main.go +++ b/tm2/pkg/iavl/cmd/iaviewer/main.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/iavl" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/iavl" ) // TODO: make this configurable? diff --git a/pkgs/iavl/common/mutate.go b/tm2/pkg/iavl/common/mutate.go similarity index 100% rename from pkgs/iavl/common/mutate.go rename to tm2/pkg/iavl/common/mutate.go diff --git a/pkgs/iavl/common/random.go b/tm2/pkg/iavl/common/random.go similarity index 100% rename from pkgs/iavl/common/random.go rename to tm2/pkg/iavl/common/random.go diff --git a/pkgs/iavl/common/random_test.go b/tm2/pkg/iavl/common/random_test.go similarity index 100% rename from pkgs/iavl/common/random_test.go rename to tm2/pkg/iavl/common/random_test.go diff --git a/pkgs/iavl/doc.go b/tm2/pkg/iavl/doc.go similarity index 100% rename from pkgs/iavl/doc.go rename to tm2/pkg/iavl/doc.go diff --git a/pkgs/iavl/immutable_tree.go b/tm2/pkg/iavl/immutable_tree.go similarity index 99% rename from pkgs/iavl/immutable_tree.go rename to tm2/pkg/iavl/immutable_tree.go index e21a3cd3929..a4e2884e960 100644 --- a/pkgs/iavl/immutable_tree.go +++ b/tm2/pkg/iavl/immutable_tree.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - dbm "github.com/gnolang/gno/pkgs/db" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) // ImmutableTree is a container for an immutable AVL+ ImmutableTree. Changes are performed by diff --git a/pkgs/iavl/key_format.go b/tm2/pkg/iavl/key_format.go similarity index 100% rename from pkgs/iavl/key_format.go rename to tm2/pkg/iavl/key_format.go diff --git a/pkgs/iavl/key_format_test.go b/tm2/pkg/iavl/key_format_test.go similarity index 100% rename from pkgs/iavl/key_format_test.go rename to tm2/pkg/iavl/key_format_test.go diff --git a/pkgs/iavl/logger.go b/tm2/pkg/iavl/logger.go similarity index 100% rename from pkgs/iavl/logger.go rename to tm2/pkg/iavl/logger.go diff --git a/pkgs/iavl/mutable_tree.go b/tm2/pkg/iavl/mutable_tree.go similarity index 99% rename from pkgs/iavl/mutable_tree.go rename to tm2/pkg/iavl/mutable_tree.go index 5e6e4e08d1d..82f5f2d2f7f 100644 --- a/pkgs/iavl/mutable_tree.go +++ b/tm2/pkg/iavl/mutable_tree.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" ) // ErrVersionDoesNotExist is returned if a requested version does not exist. diff --git a/pkgs/iavl/node.go b/tm2/pkg/iavl/node.go similarity index 98% rename from pkgs/iavl/node.go rename to tm2/pkg/iavl/node.go index 6583c8471bf..f2a944afc6a 100644 --- a/pkgs/iavl/node.go +++ b/tm2/pkg/iavl/node.go @@ -8,9 +8,9 @@ import ( "fmt" "io" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/errors" ) // Node represents a node in a Tree. diff --git a/pkgs/iavl/nodedb.go b/tm2/pkg/iavl/nodedb.go similarity index 99% rename from pkgs/iavl/nodedb.go rename to tm2/pkg/iavl/nodedb.go index 52e97bd326f..4c8e41a30b0 100644 --- a/pkgs/iavl/nodedb.go +++ b/tm2/pkg/iavl/nodedb.go @@ -7,8 +7,8 @@ import ( "sort" "sync" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - dbm "github.com/gnolang/gno/pkgs/db" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + dbm "github.com/gnolang/gno/tm2/pkg/db" ) const ( diff --git a/pkgs/iavl/nodedb_test.go b/tm2/pkg/iavl/nodedb_test.go similarity index 100% rename from pkgs/iavl/nodedb_test.go rename to tm2/pkg/iavl/nodedb_test.go diff --git a/pkgs/iavl/proof.go b/tm2/pkg/iavl/proof.go similarity index 97% rename from pkgs/iavl/proof.go rename to tm2/pkg/iavl/proof.go index ec09b66580f..47568361da8 100644 --- a/pkgs/iavl/proof.go +++ b/tm2/pkg/iavl/proof.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/errors" ) var ( diff --git a/pkgs/iavl/proof_iavl_absence.go b/tm2/pkg/iavl/proof_iavl_absence.go similarity index 96% rename from pkgs/iavl/proof_iavl_absence.go rename to tm2/pkg/iavl/proof_iavl_absence.go index fa5e01f2346..ad07f7f1a66 100644 --- a/pkgs/iavl/proof_iavl_absence.go +++ b/tm2/pkg/iavl/proof_iavl_absence.go @@ -3,8 +3,8 @@ package iavl import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ProofOpIAVLAbsence = "iavl:a" diff --git a/pkgs/iavl/proof_iavl_value.go b/tm2/pkg/iavl/proof_iavl_value.go similarity index 95% rename from pkgs/iavl/proof_iavl_value.go rename to tm2/pkg/iavl/proof_iavl_value.go index 0a7eee1a578..46d2fc1b751 100644 --- a/pkgs/iavl/proof_iavl_value.go +++ b/tm2/pkg/iavl/proof_iavl_value.go @@ -3,8 +3,8 @@ package iavl import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/errors" ) const ProofOpIAVLValue = "iavl:v" diff --git a/pkgs/iavl/proof_path.go b/tm2/pkg/iavl/proof_path.go similarity index 98% rename from pkgs/iavl/proof_path.go rename to tm2/pkg/iavl/proof_path.go index 15f68e3b75f..f66fcf3c48c 100644 --- a/pkgs/iavl/proof_path.go +++ b/tm2/pkg/iavl/proof_path.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // pathWithLeaf is a path to a leaf node and the leaf node itself. diff --git a/pkgs/iavl/proof_range.go b/tm2/pkg/iavl/proof_range.go similarity index 99% rename from pkgs/iavl/proof_range.go rename to tm2/pkg/iavl/proof_range.go index 75a00fbd65a..799fb65cebb 100644 --- a/pkgs/iavl/proof_range.go +++ b/tm2/pkg/iavl/proof_range.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + "github.com/gnolang/gno/tm2/pkg/errors" ) type RangeProof struct { diff --git a/pkgs/iavl/proof_test.go b/tm2/pkg/iavl/proof_test.go similarity index 97% rename from pkgs/iavl/proof_test.go rename to tm2/pkg/iavl/proof_test.go index ec837a4701c..87f3329bb80 100644 --- a/pkgs/iavl/proof_test.go +++ b/tm2/pkg/iavl/proof_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/testutils" ) func TestTreeGetWithProof(t *testing.T) { diff --git a/pkgs/iavl/testutils_test.go b/tm2/pkg/iavl/testutils_test.go similarity index 95% rename from pkgs/iavl/testutils_test.go rename to tm2/pkg/iavl/testutils_test.go index 929162808ed..d46cbe66bf4 100644 --- a/pkgs/iavl/testutils_test.go +++ b/tm2/pkg/iavl/testutils_test.go @@ -8,9 +8,9 @@ import ( mrand "math/rand" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/random" ) func randstr(length int) string { diff --git a/pkgs/iavl/tree_dotgraph.go b/tm2/pkg/iavl/tree_dotgraph.go similarity index 100% rename from pkgs/iavl/tree_dotgraph.go rename to tm2/pkg/iavl/tree_dotgraph.go diff --git a/pkgs/iavl/tree_dotgraph_test.go b/tm2/pkg/iavl/tree_dotgraph_test.go similarity index 89% rename from pkgs/iavl/tree_dotgraph_test.go rename to tm2/pkg/iavl/tree_dotgraph_test.go index f57a7209b9b..29be03ca241 100644 --- a/pkgs/iavl/tree_dotgraph_test.go +++ b/tm2/pkg/iavl/tree_dotgraph_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "testing" - db "github.com/gnolang/gno/pkgs/db" + db "github.com/gnolang/gno/tm2/pkg/db" ) func TestWriteDOTGraph(t *testing.T) { diff --git a/pkgs/iavl/tree_fuzz_test.go b/tm2/pkg/iavl/tree_fuzz_test.go similarity index 97% rename from pkgs/iavl/tree_fuzz_test.go rename to tm2/pkg/iavl/tree_fuzz_test.go index 4b43493524a..7ea9bb50389 100644 --- a/pkgs/iavl/tree_fuzz_test.go +++ b/tm2/pkg/iavl/tree_fuzz_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "testing" - "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/random" ) // This file implement fuzz testing by generating programs and then running diff --git a/pkgs/iavl/tree_test.go b/tm2/pkg/iavl/tree_test.go similarity index 99% rename from pkgs/iavl/tree_test.go rename to tm2/pkg/iavl/tree_test.go index c90bd10bfdd..07055747632 100644 --- a/pkgs/iavl/tree_test.go +++ b/tm2/pkg/iavl/tree_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/random" ) var ( diff --git a/pkgs/iavl/util.go b/tm2/pkg/iavl/util.go similarity index 100% rename from pkgs/iavl/util.go rename to tm2/pkg/iavl/util.go diff --git a/pkgs/iavl/version.go b/tm2/pkg/iavl/version.go similarity index 100% rename from pkgs/iavl/version.go rename to tm2/pkg/iavl/version.go diff --git a/pkgs/iavl/wire.go b/tm2/pkg/iavl/wire.go similarity index 86% rename from pkgs/iavl/wire.go rename to tm2/pkg/iavl/wire.go index 81af75e1ce9..05d7ac63194 100644 --- a/pkgs/iavl/wire.go +++ b/tm2/pkg/iavl/wire.go @@ -1,7 +1,7 @@ package iavl import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var cdc = amino.NewCodec() diff --git a/pkgs/iavl/with_gcc_test.go b/tm2/pkg/iavl/with_gcc_test.go similarity index 92% rename from pkgs/iavl/with_gcc_test.go rename to tm2/pkg/iavl/with_gcc_test.go index 4209da2cd01..6db434eb268 100644 --- a/pkgs/iavl/with_gcc_test.go +++ b/tm2/pkg/iavl/with_gcc_test.go @@ -10,7 +10,7 @@ package iavl import ( "testing" - "github.com/gnolang/gno/pkgs/db" + "github.com/gnolang/gno/tm2/pkg/db" ) func BenchmarkImmutableAvlTreeCLevelDB(b *testing.B) { diff --git a/pkgs/log/logger.go b/tm2/pkg/log/logger.go similarity index 100% rename from pkgs/log/logger.go rename to tm2/pkg/log/logger.go diff --git a/pkgs/log/nop_logger.go b/tm2/pkg/log/nop_logger.go similarity index 100% rename from pkgs/log/nop_logger.go rename to tm2/pkg/log/nop_logger.go diff --git a/pkgs/log/testing_logger.go b/tm2/pkg/log/testing_logger.go similarity index 97% rename from pkgs/log/testing_logger.go rename to tm2/pkg/log/testing_logger.go index 271fa1ac1e6..05e91b54a7d 100644 --- a/pkgs/log/testing_logger.go +++ b/tm2/pkg/log/testing_logger.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/gnolang/gno/pkgs/colors" + "github.com/gnolang/gno/tm2/pkg/colors" ) // reuse the same logger across all tests diff --git a/pkgs/log/tm_logger.go b/tm2/pkg/log/tm_logger.go similarity index 98% rename from pkgs/log/tm_logger.go rename to tm2/pkg/log/tm_logger.go index bc524ba1060..555ece714cd 100644 --- a/pkgs/log/tm_logger.go +++ b/tm2/pkg/log/tm_logger.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/gnolang/gno/pkgs/colors" + "github.com/gnolang/gno/tm2/pkg/colors" ) const ( diff --git a/pkgs/log/tm_logger_test.go b/tm2/pkg/log/tm_logger_test.go similarity index 96% rename from pkgs/log/tm_logger_test.go rename to tm2/pkg/log/tm_logger_test.go index cdaa62a5fa8..a6d56bb8feb 100644 --- a/pkgs/log/tm_logger_test.go +++ b/tm2/pkg/log/tm_logger_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/log" ) func TestLoggerLogsItsErrors(t *testing.T) { diff --git a/pkgs/maths/math.go b/tm2/pkg/maths/math.go similarity index 100% rename from pkgs/maths/math.go rename to tm2/pkg/maths/math.go diff --git a/pkgs/os/debug.go b/tm2/pkg/os/debug.go similarity index 100% rename from pkgs/os/debug.go rename to tm2/pkg/os/debug.go diff --git a/pkgs/os/net.go b/tm2/pkg/os/net.go similarity index 100% rename from pkgs/os/net.go rename to tm2/pkg/os/net.go diff --git a/pkgs/os/net_test.go b/tm2/pkg/os/net_test.go similarity index 100% rename from pkgs/os/net_test.go rename to tm2/pkg/os/net_test.go diff --git a/pkgs/os/os.go b/tm2/pkg/os/os.go similarity index 100% rename from pkgs/os/os.go rename to tm2/pkg/os/os.go diff --git a/pkgs/os/path.go b/tm2/pkg/os/path.go similarity index 100% rename from pkgs/os/path.go rename to tm2/pkg/os/path.go diff --git a/pkgs/os/process.go b/tm2/pkg/os/process.go similarity index 100% rename from pkgs/os/process.go rename to tm2/pkg/os/process.go diff --git a/pkgs/os/tempfile.go b/tm2/pkg/os/tempfile.go similarity index 100% rename from pkgs/os/tempfile.go rename to tm2/pkg/os/tempfile.go diff --git a/pkgs/os/tempfile_test.go b/tm2/pkg/os/tempfile_test.go similarity index 99% rename from pkgs/os/tempfile_test.go rename to tm2/pkg/os/tempfile_test.go index 6ca39660c27..12d6abb27cb 100644 --- a/pkgs/os/tempfile_test.go +++ b/tm2/pkg/os/tempfile_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" ) func TestWriteFileAtomic(t *testing.T) { diff --git a/pkgs/p2p/README.md b/tm2/pkg/p2p/README.md similarity index 100% rename from pkgs/p2p/README.md rename to tm2/pkg/p2p/README.md diff --git a/pkgs/p2p/base_reactor.go b/tm2/pkg/p2p/base_reactor.go similarity index 96% rename from pkgs/p2p/base_reactor.go rename to tm2/pkg/p2p/base_reactor.go index 2e002b41ab3..91b3981d109 100644 --- a/pkgs/p2p/base_reactor.go +++ b/tm2/pkg/p2p/base_reactor.go @@ -1,8 +1,8 @@ package p2p import ( - "github.com/gnolang/gno/pkgs/p2p/conn" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/service" ) // Reactor is responsible for handling incoming messages on one or more diff --git a/pkgs/p2p/cmd/stest/main.go b/tm2/pkg/p2p/cmd/stest/main.go similarity index 93% rename from pkgs/p2p/cmd/stest/main.go rename to tm2/pkg/p2p/cmd/stest/main.go index cfd72980611..2835e0cc1f0 100644 --- a/pkgs/p2p/cmd/stest/main.go +++ b/tm2/pkg/p2p/cmd/stest/main.go @@ -7,8 +7,8 @@ import ( "net" "os" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - p2pconn "github.com/gnolang/gno/pkgs/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + p2pconn "github.com/gnolang/gno/tm2/pkg/p2p/conn" ) var ( diff --git a/pkgs/p2p/config/config.go b/tm2/pkg/p2p/config/config.go similarity index 99% rename from pkgs/p2p/config/config.go rename to tm2/pkg/p2p/config/config.go index 652b7b37139..855c0fd9844 100644 --- a/pkgs/p2p/config/config.go +++ b/tm2/pkg/p2p/config/config.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) //----------------------------------------------------------------------------- diff --git a/pkgs/p2p/conn/conn_go110.go b/tm2/pkg/p2p/conn/conn_go110.go similarity index 100% rename from pkgs/p2p/conn/conn_go110.go rename to tm2/pkg/p2p/conn/conn_go110.go diff --git a/pkgs/p2p/conn/conn_notgo110.go b/tm2/pkg/p2p/conn/conn_notgo110.go similarity index 100% rename from pkgs/p2p/conn/conn_notgo110.go rename to tm2/pkg/p2p/conn/conn_notgo110.go diff --git a/pkgs/p2p/conn/connection.go b/tm2/pkg/p2p/conn/connection.go similarity index 98% rename from pkgs/p2p/conn/connection.go rename to tm2/pkg/p2p/conn/connection.go index 8511fe611e9..012d6ec37a6 100644 --- a/pkgs/p2p/conn/connection.go +++ b/tm2/pkg/p2p/conn/connection.go @@ -13,13 +13,13 @@ import ( "sync/atomic" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/flow" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/maths" - "github.com/gnolang/gno/pkgs/service" - "github.com/gnolang/gno/pkgs/timer" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/flow" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/maths" + "github.com/gnolang/gno/tm2/pkg/service" + "github.com/gnolang/gno/tm2/pkg/timer" ) const ( diff --git a/pkgs/p2p/conn/connection_test.go b/tm2/pkg/p2p/conn/connection_test.go similarity index 99% rename from pkgs/p2p/conn/connection_test.go rename to tm2/pkg/p2p/conn/connection_test.go index d8e8d406366..6974dd97e56 100644 --- a/pkgs/p2p/conn/connection_test.go +++ b/tm2/pkg/p2p/conn/connection_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/log" ) const maxPingPongPacketSize = 1024 // bytes diff --git a/pkgs/p2p/conn/package.go b/tm2/pkg/p2p/conn/package.go similarity index 78% rename from pkgs/p2p/conn/package.go rename to tm2/pkg/p2p/conn/package.go index 594b66a8d62..8de8459d89e 100644 --- a/pkgs/p2p/conn/package.go +++ b/tm2/pkg/p2p/conn/package.go @@ -3,12 +3,12 @@ package conn import ( "reflect" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/amino/pkg" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/amino/pkg" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/p2p/conn", + "github.com/gnolang/gno/tm2/pkg/p2p/conn", "p2p", // keep short, do not change. amino.GetCallersDirname(), ). diff --git a/pkgs/p2p/conn/secret_connection.go b/tm2/pkg/p2p/conn/secret_connection.go similarity index 98% rename from pkgs/p2p/conn/secret_connection.go rename to tm2/pkg/p2p/conn/secret_connection.go index f6534f53a62..a37788b947d 100644 --- a/pkgs/p2p/conn/secret_connection.go +++ b/tm2/pkg/p2p/conn/secret_connection.go @@ -19,11 +19,11 @@ import ( "golang.org/x/crypto/hkdf" "golang.org/x/crypto/nacl/box" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/async" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/async" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/errors" ) // 4 + 1024 == 1028 total frame size diff --git a/pkgs/p2p/conn/secret_connection_test.go b/tm2/pkg/p2p/conn/secret_connection_test.go similarity index 98% rename from pkgs/p2p/conn/secret_connection_test.go rename to tm2/pkg/p2p/conn/secret_connection_test.go index 33b25432a89..521f651e78b 100644 --- a/pkgs/p2p/conn/secret_connection_test.go +++ b/tm2/pkg/p2p/conn/secret_connection_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/async" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/async" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/random" ) type kvstoreConn struct { diff --git a/pkgs/p2p/conn/testdata/TestDeriveSecretsAndChallengeGolden.golden b/tm2/pkg/p2p/conn/testdata/TestDeriveSecretsAndChallengeGolden.golden similarity index 100% rename from pkgs/p2p/conn/testdata/TestDeriveSecretsAndChallengeGolden.golden rename to tm2/pkg/p2p/conn/testdata/TestDeriveSecretsAndChallengeGolden.golden diff --git a/pkgs/p2p/conn_set.go b/tm2/pkg/p2p/conn_set.go similarity index 100% rename from pkgs/p2p/conn_set.go rename to tm2/pkg/p2p/conn_set.go diff --git a/pkgs/p2p/errors.go b/tm2/pkg/p2p/errors.go similarity index 100% rename from pkgs/p2p/errors.go rename to tm2/pkg/p2p/errors.go diff --git a/pkgs/p2p/fuzz.go b/tm2/pkg/p2p/fuzz.go similarity index 97% rename from pkgs/p2p/fuzz.go rename to tm2/pkg/p2p/fuzz.go index 2eea07eaeaf..f41189d409e 100644 --- a/pkgs/p2p/fuzz.go +++ b/tm2/pkg/p2p/fuzz.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/p2p/config" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/p2p/config" + "github.com/gnolang/gno/tm2/pkg/random" ) // FuzzedConnection wraps any net.Conn and depending on the mode either delays diff --git a/pkgs/p2p/key.go b/tm2/pkg/p2p/key.go similarity index 93% rename from pkgs/p2p/key.go rename to tm2/pkg/p2p/key.go index 4b0dedc9414..71e3459f418 100644 --- a/pkgs/p2p/key.go +++ b/tm2/pkg/p2p/key.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - osm "github.com/gnolang/gno/pkgs/os" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + osm "github.com/gnolang/gno/tm2/pkg/os" ) // ------------------------------------------------------------------------------ diff --git a/pkgs/p2p/key_test.go b/tm2/pkg/p2p/key_test.go similarity index 96% rename from pkgs/p2p/key_test.go rename to tm2/pkg/p2p/key_test.go index eaf6bd35a5d..8046f58eb25 100644 --- a/pkgs/p2p/key_test.go +++ b/tm2/pkg/p2p/key_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/p2p/mock/peer.go b/tm2/pkg/p2p/mock/peer.go similarity index 91% rename from pkgs/p2p/mock/peer.go rename to tm2/pkg/p2p/mock/peer.go index 98acac3d13d..906c168c3a8 100644 --- a/pkgs/p2p/mock/peer.go +++ b/tm2/pkg/p2p/mock/peer.go @@ -3,10 +3,10 @@ package mock import ( "net" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/p2p/conn" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/service" ) type Peer struct { diff --git a/pkgs/p2p/mock/reactor.go b/tm2/pkg/p2p/mock/reactor.go similarity index 81% rename from pkgs/p2p/mock/reactor.go rename to tm2/pkg/p2p/mock/reactor.go index c6737167041..335366920db 100644 --- a/pkgs/p2p/mock/reactor.go +++ b/tm2/pkg/p2p/mock/reactor.go @@ -1,9 +1,9 @@ package mock import ( - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p" - "github.com/gnolang/gno/pkgs/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" ) type Reactor struct { diff --git a/pkgs/p2p/netaddress.go b/tm2/pkg/p2p/netaddress.go similarity index 99% rename from pkgs/p2p/netaddress.go rename to tm2/pkg/p2p/netaddress.go index a5da5de6e8d..1ce34afff34 100644 --- a/pkgs/p2p/netaddress.go +++ b/tm2/pkg/p2p/netaddress.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" ) type ID = crypto.ID diff --git a/pkgs/p2p/netaddress_test.go b/tm2/pkg/p2p/netaddress_test.go similarity index 99% rename from pkgs/p2p/netaddress_test.go rename to tm2/pkg/p2p/netaddress_test.go index 25bece23cea..a5dc3fca375 100644 --- a/pkgs/p2p/netaddress_test.go +++ b/tm2/pkg/p2p/netaddress_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/p2p/node_info.go b/tm2/pkg/p2p/node_info.go similarity index 98% rename from pkgs/p2p/node_info.go rename to tm2/pkg/p2p/node_info.go index 1495ab627ab..9653a83c38a 100644 --- a/pkgs/p2p/node_info.go +++ b/tm2/pkg/p2p/node_info.go @@ -3,8 +3,8 @@ package p2p import ( "fmt" - "github.com/gnolang/gno/pkgs/strings" - "github.com/gnolang/gno/pkgs/versionset" + "github.com/gnolang/gno/tm2/pkg/strings" + "github.com/gnolang/gno/tm2/pkg/versionset" ) const ( diff --git a/pkgs/p2p/node_info_test.go b/tm2/pkg/p2p/node_info_test.go similarity index 97% rename from pkgs/p2p/node_info_test.go rename to tm2/pkg/p2p/node_info_test.go index aba5b7e296e..ea97239643f 100644 --- a/pkgs/p2p/node_info_test.go +++ b/tm2/pkg/p2p/node_info_test.go @@ -5,8 +5,8 @@ import ( "net" "testing" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/versionset" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/versionset" "github.com/stretchr/testify/assert" ) diff --git a/pkgs/p2p/peer.go b/tm2/pkg/p2p/peer.go similarity index 97% rename from pkgs/p2p/peer.go rename to tm2/pkg/p2p/peer.go index 8f6937e8d1a..c9eea1eca65 100644 --- a/pkgs/p2p/peer.go +++ b/tm2/pkg/p2p/peer.go @@ -4,10 +4,10 @@ import ( "fmt" "net" - "github.com/gnolang/gno/pkgs/cmap" - "github.com/gnolang/gno/pkgs/log" - connm "github.com/gnolang/gno/pkgs/p2p/conn" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/cmap" + "github.com/gnolang/gno/tm2/pkg/log" + connm "github.com/gnolang/gno/tm2/pkg/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/service" ) // Peer is an interface representing a peer connected on a reactor. diff --git a/pkgs/p2p/peer_set.go b/tm2/pkg/p2p/peer_set.go similarity index 100% rename from pkgs/p2p/peer_set.go rename to tm2/pkg/p2p/peer_set.go diff --git a/pkgs/p2p/peer_set_test.go b/tm2/pkg/p2p/peer_set_test.go similarity index 98% rename from pkgs/p2p/peer_set_test.go rename to tm2/pkg/p2p/peer_set_test.go index bb119df39c6..7aca84d59b0 100644 --- a/pkgs/p2p/peer_set_test.go +++ b/tm2/pkg/p2p/peer_set_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/service" ) // mockPeer for testing the PeerSet diff --git a/pkgs/p2p/peer_test.go b/tm2/pkg/p2p/peer_test.go similarity index 95% rename from pkgs/p2p/peer_test.go rename to tm2/pkg/p2p/peer_test.go index 40c4cfe122a..070d783d2af 100644 --- a/pkgs/p2p/peer_test.go +++ b/tm2/pkg/p2p/peer_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p/config" - "github.com/gnolang/gno/pkgs/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p/config" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" ) func TestPeerBasic(t *testing.T) { diff --git a/pkgs/p2p/switch.go b/tm2/pkg/p2p/switch.go similarity index 98% rename from pkgs/p2p/switch.go rename to tm2/pkg/p2p/switch.go index f43107e935a..1f693544d5a 100644 --- a/pkgs/p2p/switch.go +++ b/tm2/pkg/p2p/switch.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "github.com/gnolang/gno/pkgs/cmap" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/p2p/config" - "github.com/gnolang/gno/pkgs/p2p/conn" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/service" + "github.com/gnolang/gno/tm2/pkg/cmap" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/p2p/config" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/service" ) const ( diff --git a/pkgs/p2p/switch_test.go b/tm2/pkg/p2p/switch_test.go similarity index 98% rename from pkgs/p2p/switch_test.go rename to tm2/pkg/p2p/switch_test.go index bcba4fa2b27..a0d4853493b 100644 --- a/pkgs/p2p/switch_test.go +++ b/tm2/pkg/p2p/switch_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p/config" - "github.com/gnolang/gno/pkgs/p2p/conn" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p/config" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/testutils" ) var cfg *config.P2PConfig diff --git a/pkgs/p2p/test_util.go b/tm2/pkg/p2p/test_util.go similarity index 94% rename from pkgs/p2p/test_util.go rename to tm2/pkg/p2p/test_util.go index 2a358f3ddab..7ac46a07266 100644 --- a/pkgs/p2p/test_util.go +++ b/tm2/pkg/p2p/test_util.go @@ -5,14 +5,14 @@ import ( "net" "time" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/p2p/config" - "github.com/gnolang/gno/pkgs/p2p/conn" - "github.com/gnolang/gno/pkgs/random" - "github.com/gnolang/gno/pkgs/versionset" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/p2p/config" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/random" + "github.com/gnolang/gno/tm2/pkg/versionset" ) const testCh = 0x01 diff --git a/pkgs/p2p/transport.go b/tm2/pkg/p2p/transport.go similarity index 98% rename from pkgs/p2p/transport.go rename to tm2/pkg/p2p/transport.go index 9946e9f8aa6..5bfae9e52b8 100644 --- a/pkgs/p2p/transport.go +++ b/tm2/pkg/p2p/transport.go @@ -7,10 +7,10 @@ import ( "strconv" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" ) const ( diff --git a/pkgs/p2p/transport_test.go b/tm2/pkg/p2p/transport_test.go similarity index 98% rename from pkgs/p2p/transport_test.go rename to tm2/pkg/p2p/transport_test.go index 7203a1feb41..49ab9ac52e3 100644 --- a/pkgs/p2p/transport_test.go +++ b/tm2/pkg/p2p/transport_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/p2p/conn" - "github.com/gnolang/gno/pkgs/testutils" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/testutils" ) var defaultNodeName = "host_peer" diff --git a/pkgs/p2p/types.go b/tm2/pkg/p2p/types.go similarity index 73% rename from pkgs/p2p/types.go rename to tm2/pkg/p2p/types.go index 61b1918f6bc..150325f52bb 100644 --- a/pkgs/p2p/types.go +++ b/tm2/pkg/p2p/types.go @@ -1,7 +1,7 @@ package p2p import ( - "github.com/gnolang/gno/pkgs/p2p/conn" + "github.com/gnolang/gno/tm2/pkg/p2p/conn" ) type ( diff --git a/pkgs/p2p/upnp/probe.go b/tm2/pkg/p2p/upnp/probe.go similarity index 98% rename from pkgs/p2p/upnp/probe.go rename to tm2/pkg/p2p/upnp/probe.go index 6bc13845bb5..6a2c1d8bf7d 100644 --- a/pkgs/p2p/upnp/probe.go +++ b/tm2/pkg/p2p/upnp/probe.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/log" ) type UPNPCapabilities struct { diff --git a/pkgs/p2p/upnp/upnp.go b/tm2/pkg/p2p/upnp/upnp.go similarity index 100% rename from pkgs/p2p/upnp/upnp.go rename to tm2/pkg/p2p/upnp/upnp.go diff --git a/pkgs/p2p/version/version.go b/tm2/pkg/p2p/version/version.go similarity index 100% rename from pkgs/p2p/version/version.go rename to tm2/pkg/p2p/version/version.go diff --git a/pkgs/random/LICENSE b/tm2/pkg/random/LICENSE similarity index 100% rename from pkgs/random/LICENSE rename to tm2/pkg/random/LICENSE diff --git a/pkgs/random/random.go b/tm2/pkg/random/random.go similarity index 100% rename from pkgs/random/random.go rename to tm2/pkg/random/random.go diff --git a/pkgs/random/random_test.go b/tm2/pkg/random/random_test.go similarity index 100% rename from pkgs/random/random_test.go rename to tm2/pkg/random/random_test.go diff --git a/pkgs/sdk/abci.go b/tm2/pkg/sdk/abci.go similarity index 93% rename from pkgs/sdk/abci.go rename to tm2/pkg/sdk/abci.go index 17fe08f8e03..a9cd14e9ed3 100644 --- a/pkgs/sdk/abci.go +++ b/tm2/pkg/sdk/abci.go @@ -1,6 +1,6 @@ package sdk -import abci "github.com/gnolang/gno/pkgs/bft/abci/types" +import abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" // InitChainer initializes application state at genesis type InitChainer func(ctx Context, req abci.RequestInitChain) abci.ResponseInitChain diff --git a/pkgs/sdk/auth/ante.go b/tm2/pkg/sdk/auth/ante.go similarity index 97% rename from pkgs/sdk/auth/ante.go rename to tm2/pkg/sdk/auth/ante.go index 6d19189d64d..c00a98df4d3 100644 --- a/pkgs/sdk/auth/ante.go +++ b/tm2/pkg/sdk/auth/ante.go @@ -5,14 +5,14 @@ import ( "fmt" "math/big" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/multisig" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/multisig" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" ) var ( diff --git a/pkgs/sdk/auth/ante_test.go b/tm2/pkg/sdk/auth/ante_test.go similarity index 98% rename from pkgs/sdk/auth/ante_test.go rename to tm2/pkg/sdk/auth/ante_test.go index 44be3b0ed73..2dc3ec08176 100644 --- a/pkgs/sdk/auth/ante_test.go +++ b/tm2/pkg/sdk/auth/ante_test.go @@ -9,17 +9,17 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - bft "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/ed25519" - "github.com/gnolang/gno/pkgs/crypto/multisig" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - "github.com/gnolang/gno/pkgs/sdk" - tu "github.com/gnolang/gno/pkgs/sdk/testutils" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" + "github.com/gnolang/gno/tm2/pkg/crypto/multisig" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/sdk" + tu "github.com/gnolang/gno/tm2/pkg/sdk/testutils" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" ) // run the tx through the anteHandler and ensure its valid diff --git a/pkgs/sdk/auth/consts.go b/tm2/pkg/sdk/auth/consts.go similarity index 96% rename from pkgs/sdk/auth/consts.go rename to tm2/pkg/sdk/auth/consts.go index 4a7afebd555..09bbb15cdbc 100644 --- a/pkgs/sdk/auth/consts.go +++ b/tm2/pkg/sdk/auth/consts.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) const ( diff --git a/pkgs/sdk/auth/handler.go b/tm2/pkg/sdk/auth/handler.go similarity index 90% rename from pkgs/sdk/auth/handler.go rename to tm2/pkg/sdk/auth/handler.go index 1753b70e9f8..5636c7b8825 100644 --- a/pkgs/sdk/auth/handler.go +++ b/tm2/pkg/sdk/auth/handler.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" ) type authHandler struct { diff --git a/pkgs/sdk/auth/keeper.go b/tm2/pkg/sdk/auth/keeper.go similarity index 94% rename from pkgs/sdk/auth/keeper.go rename to tm2/pkg/sdk/auth/keeper.go index 89126f0dd30..c814eb21d9f 100644 --- a/pkgs/sdk/auth/keeper.go +++ b/tm2/pkg/sdk/auth/keeper.go @@ -3,12 +3,12 @@ package auth import ( "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" ) // Concrete implementation of AccountKeeper. diff --git a/pkgs/sdk/auth/keeper_bench_test.go b/tm2/pkg/sdk/auth/keeper_bench_test.go similarity index 97% rename from pkgs/sdk/auth/keeper_bench_test.go rename to tm2/pkg/sdk/auth/keeper_bench_test.go index 8df97a67a99..7bd2e9b7f84 100644 --- a/pkgs/sdk/auth/keeper_bench_test.go +++ b/tm2/pkg/sdk/auth/keeper_bench_test.go @@ -3,8 +3,8 @@ package auth import ( "testing" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/std" ) func BenchmarkAccountMapperGetAccountFound(b *testing.B) { diff --git a/pkgs/sdk/auth/keeper_test.go b/tm2/pkg/sdk/auth/keeper_test.go similarity index 97% rename from pkgs/sdk/auth/keeper_test.go rename to tm2/pkg/sdk/auth/keeper_test.go index f6524a75ff4..3af74cf4a4c 100644 --- a/pkgs/sdk/auth/keeper_test.go +++ b/tm2/pkg/sdk/auth/keeper_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) func TestAccountMapperGetSet(t *testing.T) { diff --git a/pkgs/sdk/auth/params.go b/tm2/pkg/sdk/auth/params.go similarity index 98% rename from pkgs/sdk/auth/params.go rename to tm2/pkg/sdk/auth/params.go index 38982a262b5..dfeaa73af71 100644 --- a/pkgs/sdk/auth/params.go +++ b/tm2/pkg/sdk/auth/params.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) type AuthParamsContextKey struct{} diff --git a/pkgs/sdk/auth/test_common.go b/tm2/pkg/sdk/auth/test_common.go similarity index 88% rename from pkgs/sdk/auth/test_common.go rename to tm2/pkg/sdk/auth/test_common.go index 409a902fb59..a51c8576bad 100644 --- a/pkgs/sdk/auth/test_common.go +++ b/tm2/pkg/sdk/auth/test_common.go @@ -1,16 +1,16 @@ package auth import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - bft "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/crypto" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/log" - - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" - "github.com/gnolang/gno/pkgs/store/iavl" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/log" + + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" + "github.com/gnolang/gno/tm2/pkg/store/iavl" ) type testEnv struct { diff --git a/pkgs/sdk/auth/types.go b/tm2/pkg/sdk/auth/types.go similarity index 83% rename from pkgs/sdk/auth/types.go rename to tm2/pkg/sdk/auth/types.go index 483785d2a90..8bbc5e39e3b 100644 --- a/pkgs/sdk/auth/types.go +++ b/tm2/pkg/sdk/auth/types.go @@ -1,9 +1,9 @@ package auth import ( - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" ) // AccountKeeper manages access to accounts. diff --git a/pkgs/sdk/bank/bank.proto b/tm2/pkg/sdk/bank/bank.proto similarity index 77% rename from pkgs/sdk/bank/bank.proto rename to tm2/pkg/sdk/bank/bank.proto index 743e3510979..b2a1b0e8249 100644 --- a/pkgs/sdk/bank/bank.proto +++ b/tm2/pkg/sdk/bank/bank.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bank; -option go_package = "github.com/gnolang/gno/pkgs/sdk/bank/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/sdk/bank/pb"; // messages message NoInputsError { diff --git a/pkgs/sdk/bank/common_test.go b/tm2/pkg/sdk/bank/common_test.go similarity index 64% rename from pkgs/sdk/bank/common_test.go rename to tm2/pkg/sdk/bank/common_test.go index d448fe8fb64..b78ae702cbb 100644 --- a/pkgs/sdk/bank/common_test.go +++ b/tm2/pkg/sdk/bank/common_test.go @@ -3,15 +3,15 @@ package bank // DONTCOVER import ( - bft "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/log" - - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/sdk/auth" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" - "github.com/gnolang/gno/pkgs/store/iavl" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/log" + + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk/auth" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" + "github.com/gnolang/gno/tm2/pkg/store/iavl" ) type testEnv struct { diff --git a/pkgs/sdk/bank/consts.go b/tm2/pkg/sdk/bank/consts.go similarity index 100% rename from pkgs/sdk/bank/consts.go rename to tm2/pkg/sdk/bank/consts.go diff --git a/pkgs/sdk/bank/errors.go b/tm2/pkg/sdk/bank/errors.go similarity index 95% rename from pkgs/sdk/bank/errors.go rename to tm2/pkg/sdk/bank/errors.go index b291369cacc..1549c3dad40 100644 --- a/pkgs/sdk/bank/errors.go +++ b/tm2/pkg/sdk/bank/errors.go @@ -1,7 +1,7 @@ package bank import ( - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // for convenience: diff --git a/pkgs/sdk/bank/handler.go b/tm2/pkg/sdk/bank/handler.go similarity index 94% rename from pkgs/sdk/bank/handler.go rename to tm2/pkg/sdk/bank/handler.go index 2c6abfb2f93..b151af11064 100644 --- a/pkgs/sdk/bank/handler.go +++ b/tm2/pkg/sdk/bank/handler.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" ) type bankHandler struct { diff --git a/pkgs/sdk/bank/handler_test.go b/tm2/pkg/sdk/bank/handler_test.go similarity index 84% rename from pkgs/sdk/bank/handler_test.go rename to tm2/pkg/sdk/bank/handler_test.go index 20e25e86eda..fef4810c027 100644 --- a/pkgs/sdk/bank/handler_test.go +++ b/tm2/pkg/sdk/bank/handler_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - bft "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/sdk" - tu "github.com/gnolang/gno/pkgs/sdk/testutils" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/sdk" + tu "github.com/gnolang/gno/tm2/pkg/sdk/testutils" + "github.com/gnolang/gno/tm2/pkg/std" ) func TestInvalidMsg(t *testing.T) { diff --git a/pkgs/sdk/bank/invariants.go b/tm2/pkg/sdk/bank/invariants.go similarity index 92% rename from pkgs/sdk/bank/invariants.go rename to tm2/pkg/sdk/bank/invariants.go index 1b633e13d26..5bdc483ee9d 100644 --- a/pkgs/sdk/bank/invariants.go +++ b/tm2/pkg/sdk/bank/invariants.go @@ -3,8 +3,8 @@ package bank import ( "fmt" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/sdk/auth" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk/auth" ) // RegisterInvariants registers the bank module invariants diff --git a/pkgs/sdk/bank/keeper.go b/tm2/pkg/sdk/bank/keeper.go similarity index 96% rename from pkgs/sdk/bank/keeper.go rename to tm2/pkg/sdk/bank/keeper.go index 239d381f684..dfbef78f016 100644 --- a/pkgs/sdk/bank/keeper.go +++ b/tm2/pkg/sdk/bank/keeper.go @@ -3,11 +3,11 @@ package bank import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/sdk/auth" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk/auth" + "github.com/gnolang/gno/tm2/pkg/std" ) // bank.Keeper defines a module interface that facilitates the transfer of diff --git a/pkgs/sdk/bank/keeper_test.go b/tm2/pkg/sdk/bank/keeper_test.go similarity index 98% rename from pkgs/sdk/bank/keeper_test.go rename to tm2/pkg/sdk/bank/keeper_test.go index 4f45a5b3b88..d4e230330d5 100644 --- a/pkgs/sdk/bank/keeper_test.go +++ b/tm2/pkg/sdk/bank/keeper_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" ) func TestKeeper(t *testing.T) { diff --git a/pkgs/sdk/bank/msgs.go b/tm2/pkg/sdk/bank/msgs.go similarity index 96% rename from pkgs/sdk/bank/msgs.go rename to tm2/pkg/sdk/bank/msgs.go index cefe61c3526..d87656b8b7b 100644 --- a/pkgs/sdk/bank/msgs.go +++ b/tm2/pkg/sdk/bank/msgs.go @@ -1,10 +1,10 @@ package bank import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/std" ) // RouterKey is they name of the bank module diff --git a/pkgs/sdk/bank/package.go b/tm2/pkg/sdk/bank/package.go similarity index 78% rename from pkgs/sdk/bank/package.go rename to tm2/pkg/sdk/bank/package.go index 5e5bfda1334..f4bcc23c003 100644 --- a/pkgs/sdk/bank/package.go +++ b/tm2/pkg/sdk/bank/package.go @@ -1,11 +1,11 @@ package bank import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/sdk/bank", + "github.com/gnolang/gno/tm2/pkg/sdk/bank", "bank", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/sdk/baseapp.go b/tm2/pkg/sdk/baseapp.go similarity index 98% rename from pkgs/sdk/baseapp.go rename to tm2/pkg/sdk/baseapp.go index 1f9a11c747d..1d356f7ad65 100644 --- a/pkgs/sdk/baseapp.go +++ b/tm2/pkg/sdk/baseapp.go @@ -8,14 +8,14 @@ import ( "strings" "syscall" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - bft "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" ) // Key to store the consensus params in the main store. diff --git a/pkgs/sdk/baseapp_test.go b/tm2/pkg/sdk/baseapp_test.go similarity index 98% rename from pkgs/sdk/baseapp_test.go rename to tm2/pkg/sdk/baseapp_test.go index 31340bb9c42..2d130583885 100644 --- a/pkgs/sdk/baseapp_test.go +++ b/tm2/pkg/sdk/baseapp_test.go @@ -11,16 +11,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - bft "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/sdk/testutils" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/iavl" - store "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/sdk/testutils" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/iavl" + store "github.com/gnolang/gno/tm2/pkg/store/types" ) var ( diff --git a/pkgs/sdk/context.go b/tm2/pkg/sdk/context.go similarity index 96% rename from pkgs/sdk/context.go rename to tm2/pkg/sdk/context.go index 538a2bb1d2b..6e33cb1f419 100644 --- a/pkgs/sdk/context.go +++ b/tm2/pkg/sdk/context.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/log" - "github.com/gnolang/gno/pkgs/store" - "github.com/gnolang/gno/pkgs/store/gas" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/log" + "github.com/gnolang/gno/tm2/pkg/store" + "github.com/gnolang/gno/tm2/pkg/store/gas" ) /* diff --git a/pkgs/sdk/events.go b/tm2/pkg/sdk/events.go similarity index 94% rename from pkgs/sdk/events.go rename to tm2/pkg/sdk/events.go index a5437fbbcfa..bd2ca623b76 100644 --- a/pkgs/sdk/events.go +++ b/tm2/pkg/sdk/events.go @@ -1,7 +1,7 @@ package sdk import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) // ---------------------------------------------------------------------------- diff --git a/pkgs/sdk/helpers.go b/tm2/pkg/sdk/helpers.go similarity index 95% rename from pkgs/sdk/helpers.go rename to tm2/pkg/sdk/helpers.go index 62cd4a637be..d61e8115671 100644 --- a/pkgs/sdk/helpers.go +++ b/tm2/pkg/sdk/helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) var isAlphaNumeric = regexp.MustCompile(`^[a-zA-Z0-9]+$`).MatchString diff --git a/pkgs/sdk/invariants.go b/tm2/pkg/sdk/invariants.go similarity index 100% rename from pkgs/sdk/invariants.go rename to tm2/pkg/sdk/invariants.go diff --git a/pkgs/sdk/options.go b/tm2/pkg/sdk/options.go similarity index 96% rename from pkgs/sdk/options.go rename to tm2/pkg/sdk/options.go index 5e564eea453..4a00681c727 100644 --- a/pkgs/sdk/options.go +++ b/tm2/pkg/sdk/options.go @@ -3,8 +3,8 @@ package sdk import ( "fmt" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/store" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/store" ) // File for storing in-package BaseApp optional functions, diff --git a/pkgs/sdk/package.go b/tm2/pkg/sdk/package.go similarity index 58% rename from pkgs/sdk/package.go rename to tm2/pkg/sdk/package.go index 5d373688cbc..22ccf193119 100644 --- a/pkgs/sdk/package.go +++ b/tm2/pkg/sdk/package.go @@ -1,12 +1,12 @@ package sdk import ( - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/sdk", + "github.com/gnolang/gno/tm2/pkg/sdk", "tm", amino.GetCallersDirname(), ). diff --git a/pkgs/sdk/router.go b/tm2/pkg/sdk/router.go similarity index 100% rename from pkgs/sdk/router.go rename to tm2/pkg/sdk/router.go diff --git a/pkgs/sdk/router_test.go b/tm2/pkg/sdk/router_test.go similarity index 92% rename from pkgs/sdk/router_test.go rename to tm2/pkg/sdk/router_test.go index 4da0f26e800..019d969c00f 100644 --- a/pkgs/sdk/router_test.go +++ b/tm2/pkg/sdk/router_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) type nopTestHandler struct{} diff --git a/tm2/pkg/sdk/sdk.proto b/tm2/pkg/sdk/sdk.proto new file mode 100644 index 00000000000..50e2e6c42eb --- /dev/null +++ b/tm2/pkg/sdk/sdk.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package tm; + +option go_package = "github.com/gnolang/gno/tm2/pkg/sdk/pb"; + +// imports +import "github.com/gnolang/gno/tm2/pkg/bft/abci/types/abci.proto"; +import "github.com/gnolang/gno/tm2/pkg/crypto/merkle/merkle.proto"; + +// messages +message Result { + abci.ResponseBase ResponseBase = 1; + sint64 GasWanted = 2; + sint64 GasUsed = 3; +} \ No newline at end of file diff --git a/pkgs/sdk/testutils/package.go b/tm2/pkg/sdk/testutils/package.go similarity index 74% rename from pkgs/sdk/testutils/package.go rename to tm2/pkg/sdk/testutils/package.go index 3052140e6ba..ed82deb4f34 100644 --- a/pkgs/sdk/testutils/package.go +++ b/tm2/pkg/sdk/testutils/package.go @@ -1,11 +1,11 @@ package testutils import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/sdk/testutils", + "github.com/gnolang/gno/tm2/pkg/sdk/testutils", "sdk.testutils", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/sdk/testutils/testmsgs.go b/tm2/pkg/sdk/testutils/testmsgs.go similarity index 94% rename from pkgs/sdk/testutils/testmsgs.go rename to tm2/pkg/sdk/testutils/testmsgs.go index c7d23ef9f18..9b809c1261e 100644 --- a/pkgs/sdk/testutils/testmsgs.go +++ b/tm2/pkg/sdk/testutils/testmsgs.go @@ -1,8 +1,8 @@ package testutils import ( - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/std" ) const ( diff --git a/pkgs/sdk/testutils/testutils.go b/tm2/pkg/sdk/testutils/testutils.go similarity index 94% rename from pkgs/sdk/testutils/testutils.go rename to tm2/pkg/sdk/testutils/testutils.go index 6d5d24448bd..ffbef18863c 100644 --- a/pkgs/sdk/testutils/testutils.go +++ b/tm2/pkg/sdk/testutils/testutils.go @@ -1,10 +1,10 @@ package testutils import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/secp256k1" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/secp256k1" + "github.com/gnolang/gno/tm2/pkg/std" ) // msg type for testing diff --git a/pkgs/sdk/types.go b/tm2/pkg/sdk/types.go similarity index 93% rename from pkgs/sdk/types.go rename to tm2/pkg/sdk/types.go index c449b481dd3..47395362f1a 100644 --- a/pkgs/sdk/types.go +++ b/tm2/pkg/sdk/types.go @@ -1,8 +1,8 @@ package sdk import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/std" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/std" ) // Router provides handlers for each transaction type. diff --git a/pkgs/sdk/vm/builtins.go b/tm2/pkg/sdk/vm/builtins.go similarity index 92% rename from pkgs/sdk/vm/builtins.go rename to tm2/pkg/sdk/vm/builtins.go index bd6133c9f32..3e846f32288 100644 --- a/pkgs/sdk/vm/builtins.go +++ b/tm2/pkg/sdk/vm/builtins.go @@ -4,12 +4,12 @@ import ( "os" "path/filepath" - "github.com/gnolang/gno/pkgs/crypto" - gno "github.com/gnolang/gno/pkgs/gnolang" - osm "github.com/gnolang/gno/pkgs/os" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/stdlibs" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/gnovm/stdlibs" + "github.com/gnolang/gno/tm2/pkg/crypto" + osm "github.com/gnolang/gno/tm2/pkg/os" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" ) func (vm *VMKeeper) initBuiltinPackagesAndTypes(store gno.Store) { diff --git a/pkgs/sdk/vm/common_test.go b/tm2/pkg/sdk/vm/common_test.go similarity index 57% rename from pkgs/sdk/vm/common_test.go rename to tm2/pkg/sdk/vm/common_test.go index dab01e3862a..62f83e94c8c 100644 --- a/pkgs/sdk/vm/common_test.go +++ b/tm2/pkg/sdk/vm/common_test.go @@ -3,17 +3,19 @@ package vm // DONTCOVER import ( - bft "github.com/gnolang/gno/pkgs/bft/types" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/log" - - "github.com/gnolang/gno/pkgs/sdk" - authm "github.com/gnolang/gno/pkgs/sdk/auth" - bankm "github.com/gnolang/gno/pkgs/sdk/bank" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/iavl" + "path/filepath" + + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/log" + + "github.com/gnolang/gno/tm2/pkg/sdk" + authm "github.com/gnolang/gno/tm2/pkg/sdk/auth" + bankm "github.com/gnolang/gno/tm2/pkg/sdk/bank" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/iavl" ) type testEnv struct { @@ -37,7 +39,8 @@ func setupTestEnv() testEnv { ctx := sdk.NewContext(sdk.RunTxModeDeliver, ms, &bft.Header{ChainID: "test-chain-id"}, log.NewNopLogger()) acck := authm.NewAccountKeeper(iavlCapKey, std.ProtoBaseAccount) bank := bankm.NewBankKeeper(acck) - vmk := NewVMKeeper(baseCapKey, iavlCapKey, acck, bank, "../../../stdlibs") + stdlibsDir := filepath.Join("..", "..", "..", "..", "gnovm", "stdlibs") + vmk := NewVMKeeper(baseCapKey, iavlCapKey, acck, bank, stdlibsDir) vmk.Initialize(ms.MultiCacheWrap()) diff --git a/pkgs/sdk/vm/consts.go b/tm2/pkg/sdk/vm/consts.go similarity index 100% rename from pkgs/sdk/vm/consts.go rename to tm2/pkg/sdk/vm/consts.go diff --git a/pkgs/sdk/vm/convert.go b/tm2/pkg/sdk/vm/convert.go similarity index 98% rename from pkgs/sdk/vm/convert.go rename to tm2/pkg/sdk/vm/convert.go index 10fdb3dc808..de4db67fb04 100644 --- a/pkgs/sdk/vm/convert.go +++ b/tm2/pkg/sdk/vm/convert.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - gno "github.com/gnolang/gno/pkgs/gnolang" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" ) // These convert string representations of public-facing arguments to GNO types. diff --git a/pkgs/sdk/vm/errors.go b/tm2/pkg/sdk/vm/errors.go similarity index 94% rename from pkgs/sdk/vm/errors.go rename to tm2/pkg/sdk/vm/errors.go index 3109893c92c..077587c0062 100644 --- a/pkgs/sdk/vm/errors.go +++ b/tm2/pkg/sdk/vm/errors.go @@ -1,6 +1,6 @@ package vm -import "github.com/gnolang/gno/pkgs/errors" +import "github.com/gnolang/gno/tm2/pkg/errors" // for convenience: type abciError struct{} diff --git a/pkgs/sdk/vm/handler.go b/tm2/pkg/sdk/vm/handler.go similarity index 96% rename from pkgs/sdk/vm/handler.go rename to tm2/pkg/sdk/vm/handler.go index 4a091e1850a..accaa70e059 100644 --- a/pkgs/sdk/vm/handler.go +++ b/tm2/pkg/sdk/vm/handler.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/sdk/auth" - "github.com/gnolang/gno/pkgs/std" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk/auth" + "github.com/gnolang/gno/tm2/pkg/std" ) type vmHandler struct { diff --git a/pkgs/sdk/vm/handler_test.go b/tm2/pkg/sdk/vm/handler_test.go similarity index 82% rename from pkgs/sdk/vm/handler_test.go rename to tm2/pkg/sdk/vm/handler_test.go index d58edc39ede..2110681d99d 100644 --- a/pkgs/sdk/vm/handler_test.go +++ b/tm2/pkg/sdk/vm/handler_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - bft "github.com/gnolang/gno/pkgs/bft/types" - "github.com/gnolang/gno/pkgs/sdk" - tu "github.com/gnolang/gno/pkgs/sdk/testutils" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + bft "github.com/gnolang/gno/tm2/pkg/bft/types" + "github.com/gnolang/gno/tm2/pkg/sdk" + tu "github.com/gnolang/gno/tm2/pkg/sdk/testutils" + "github.com/gnolang/gno/tm2/pkg/std" ) func TestInvalidMsg(t *testing.T) { diff --git a/pkgs/sdk/vm/invariants.go b/tm2/pkg/sdk/vm/invariants.go similarity index 96% rename from pkgs/sdk/vm/invariants.go rename to tm2/pkg/sdk/vm/invariants.go index bdeecc34368..003d0dcc8ac 100644 --- a/pkgs/sdk/vm/invariants.go +++ b/tm2/pkg/sdk/vm/invariants.go @@ -1,7 +1,7 @@ package vm import ( - "github.com/gnolang/gno/pkgs/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk" ) // RegisterInvariants registers the vm module invariants diff --git a/pkgs/sdk/vm/keeper.go b/tm2/pkg/sdk/vm/keeper.go similarity index 97% rename from pkgs/sdk/vm/keeper.go rename to tm2/pkg/sdk/vm/keeper.go index 784509d91fb..8cff3e4c239 100644 --- a/pkgs/sdk/vm/keeper.go +++ b/tm2/pkg/sdk/vm/keeper.go @@ -1,18 +1,20 @@ package vm +// TODO: move most of the logic in ROOT/gno.land/... + import ( "fmt" "os" "strings" - "github.com/gnolang/gno/pkgs/errors" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/sdk/auth" - "github.com/gnolang/gno/pkgs/sdk/bank" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store" - "github.com/gnolang/gno/stdlibs" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/gnovm/stdlibs" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/sdk/auth" + "github.com/gnolang/gno/tm2/pkg/sdk/bank" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store" ) const ( diff --git a/pkgs/sdk/vm/keeper_test.go b/tm2/pkg/sdk/vm/keeper_test.go similarity index 97% rename from pkgs/sdk/vm/keeper_test.go rename to tm2/pkg/sdk/vm/keeper_test.go index 63900d66c78..07cdbfdf20d 100644 --- a/pkgs/sdk/vm/keeper_test.go +++ b/tm2/pkg/sdk/vm/keeper_test.go @@ -1,5 +1,7 @@ package vm +// TODO: move most of the logic in ROOT/gno.land/... + import ( "fmt" "strings" @@ -7,8 +9,8 @@ import ( "github.com/jaekwon/testify/assert" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/std" ) // Sending total send amount succeeds. @@ -78,7 +80,7 @@ import "std" var admin std.Address func init() { - admin = std.GetOrigCaller() + admin = std.GetOrigCaller() } func Echo(msg string) string { @@ -264,7 +266,7 @@ import "std" var admin std.Address func init() { - admin = std.GetOrigCaller() + admin = std.GetOrigCaller() } func Echo(msg string) string { diff --git a/pkgs/sdk/vm/msgs.go b/tm2/pkg/sdk/vm/msgs.go similarity index 93% rename from pkgs/sdk/vm/msgs.go rename to tm2/pkg/sdk/vm/msgs.go index afe70c22c33..3cfc6c58224 100644 --- a/pkgs/sdk/vm/msgs.go +++ b/tm2/pkg/sdk/vm/msgs.go @@ -3,11 +3,11 @@ package vm import ( "strings" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - gno "github.com/gnolang/gno/pkgs/gnolang" - "github.com/gnolang/gno/pkgs/sdk" - "github.com/gnolang/gno/pkgs/std" + gno "github.com/gnolang/gno/gnovm/pkg/gnolang" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/sdk" + "github.com/gnolang/gno/tm2/pkg/std" ) //---------------------------------------- diff --git a/pkgs/sdk/vm/package.go b/tm2/pkg/sdk/vm/package.go similarity index 76% rename from pkgs/sdk/vm/package.go rename to tm2/pkg/sdk/vm/package.go index b8ec6bc98a9..e7d1144ffaa 100644 --- a/pkgs/sdk/vm/package.go +++ b/tm2/pkg/sdk/vm/package.go @@ -1,12 +1,12 @@ package vm import ( - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/std" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/std" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/sdk/vm", + "github.com/gnolang/gno/tm2/pkg/sdk/vm", "vm", amino.GetCallersDirname(), ).WithDependencies( diff --git a/pkgs/sdk/vm/types.go b/tm2/pkg/sdk/vm/types.go similarity index 89% rename from pkgs/sdk/vm/types.go rename to tm2/pkg/sdk/vm/types.go index dd33356d602..442c2d4b138 100644 --- a/pkgs/sdk/vm/types.go +++ b/tm2/pkg/sdk/vm/types.go @@ -1,6 +1,6 @@ package vm -import "github.com/gnolang/gno/pkgs/amino" +import "github.com/gnolang/gno/tm2/pkg/amino" // Public facing function signatures. // See convertArgToGno() for supported types. diff --git a/pkgs/sdk/vm/vm.proto b/tm2/pkg/sdk/vm/vm.proto similarity index 75% rename from pkgs/sdk/vm/vm.proto rename to tm2/pkg/sdk/vm/vm.proto index 0a4337cdd3a..262583869c7 100644 --- a/pkgs/sdk/vm/vm.proto +++ b/tm2/pkg/sdk/vm/vm.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package vm; -option go_package = "github.com/gnolang/gno/pkgs/sdk/vm/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/sdk/vm/pb"; // imports -import "github.com/gnolang/gno/pkgs/std/std.proto"; +import "github.com/gnolang/gno/tm2/pkg/std/std.proto"; // messages message m_call { diff --git a/pkgs/service/service.go b/tm2/pkg/service/service.go similarity index 99% rename from pkgs/service/service.go rename to tm2/pkg/service/service.go index 16fe2d09fee..e1e9189e044 100644 --- a/pkgs/service/service.go +++ b/tm2/pkg/service/service.go @@ -5,7 +5,7 @@ import ( "fmt" "sync/atomic" - "github.com/gnolang/gno/pkgs/log" + "github.com/gnolang/gno/tm2/pkg/log" ) var ( diff --git a/pkgs/service/service_test.go b/tm2/pkg/service/service_test.go similarity index 100% rename from pkgs/service/service_test.go rename to tm2/pkg/service/service_test.go diff --git a/pkgs/std/account.go b/tm2/pkg/std/account.go similarity index 97% rename from pkgs/std/account.go rename to tm2/pkg/std/account.go index 05c52b258e5..604444b4046 100644 --- a/pkgs/std/account.go +++ b/tm2/pkg/std/account.go @@ -3,8 +3,8 @@ package std import ( "fmt" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/errors" ) // Account is an interface used to store coins at a given address within state. diff --git a/pkgs/std/coin.go b/tm2/pkg/std/coin.go similarity index 99% rename from pkgs/std/coin.go rename to tm2/pkg/std/coin.go index 50bdeebf39c..d5eb9bb1da0 100644 --- a/pkgs/std/coin.go +++ b/tm2/pkg/std/coin.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" "github.com/gnolang/overflow" ) diff --git a/pkgs/std/coin_benchmark_test.go b/tm2/pkg/std/coin_benchmark_test.go similarity index 100% rename from pkgs/std/coin_benchmark_test.go rename to tm2/pkg/std/coin_benchmark_test.go diff --git a/pkgs/std/coin_test.go b/tm2/pkg/std/coin_test.go similarity index 99% rename from pkgs/std/coin_test.go rename to tm2/pkg/std/coin_test.go index 88bc6b40efd..923781ed412 100644 --- a/pkgs/std/coin_test.go +++ b/tm2/pkg/std/coin_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/std/doc.go b/tm2/pkg/std/doc.go similarity index 95% rename from pkgs/std/doc.go rename to tm2/pkg/std/doc.go index 9f90b08040f..92010e4136e 100644 --- a/pkgs/std/doc.go +++ b/tm2/pkg/std/doc.go @@ -3,8 +3,8 @@ package std import ( "time" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" ) //---------------------------------------- diff --git a/pkgs/std/errors.go b/tm2/pkg/std/errors.go similarity index 99% rename from pkgs/std/errors.go rename to tm2/pkg/std/errors.go index c9d88c8eb93..715b27b3eb4 100644 --- a/pkgs/std/errors.go +++ b/tm2/pkg/std/errors.go @@ -1,7 +1,7 @@ package std import ( - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // for convenience: diff --git a/pkgs/std/gasprice.go b/tm2/pkg/std/gasprice.go similarity index 96% rename from pkgs/std/gasprice.go rename to tm2/pkg/std/gasprice.go index 1352c2ef218..5acc934fb71 100644 --- a/pkgs/std/gasprice.go +++ b/tm2/pkg/std/gasprice.go @@ -3,7 +3,7 @@ package std import ( "strings" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) // minimum gas price is Price/Gas per gas unit. diff --git a/pkgs/std/kvpair.go b/tm2/pkg/std/kvpair.go similarity index 100% rename from pkgs/std/kvpair.go rename to tm2/pkg/std/kvpair.go diff --git a/pkgs/std/memfile.go b/tm2/pkg/std/memfile.go similarity index 98% rename from pkgs/std/memfile.go rename to tm2/pkg/std/memfile.go index b0d7a41b7ef..55c384485e7 100644 --- a/pkgs/std/memfile.go +++ b/tm2/pkg/std/memfile.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/gnolang/gno/pkgs/errors" + "github.com/gnolang/gno/tm2/pkg/errors" ) type MemFile struct { diff --git a/pkgs/std/msg.go b/tm2/pkg/std/msg.go similarity index 94% rename from pkgs/std/msg.go rename to tm2/pkg/std/msg.go index 8590b3ef31e..993668c17e5 100644 --- a/pkgs/std/msg.go +++ b/tm2/pkg/std/msg.go @@ -1,7 +1,7 @@ package std import ( - "github.com/gnolang/gno/pkgs/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto" ) // Transactions messages must fulfill the Msg. diff --git a/pkgs/std/package.go b/tm2/pkg/std/package.go similarity index 93% rename from pkgs/std/package.go rename to tm2/pkg/std/package.go index da611d4a944..76e1f9fc4ad 100644 --- a/pkgs/std/package.go +++ b/tm2/pkg/std/package.go @@ -1,11 +1,11 @@ package std import ( - "github.com/gnolang/gno/pkgs/amino" + "github.com/gnolang/gno/tm2/pkg/amino" ) var Package = amino.RegisterPackage(amino.NewPackage( - "github.com/gnolang/gno/pkgs/std", + "github.com/gnolang/gno/tm2/pkg/std", "std", amino.GetCallersDirname(), ).WithDependencies().WithTypes( diff --git a/pkgs/std/std.proto b/tm2/pkg/std/std.proto similarity index 94% rename from pkgs/std/std.proto rename to tm2/pkg/std/std.proto index 643871438c8..d7b9b9c737b 100644 --- a/pkgs/std/std.proto +++ b/tm2/pkg/std/std.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package std; -option go_package = "github.com/gnolang/gno/pkgs/std/pb"; +option go_package = "github.com/gnolang/gno/tm2/pkg/std/pb"; // imports import "google/protobuf/any.proto"; diff --git a/pkgs/std/tx.go b/tm2/pkg/std/tx.go similarity index 96% rename from pkgs/std/tx.go rename to tm2/pkg/std/tx.go index 3c83a45cf68..d6fa4fe8fe3 100644 --- a/pkgs/std/tx.go +++ b/tm2/pkg/std/tx.go @@ -3,9 +3,9 @@ package std import ( "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto" - "github.com/gnolang/gno/pkgs/crypto/multisig" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto" + "github.com/gnolang/gno/tm2/pkg/crypto/multisig" ) var maxGasWanted = int64((1 << 60) - 1) // something smaller than math.MaxInt64 diff --git a/pkgs/std/utils.go b/tm2/pkg/std/utils.go similarity index 100% rename from pkgs/std/utils.go rename to tm2/pkg/std/utils.go diff --git a/pkgs/store/README.md b/tm2/pkg/store/README.md similarity index 100% rename from pkgs/store/README.md rename to tm2/pkg/store/README.md diff --git a/pkgs/store/cache/memiterator.go b/tm2/pkg/store/cache/memiterator.go similarity index 95% rename from pkgs/store/cache/memiterator.go rename to tm2/pkg/store/cache/memiterator.go index c952f608aba..6a349cc34b8 100644 --- a/pkgs/store/cache/memiterator.go +++ b/tm2/pkg/store/cache/memiterator.go @@ -3,8 +3,8 @@ package cache import ( "container/list" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/std" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/std" ) // Iterates over iterKVCache items. diff --git a/pkgs/store/cache/mergeiterator.go b/tm2/pkg/store/cache/mergeiterator.go similarity index 99% rename from pkgs/store/cache/mergeiterator.go rename to tm2/pkg/store/cache/mergeiterator.go index 634b54e2cc7..7578d86ee1c 100644 --- a/pkgs/store/cache/mergeiterator.go +++ b/tm2/pkg/store/cache/mergeiterator.go @@ -3,7 +3,7 @@ package cache import ( "bytes" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/types" ) // cacheMergeIterator merges a parent Iterator and a cache Iterator. diff --git a/pkgs/store/cache/store.go b/tm2/pkg/store/cache/store.go similarity index 97% rename from pkgs/store/cache/store.go rename to tm2/pkg/store/cache/store.go index 0d0fd08e531..fb3b6447067 100644 --- a/pkgs/store/cache/store.go +++ b/tm2/pkg/store/cache/store.go @@ -6,10 +6,10 @@ import ( "sort" "sync" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/std" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/std" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/types" ) // If value is nil but deleted is false, it means the parent doesn't have the diff --git a/pkgs/store/cache/store_bench_test.go b/tm2/pkg/store/cache/store_bench_test.go similarity index 89% rename from pkgs/store/cache/store_bench_test.go rename to tm2/pkg/store/cache/store_bench_test.go index a08b59466d9..63e6f2ebbdc 100644 --- a/pkgs/store/cache/store_bench_test.go +++ b/tm2/pkg/store/cache/store_bench_test.go @@ -5,10 +5,10 @@ import ( "sort" "testing" - dbm "github.com/gnolang/gno/pkgs/db" + dbm "github.com/gnolang/gno/tm2/pkg/db" - "github.com/gnolang/gno/pkgs/store/cache" - "github.com/gnolang/gno/pkgs/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/cache" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" ) func benchmarkCacheStoreIterator(b *testing.B, numKVs int) { diff --git a/pkgs/store/cache/store_test.go b/tm2/pkg/store/cache/store_test.go similarity index 98% rename from pkgs/store/cache/store_test.go rename to tm2/pkg/store/cache/store_test.go index 496b7a58750..9630c7a4117 100644 --- a/pkgs/store/cache/store_test.go +++ b/tm2/pkg/store/cache/store_test.go @@ -6,12 +6,12 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/random" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/random" - "github.com/gnolang/gno/pkgs/store/cache" - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/cache" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/types" ) func newCacheStore() types.Store { diff --git a/pkgs/store/cachemulti/store.go b/tm2/pkg/store/cachemulti/store.go similarity index 96% rename from pkgs/store/cachemulti/store.go rename to tm2/pkg/store/cachemulti/store.go index 5ae65730150..405904337f3 100644 --- a/pkgs/store/cachemulti/store.go +++ b/tm2/pkg/store/cachemulti/store.go @@ -1,7 +1,7 @@ package cachemulti import ( - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/types" ) //---------------------------------------- diff --git a/pkgs/store/dbadapter/store.go b/tm2/pkg/store/dbadapter/store.go similarity index 91% rename from pkgs/store/dbadapter/store.go rename to tm2/pkg/store/dbadapter/store.go index b93cbd84fe6..5a39dd32f6b 100644 --- a/pkgs/store/dbadapter/store.go +++ b/tm2/pkg/store/dbadapter/store.go @@ -1,10 +1,10 @@ package dbadapter import ( - dbm "github.com/gnolang/gno/pkgs/db" + dbm "github.com/gnolang/gno/tm2/pkg/db" - "github.com/gnolang/gno/pkgs/store/cache" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/cache" + "github.com/gnolang/gno/tm2/pkg/store/types" ) // Implements CommitStoreConstructor. diff --git a/pkgs/store/errors/errors.go b/tm2/pkg/store/errors/errors.go similarity index 87% rename from pkgs/store/errors/errors.go rename to tm2/pkg/store/errors/errors.go index 4fe29145211..5a53892f22a 100644 --- a/pkgs/store/errors/errors.go +++ b/tm2/pkg/store/errors/errors.go @@ -1,7 +1,7 @@ package errors import ( - abci "github.com/gnolang/gno/pkgs/bft/abci/types" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" ) type Error = abci.Error diff --git a/pkgs/store/exports.go b/tm2/pkg/store/exports.go similarity index 96% rename from pkgs/store/exports.go rename to tm2/pkg/store/exports.go index 40c95c222e5..a1b4aba3655 100644 --- a/pkgs/store/exports.go +++ b/tm2/pkg/store/exports.go @@ -1,7 +1,7 @@ package store import ( - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/types" ) // Import cosmos-sdk/types/store.go for convenience. diff --git a/pkgs/store/firstlast.go b/tm2/pkg/store/firstlast.go similarity index 90% rename from pkgs/store/firstlast.go rename to tm2/pkg/store/firstlast.go index e5871267230..89018b9d31c 100644 --- a/pkgs/store/firstlast.go +++ b/tm2/pkg/store/firstlast.go @@ -3,8 +3,8 @@ package store import ( "bytes" - "github.com/gnolang/gno/pkgs/std" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/std" + "github.com/gnolang/gno/tm2/pkg/store/types" ) // Gets the first item. diff --git a/pkgs/store/gas/store.go b/tm2/pkg/store/gas/store.go similarity index 98% rename from pkgs/store/gas/store.go rename to tm2/pkg/store/gas/store.go index 157b60ff1ce..bcd0cb7ee80 100644 --- a/pkgs/store/gas/store.go +++ b/tm2/pkg/store/gas/store.go @@ -1,7 +1,7 @@ package gas import ( - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/types" ) var _ types.Store = &Store{} diff --git a/pkgs/store/gas/store_test.go b/tm2/pkg/store/gas/store_test.go similarity index 92% rename from pkgs/store/gas/store_test.go rename to tm2/pkg/store/gas/store_test.go index dd0444bc2cf..70f1fc8ea7f 100644 --- a/pkgs/store/gas/store_test.go +++ b/tm2/pkg/store/gas/store_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - dbm "github.com/gnolang/gno/pkgs/db" + dbm "github.com/gnolang/gno/tm2/pkg/db" - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/gas" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/gas" + "github.com/gnolang/gno/tm2/pkg/store/types" "github.com/stretchr/testify/require" ) diff --git a/pkgs/store/iavl/store.go b/tm2/pkg/store/iavl/store.go similarity index 95% rename from pkgs/store/iavl/store.go rename to tm2/pkg/store/iavl/store.go index fd37492d4bf..b5841389d19 100644 --- a/pkgs/store/iavl/store.go +++ b/tm2/pkg/store/iavl/store.go @@ -5,17 +5,17 @@ import ( "fmt" "sync" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto/merkle" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/iavl" - "github.com/gnolang/gno/pkgs/std" - - "github.com/gnolang/gno/pkgs/store/cache" - serrors "github.com/gnolang/gno/pkgs/store/errors" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/iavl" + "github.com/gnolang/gno/tm2/pkg/std" + + "github.com/gnolang/gno/tm2/pkg/store/cache" + serrors "github.com/gnolang/gno/tm2/pkg/store/errors" + "github.com/gnolang/gno/tm2/pkg/store/types" ) const ( diff --git a/pkgs/store/iavl/store_test.go b/tm2/pkg/store/iavl/store_test.go similarity index 98% rename from pkgs/store/iavl/store_test.go rename to tm2/pkg/store/iavl/store_test.go index 0db971febde..83afae91860 100644 --- a/pkgs/store/iavl/store_test.go +++ b/tm2/pkg/store/iavl/store_test.go @@ -6,14 +6,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/iavl" - "github.com/gnolang/gno/pkgs/random" - - // "github.com/gnolang/gno/pkgs/store/errors" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/iavl" + "github.com/gnolang/gno/tm2/pkg/random" + + // "github.com/gnolang/gno/tm2/pkg/store/errors" + "github.com/gnolang/gno/tm2/pkg/store/types" ) var ( diff --git a/pkgs/store/iavl/tree.go b/tm2/pkg/store/iavl/tree.go similarity index 98% rename from pkgs/store/iavl/tree.go rename to tm2/pkg/store/iavl/tree.go index 0264c15aa63..11be71acb8c 100644 --- a/pkgs/store/iavl/tree.go +++ b/tm2/pkg/store/iavl/tree.go @@ -3,7 +3,7 @@ package iavl import ( "fmt" - "github.com/gnolang/gno/pkgs/iavl" + "github.com/gnolang/gno/tm2/pkg/iavl" ) var ( diff --git a/pkgs/store/immut/store.go b/tm2/pkg/store/immut/store.go similarity index 92% rename from pkgs/store/immut/store.go rename to tm2/pkg/store/immut/store.go index b6038bbc0c9..f39263a77c2 100644 --- a/pkgs/store/immut/store.go +++ b/tm2/pkg/store/immut/store.go @@ -1,8 +1,8 @@ package immut import ( - "github.com/gnolang/gno/pkgs/store/cache" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/cache" + "github.com/gnolang/gno/tm2/pkg/store/types" ) var _ types.Store = immutStore{} diff --git a/pkgs/store/prefix/store.go b/tm2/pkg/store/prefix/store.go similarity index 97% rename from pkgs/store/prefix/store.go rename to tm2/pkg/store/prefix/store.go index 4c1cc7f9971..4d0a1612e2a 100644 --- a/pkgs/store/prefix/store.go +++ b/tm2/pkg/store/prefix/store.go @@ -3,8 +3,8 @@ package prefix import ( "bytes" - "github.com/gnolang/gno/pkgs/store/cache" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/cache" + "github.com/gnolang/gno/tm2/pkg/store/types" ) var _ types.Store = Store{} diff --git a/pkgs/store/prefix/store_test.go b/tm2/pkg/store/prefix/store_test.go similarity index 97% rename from pkgs/store/prefix/store_test.go rename to tm2/pkg/store/prefix/store_test.go index e75aba26536..70f0eae05c8 100644 --- a/pkgs/store/prefix/store_test.go +++ b/tm2/pkg/store/prefix/store_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/gnolang/gno/pkgs/db" - tiavl "github.com/gnolang/gno/pkgs/iavl" + dbm "github.com/gnolang/gno/tm2/pkg/db" + tiavl "github.com/gnolang/gno/tm2/pkg/iavl" - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/gas" - "github.com/gnolang/gno/pkgs/store/iavl" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/gas" + "github.com/gnolang/gno/tm2/pkg/store/iavl" + "github.com/gnolang/gno/tm2/pkg/store/types" ) // copied from iavl/store_test.go diff --git a/pkgs/store/rootmulti/dbadapter.go b/tm2/pkg/store/rootmulti/dbadapter.go similarity index 87% rename from pkgs/store/rootmulti/dbadapter.go rename to tm2/pkg/store/rootmulti/dbadapter.go index 12379f67482..254d139a608 100644 --- a/pkgs/store/rootmulti/dbadapter.go +++ b/tm2/pkg/store/rootmulti/dbadapter.go @@ -1,8 +1,8 @@ package rootmulti import ( - "github.com/gnolang/gno/pkgs/store/dbadapter" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/dbadapter" + "github.com/gnolang/gno/tm2/pkg/store/types" ) var commithash = []byte("FAKE_HASH") diff --git a/pkgs/store/rootmulti/proof.go b/tm2/pkg/store/rootmulti/proof.go similarity index 95% rename from pkgs/store/rootmulti/proof.go rename to tm2/pkg/store/rootmulti/proof.go index a55b15a6a1a..f7be504bc8b 100644 --- a/pkgs/store/rootmulti/proof.go +++ b/tm2/pkg/store/rootmulti/proof.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" - "github.com/gnolang/gno/pkgs/amino" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/errors" - "github.com/gnolang/gno/pkgs/iavl" + "github.com/gnolang/gno/tm2/pkg/amino" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/errors" + "github.com/gnolang/gno/tm2/pkg/iavl" ) // MultiStoreProof defines a collection of store proofs in a multi-store diff --git a/pkgs/store/rootmulti/proof_test.go b/tm2/pkg/store/rootmulti/proof_test.go similarity index 96% rename from pkgs/store/rootmulti/proof_test.go rename to tm2/pkg/store/rootmulti/proof_test.go index ed004dd1958..565ea59face 100644 --- a/pkgs/store/rootmulti/proof_test.go +++ b/tm2/pkg/store/rootmulti/proof_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - dbm "github.com/gnolang/gno/pkgs/db" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" - "github.com/gnolang/gno/pkgs/store/iavl" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/iavl" + "github.com/gnolang/gno/tm2/pkg/store/types" ) func TestVerifyIAVLStoreQueryProof(t *testing.T) { diff --git a/pkgs/store/rootmulti/store.go b/tm2/pkg/store/rootmulti/store.go similarity index 96% rename from pkgs/store/rootmulti/store.go rename to tm2/pkg/store/rootmulti/store.go index 8c32ecb1df1..b3591a23118 100644 --- a/pkgs/store/rootmulti/store.go +++ b/tm2/pkg/store/rootmulti/store.go @@ -4,17 +4,17 @@ import ( "fmt" "strings" - "github.com/gnolang/gno/pkgs/amino" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto/merkle" - "github.com/gnolang/gno/pkgs/crypto/tmhash" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/errors" - - "github.com/gnolang/gno/pkgs/store/cachemulti" - serrors "github.com/gnolang/gno/pkgs/store/errors" - "github.com/gnolang/gno/pkgs/store/immut" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/amino" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/errors" + + "github.com/gnolang/gno/tm2/pkg/store/cachemulti" + serrors "github.com/gnolang/gno/tm2/pkg/store/errors" + "github.com/gnolang/gno/tm2/pkg/store/immut" + "github.com/gnolang/gno/tm2/pkg/store/types" ) const ( diff --git a/pkgs/store/rootmulti/store_test.go b/tm2/pkg/store/rootmulti/store_test.go similarity index 97% rename from pkgs/store/rootmulti/store_test.go rename to tm2/pkg/store/rootmulti/store_test.go index b62649506a6..e660f80c6bb 100644 --- a/pkgs/store/rootmulti/store_test.go +++ b/tm2/pkg/store/rootmulti/store_test.go @@ -6,12 +6,12 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - "github.com/gnolang/gno/pkgs/crypto/merkle" - dbm "github.com/gnolang/gno/pkgs/db" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + "github.com/gnolang/gno/tm2/pkg/crypto/merkle" + dbm "github.com/gnolang/gno/tm2/pkg/db" - "github.com/gnolang/gno/pkgs/store/iavl" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/iavl" + "github.com/gnolang/gno/tm2/pkg/store/types" ) func TestStoreType(t *testing.T) { diff --git a/pkgs/store/store.go b/tm2/pkg/store/store.go similarity index 84% rename from pkgs/store/store.go rename to tm2/pkg/store/store.go index 9bc8b0292f0..2950937f951 100644 --- a/pkgs/store/store.go +++ b/tm2/pkg/store/store.go @@ -3,11 +3,11 @@ package store import ( "fmt" - dbm "github.com/gnolang/gno/pkgs/db" - "github.com/gnolang/gno/pkgs/strings" + dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/strings" - "github.com/gnolang/gno/pkgs/store/rootmulti" - "github.com/gnolang/gno/pkgs/store/types" + "github.com/gnolang/gno/tm2/pkg/store/rootmulti" + "github.com/gnolang/gno/tm2/pkg/store/types" ) func NewCommitMultiStore(db dbm.DB) types.CommitMultiStore { diff --git a/pkgs/store/types/gas.go b/tm2/pkg/store/types/gas.go similarity index 100% rename from pkgs/store/types/gas.go rename to tm2/pkg/store/types/gas.go diff --git a/pkgs/store/types/gas_test.go b/tm2/pkg/store/types/gas_test.go similarity index 100% rename from pkgs/store/types/gas_test.go rename to tm2/pkg/store/types/gas_test.go diff --git a/pkgs/store/types/options.go b/tm2/pkg/store/types/options.go similarity index 100% rename from pkgs/store/types/options.go rename to tm2/pkg/store/types/options.go diff --git a/pkgs/store/types/store.go b/tm2/pkg/store/types/store.go similarity index 97% rename from pkgs/store/types/store.go rename to tm2/pkg/store/types/store.go index be7ceac3885..68ee110586c 100644 --- a/pkgs/store/types/store.go +++ b/tm2/pkg/store/types/store.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - abci "github.com/gnolang/gno/pkgs/bft/abci/types" - dbm "github.com/gnolang/gno/pkgs/db" - std "github.com/gnolang/gno/pkgs/std" + abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" + dbm "github.com/gnolang/gno/tm2/pkg/db" + std "github.com/gnolang/gno/tm2/pkg/std" ) type Store interface { diff --git a/pkgs/store/types/utils.go b/tm2/pkg/store/types/utils.go similarity index 100% rename from pkgs/store/types/utils.go rename to tm2/pkg/store/types/utils.go diff --git a/pkgs/store/types/validity.go b/tm2/pkg/store/types/validity.go similarity index 100% rename from pkgs/store/types/validity.go rename to tm2/pkg/store/types/validity.go diff --git a/pkgs/strings/string.go b/tm2/pkg/strings/string.go similarity index 100% rename from pkgs/strings/string.go rename to tm2/pkg/strings/string.go diff --git a/pkgs/strings/string_test.go b/tm2/pkg/strings/string_test.go similarity index 100% rename from pkgs/strings/string_test.go rename to tm2/pkg/strings/string_test.go diff --git a/pkgs/testutils/LICENSE b/tm2/pkg/testutils/LICENSE similarity index 100% rename from pkgs/testutils/LICENSE rename to tm2/pkg/testutils/LICENSE diff --git a/pkgs/testutils/flappy.go b/tm2/pkg/testutils/flappy.go similarity index 100% rename from pkgs/testutils/flappy.go rename to tm2/pkg/testutils/flappy.go diff --git a/pkgs/testutils/io.go b/tm2/pkg/testutils/io.go similarity index 100% rename from pkgs/testutils/io.go rename to tm2/pkg/testutils/io.go diff --git a/pkgs/testutils/mutate.go b/tm2/pkg/testutils/mutate.go similarity index 94% rename from pkgs/testutils/mutate.go rename to tm2/pkg/testutils/mutate.go index ecb11479f50..29ea20ba1fb 100644 --- a/pkgs/testutils/mutate.go +++ b/tm2/pkg/testutils/mutate.go @@ -1,7 +1,7 @@ package testutils import ( - "github.com/gnolang/gno/pkgs/random" + "github.com/gnolang/gno/tm2/pkg/random" ) // Contract: !bytes.Equal(input, output) && len(input) >= len(output) diff --git a/pkgs/testutils/os.go b/tm2/pkg/testutils/os.go similarity index 100% rename from pkgs/testutils/os.go rename to tm2/pkg/testutils/os.go diff --git a/pkgs/timer/throttle_timer.go b/tm2/pkg/timer/throttle_timer.go similarity index 100% rename from pkgs/timer/throttle_timer.go rename to tm2/pkg/timer/throttle_timer.go diff --git a/pkgs/timer/throttle_timer_test.go b/tm2/pkg/timer/throttle_timer_test.go similarity index 100% rename from pkgs/timer/throttle_timer_test.go rename to tm2/pkg/timer/throttle_timer_test.go diff --git a/pkgs/versionset/versionset.go b/tm2/pkg/versionset/versionset.go similarity index 100% rename from pkgs/versionset/versionset.go rename to tm2/pkg/versionset/versionset.go