From c213fd1fd8bb624241da7fc98cf25098d8b92761 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 22 Mar 2017 18:20:33 +0100 Subject: all: import "context" instead of "golang.org/x/net/context" There is no need to depend on the old context package now that the minimum Go version is 1.7. The move to "context" eliminates our weird vendoring setup. Some vendored code still uses golang.org/x/net/context and it is now vendored in the normal way. This change triggered new vet checks around context.WithTimeout which didn't fire with golang.org/x/net/context. --- mobile/context.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mobile') diff --git a/mobile/context.go b/mobile/context.go index 9df94b689..f1fff9011 100644 --- a/mobile/context.go +++ b/mobile/context.go @@ -20,9 +20,8 @@ package geth import ( + "context" "time" - - "golang.org/x/net/context" ) // Context carries a deadline, a cancelation signal, and other values across API -- cgit v1.2.3 From 9a2720fb35c9802c6dd61f9a49c48620b2ba2ecb Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 22 Mar 2017 19:48:15 +0100 Subject: mobile: remove support for Go < 1.7 --- mobile/big.go | 5 +++++ mobile/big_go1.7.go | 26 -------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 mobile/big_go1.7.go (limited to 'mobile') diff --git a/mobile/big.go b/mobile/big.go index 9a55836c1..525717caa 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -93,3 +93,8 @@ func (bi *BigInts) Set(index int, bigint *BigInt) error { bi.bigints[index] = bigint.bigint return nil } + +// GetString returns the value of x as a formatted string in some number base. +func (bi *BigInt) GetString(base int) string { + return bi.bigint.Text(base) +} diff --git a/mobile/big_go1.7.go b/mobile/big_go1.7.go deleted file mode 100644 index 0447e1f66..000000000 --- a/mobile/big_go1.7.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2016 The go-ethereum Authors -// This file is part of the go-ethereum library. -// -// The go-ethereum library is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The go-ethereum library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with the go-ethereum library. If not, see . - -// Contains the wrappers from the math/big package that require Go 1.7 and above. - -// +build go1.7 - -package geth - -// GetString returns the value of x as a formatted string in some number base. -func (bi *BigInt) GetString(base int) string { - return bi.bigint.Text(base) -} -- cgit v1.2.3