Skip to content

Commit

Permalink
PENV-680: remove vendor, update go (#83)
Browse files Browse the repository at this point in the history
* MN-574-2 (#74)

* MN-581: create method deposit.transferToDeposit

* MN-581: create method deposit.transferToDeposit

* MN-591: add `deposit.createFund` method (#39)

* PENV-346: add hash to full pulse

* MN-591: add `deposit.createFund` method

* MN-591: refactor method names and remove redundant constructor parameter

* MN-591: switch to master

* MN-591: cleanup after rebase

Co-authored-by: Maria Zubareva <[email protected]>

* MN-581: create method deposit.transferToDeposit

* resolve conflict

* resolve conflict

* MN-636: add method `account.transferToDeposit` (#42)

* MN-636: add method `account.transferToDeposit`

* MN-636: rename `TransferToDeposit` to `ReallocateToDeposit`

* MN-636: add balance checks to functest

* MN-584: add linear vesting type (#47)

* MN-583: add method `deposit.create` (#53)

* MN-651: split spec files (#46)

* MN-651: split spec files

* MN-651: return temporary admin methods in api-exported.yaml

* MN-651: reset api-exported.yaml to v1.1.1 (#48)

* MN-662: fix TestMigrationDaemonTransferDeposit

* MN-662: fix TransferDeposit tests

* MN-583: add method `deposit.create`

* MN-583: revert fund_test.go

* MN-583: fix typo in daemon_confirm.go name

* MN-583: comply note about error text checking

* MN-583: fix parameters order for compatibility with observer

* MN-583: fix note about error type assertion

Co-authored-by: Mikhail Popov <[email protected]>

* MN-583: add double deposit creation check (#57)

* NOISSUE: clarify deposit.Confirm (#58)

* NOISSUE: clarify deposit.Confirm

* NOISSUE: remove unnecessary confusing test

* NOISSUE: fix note about toAmounts method

* MN-588: update migration procedure (#65)

* MN-588: update migration procedure

* MN-588: skip TestDepositCreate

* Update application/functest/test_utils.go

Co-authored-by: Zubareva Maria <[email protected]>

Co-authored-by: Zubareva Maria <[email protected]>

* MN-652: calculate available amount for additional deposit (#70)

* MN-589: utility app

* MN-751: fill linear vesting params from default vesting params config (#73)

Co-authored-by: Andrey Pavlushev <[email protected]>
Co-authored-by: Maria Zubareva <[email protected]>
Co-authored-by: Andrey Pavlushev <[email protected]>
Co-authored-by: Mikhail Popov <[email protected]>
Co-authored-by: Andrey Zolin <[email protected]>

* MN-740: add insolar v1.8.0 with an exporter API rate limiter

* MN-761: use TransferToDeposit request reference as txID (#76)

* MN-740: add fixed insolar v1.8.1

* Revert "MN-761: use TransferToDeposit request reference as txID (#76)" (#77)

This reverts commit 90a2e08.

* Revert "MN-574-2 (#74)" (#78)

This reverts commit dbc9e6c.

* MN-771: add the insolar v1.8.2 with an optional rate-limiting

* OPS-354 run e2e tests on pull requests (#82)

* OPS-354 e2e

* OPS-354 move overlay to gotops

* OPS-354 debug

* OPS-354: add private registry secret to pull go-autotest image

* OPS-354: fix private registry secret

* OPS-354 download go-test-parser.zip

* OPS-354 fix execute binary

* OPS-354 fix execute binary

* OPS-354 tmp

* OPS-354 fix execute binary

* OPS-354 tmp

* OPS-354 Download go-test-parser and execute

* OPS-354 provide BUILD_VERSION to fix the autotest

* OPS-354 fix quote

* empty commit

* OPS-354 proper path to autotests

* OPS-354 update gitops branch to REL-57

* OPS-354 rename package to 'autotests-pod'

* OPS-354 update go-autotests branch to master

* OPS-354 go-test-parser v1.0.4 check

* OPS-354 go-test-parser v1.0.4 check

* OPS-354 revert step condition

Co-authored-by: Sergei Mironov <[email protected]>

* PENV-680: remove vendor, update go

* change application structure

* merge

* add burnedAccount

* add burnedAccount

* merge

* merge

* merge

* fix ugorji library

* insolar-scripts revert

Co-authored-by: Alexey Zhunin <[email protected]>
Co-authored-by: Andrey Pavlushev <[email protected]>
Co-authored-by: Maria Zubareva <[email protected]>
Co-authored-by: Andrey Pavlushev <[email protected]>
Co-authored-by: Andrey Zolin <[email protected]>
Co-authored-by: Pavel Moskovkin <[email protected]>
Co-authored-by: Sergei Mironov <[email protected]>
Co-authored-by: pavel-moskovkin <[email protected]>
  • Loading branch information
9 people authored Oct 16, 2020
1 parent f3aa5ba commit 580deef
Show file tree
Hide file tree
Showing 3,324 changed files with 26 additions and 942,582 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 7 additions & 4 deletions .github/workflows/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
schedule:
- cron: '0 2 * * *'
env:
GO_VERSION: 1.12.15
GO_VERSION: 1.15.2
CI_GOMAXPROCS: 0
INSOLAR_LOG_LEVEL: warn
jobs:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name: test_prepare
run: |
go mod download
make pre-build build
make vendor pre-build build
working-directory: ${{env.GOPATH}}/src/github.com/insolar/mainnet
- name: test_unit
run: make test_unit
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- name: test_prepare
run: |
go mod download
make pre-build build
make vendor pre-build build
working-directory: ${{env.GOPATH}}/src/github.com/insolar/mainnet
- name: test_slow
run: make test_slow
Expand All @@ -87,6 +87,7 @@ jobs:
- name: codegen
run: |
go clean -modcache
make vendor
make install-deps
make pre-build
git diff --exit-code
Expand All @@ -109,7 +110,7 @@ jobs:
run: echo "::add-path::${{env.GOPATH}}/bin"
- name: generate codecov
run: |
make test-with-coverage
make vendor test-with-coverage
content=`cat coverage.txt | ./scripts/dev/cover-filter.sh`
echo "$content" | tee $GITHUB_WORKSPACE/coverage.txt
cat ./coverage.txt | wc
Expand Down Expand Up @@ -147,6 +148,7 @@ jobs:
- name: test_func
working-directory: ${{env.GOPATH}}/src/github.com/insolar/mainnet
run: |
make vendor
make submodule
make build
make functest
Expand Down Expand Up @@ -189,6 +191,7 @@ jobs:
env:
POSTGRES_ENABLE: 1
run: |
make vendor
make submodule
make build
make functest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.12'
go-version: '1.15.2'
- name: checkout code
uses: actions/checkout@master
- name: build mainnet image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- master
env:
GO_VERSION: 1.12.15
GO_VERSION: 1.15.2
jobs:
build-and-push:
name: build-and-push
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
tags:
- '*'
env:
GO_VERSION: 1.12.15
GO_VERSION: 1.15.2
jobs:
build-pack-release:
name: build-pack-release
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ coverage.txt
# Local doc build directory
/docs/build

vendor/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 1) build step (approx local build time ~4m w/o cache)
ARG GOLANG_VERSION=1.12
ARG GOLANG_VERSION=1.15
FROM golang:${GOLANG_VERSION} AS build

ADD . /go/src/github.com/insolar/mainnet
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LDFLAGS += -X github.com/insolar/insolar/version.GitHash=${BUILD_HASH}
INSGOCC=./bin/insgocc

.PHONY: all
all: submodule clean pre-build build ## cleanup, install deps, (re)generate all code and build all binaries
all: vendor submodule clean pre-build build ## cleanup, install deps, (re)generate all code and build all binaries

.PHONY: submodule
submodule: ## init git submodule
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ These steps are detailed below.

### Install

1. Install Golang programming tools v1.12. For example, from [golang.org](http://golang.org/). Set the [$GOPATH environment variable](https://github.com/golang/go/wiki/SettingGOPATH).
1. Install Golang programming tools v1.15. For example, from [golang.org](http://golang.org/). Set the [$GOPATH environment variable](https://github.com/golang/go/wiki/SettingGOPATH).

2. Download the MainNet package:

Expand Down
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/insolar/mainnet

go 1.12
go 1.15

require (
github.com/google/gops v0.3.6
github.com/insolar/insolar v1.8.2
github.com/insolar/insolar v1.9.0
github.com/insolar/x-crypto v0.0.0-20191031140942-75fab8a325f6
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v0.0.5
Expand All @@ -17,3 +17,5 @@ require (
)

replace github.com/insolar/mainnet => ./

replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43
8 changes: 6 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
Expand Down Expand Up @@ -155,8 +156,8 @@ github.com/insolar/go-actors v0.0.0-20190805151516-2fcc7bfc8ff9 h1:476W50z1EA/U8
github.com/insolar/go-actors v0.0.0-20190805151516-2fcc7bfc8ff9/go.mod h1:vh6gyvTJhKxCMROgV7ADLE1jS19NAd6gIaHCjHgVWKQ=
github.com/insolar/insconfig v0.0.0-20200227134411-011eca6dc866 h1:821agB4jwkceJbV2lniBH3/mGLqSaHPhmurMfeGZAVg=
github.com/insolar/insconfig v0.0.0-20200227134411-011eca6dc866/go.mod h1:zB9bawcGFKS4hwXcu6yH4rYH06EZnGlFfhl0+KMKM9k=
github.com/insolar/insolar v1.8.2 h1:d1bZyPvU5z6otUYDpb4JQ7NC2X01gOSYN687Yc+vTNA=
github.com/insolar/insolar v1.8.2/go.mod h1:vBRQccV1Uuao6tRxD8Ek45CDp+15LMz15gELb2Qgn34=
github.com/insolar/insolar v1.9.0 h1:lX8fVreRtCKdl/QxXAcQEORui0ax/eXmpObj7c8xlX0=
github.com/insolar/insolar v1.9.0/go.mod h1:K9BPXhEiWsTornH2QSzUBC5OZc6shew3bUCUon7+FB0=
github.com/insolar/ratelimiter v1.0.0 h1:MgroVdLHgyuQWgXHHVe+3vM4xEVQ7ssqAU3KlrO4rYU=
github.com/insolar/ratelimiter v1.0.0/go.mod h1:tdN/LjBmGJt5/dfwAQk+0GXVtv2f+mGKvXpnt2FBpfs=
github.com/insolar/rpc v1.2.2-0.20200331123021-db57b8833f82 h1:SbU7YjfN6JdDP3ULyYqqgxtSOlDkFPKm6ddN4tM0bFI=
Expand Down Expand Up @@ -368,10 +369,13 @@ github.com/uber/jaeger-client-go v2.19.0+incompatible h1:pbwbYfHUoaase0oPQOdZ1Gc
github.com/uber/jaeger-client-go v2.19.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43 h1:BasDe+IErOQKrMVXab7UayvSlIpiyGwRvuX3EKYY7UA=
github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43/go.mod h1:iT03XoTwV7xq/+UGwKO3UbC1nNNlopQiY61beSdrtOA=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
Expand Down
4 changes: 2 additions & 2 deletions scripts/kube/bootstrap/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 1) build step (approx local build time ~4m w/o cache)
ARG GOLANG_VERSION=1.12
ARG GOLANG_VERSION=1.15
FROM golang:${GOLANG_VERSION}

ADD . /go/src/github.com/insolar/mainnet
Expand All @@ -21,4 +21,4 @@ RUN BUILD_NUMBER=${BUILD_NUMBER} \

RUN set -eux; \
groupadd -r insolar --gid=999; \
useradd -r -g insolar --uid=999 --shell=/bin/bash insolar
useradd -r -g insolar --uid=999 --shell=/bin/bash insolar

This file was deleted.

17 changes: 0 additions & 17 deletions vendor/contrib.go.opencensus.io/exporter/prometheus/.travis.yml

This file was deleted.

Loading

0 comments on commit 580deef

Please sign in to comment.