Merge pull request #3809 from fjl/all-use-normal-context

all: import "context" instead of "golang.org/x/net/context"

3 files changed, 6 insertions, 28 deletions

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 <http://www.gnu.org/licenses/>.
-
-// 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)
-}
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