Skip to content

Commit

Permalink
🔀 Merge pull request #222 from perun-network/221-upgrade-go-117
Browse files Browse the repository at this point in the history
Upgrade go to v1.17
  • Loading branch information
ggwpez committed Sep 23, 2021
2 parents 14ca467 + 4196b2e commit 3b79c96
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 197 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Golang
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.17

- name: Checkout
uses: actions/checkout@v2
Expand All @@ -67,7 +67,7 @@ jobs:
- name: Set up Golang
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.17

- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 0 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
run:
timeout: 2m

# list of build tags, all linters use it. Default is empty list.
#build-tags:
# - wrap_test TODO currently broken

# Skip the eth bindings.
skip-dirs:
- backend/ethereum/bindings/
Expand Down
2 changes: 1 addition & 1 deletion backend/ethereum/channel/conclude_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (

const (
defaultTestTimeout = 10 * time.Second
blockInterval = 10 * time.Millisecond
blockInterval = 50 * time.Millisecond
)

func TestAdjudicator_ConcludeFinal(t *testing.T) {
Expand Down
2 changes: 0 additions & 2 deletions backend/sim/channel/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build !wrap_test

package channel

import (
Expand Down
2 changes: 0 additions & 2 deletions backend/sim/channel/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build !wrap_test

package channel

import (
Expand Down
2 changes: 0 additions & 2 deletions backend/sim/wallet/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build !wrap_test

package wallet

import (
Expand Down
2 changes: 0 additions & 2 deletions backend/sim/wallet/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build !wrap_test

package wallet

import (
Expand Down
80 changes: 0 additions & 80 deletions channel/backend_test.go

This file was deleted.

File renamed without changes.
33 changes: 32 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module perun.network/go-perun

go 1.16
go 1.17

require (
github.com/ethereum/go-ethereum v1.10.8
Expand All @@ -12,3 +12,34 @@ require (
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
)

require (
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/btcsuite/btcd v0.21.0-beta // indirect
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea // indirect
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/uuid v1.1.5 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.0 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/tsdb v0.7.1 // indirect
github.com/rjeczalik/notify v0.9.1 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)
20 changes: 0 additions & 20 deletions pkg/test/norace.go

This file was deleted.

20 changes: 0 additions & 20 deletions pkg/test/race.go

This file was deleted.

61 changes: 0 additions & 61 deletions wallet/backend_test.go

This file was deleted.

0 comments on commit 3b79c96

Please sign in to comment.