Merge remote-tracking branch 'upstream/develop' into frontier/js

Conflicts:
	cmd/ethereum/js.go
	javascript/types.go

1 files changed, 0 insertions, 70 deletions

diff --git a/ethutil/value_test.go b/ethutil/value_test.go
deleted file mode 100644
index 861d35184..000000000
--- a/ethutil/value_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package ethutil
-
-import (
-	"math/big"
-
-	checker "gopkg.in/check.v1"
-)
-
-type ValueSuite struct{}
-
-var _ = checker.Suite(&ValueSuite{})
-
-func (s *ValueSuite) TestValueCmp(c *checker.C) {
-	val1 := NewValue("hello")
-	val2 := NewValue("world")
-	c.Assert(val1.Cmp(val2), checker.Equals, false)
-
-	val3 := NewValue("hello")
-	val4 := NewValue("hello")
-	c.Assert(val3.Cmp(val4), checker.Equals, true)
-}
-
-func (s *ValueSuite) TestValueTypes(c *checker.C) {
-	str := NewValue("str")
-	num := NewValue(1)
-	inter := NewValue([]interface{}{1})
-	byt := NewValue([]byte{1, 2, 3, 4})
-	bigInt := NewValue(big.NewInt(10))
-
-	strExp := "str"
-	numExp := uint64(1)
-	interExp := []interface{}{1}
-	bytExp := []byte{1, 2, 3, 4}
-	bigExp := big.NewInt(10)
-
-	c.Assert(str.Str(), checker.Equals, strExp)
-	c.Assert(num.Uint(), checker.Equals, numExp)
-	c.Assert(NewValue(inter.Interface()).Cmp(NewValue(interExp)), checker.Equals, true)
-	c.Assert(byt.Bytes(), checker.DeepEquals, bytExp)
-	c.Assert(bigInt.BigInt(), checker.DeepEquals, bigExp)
-}
-
-func (s *ValueSuite) TestIterator(c *checker.C) {
-	value := NewValue([]interface{}{1, 2, 3})
-	iter := value.NewIterator()
-	values := []uint64{1, 2, 3}
-	i := 0
-	for iter.Next() {
-		c.Assert(values[i], checker.Equals, iter.Value().Uint())
-		i++
-	}
-}
-
-func (s *ValueSuite) TestMath(c *checker.C) {
-	data1 := NewValue(1)
-	data1.Add(1).Add(1)
-	exp1 := NewValue(3)
-	data2 := NewValue(2)
-	data2.Sub(1).Sub(1)
-	exp2 := NewValue(0)
-
-	c.Assert(data1.DeepCmp(exp1), checker.Equals, true)
-	c.Assert(data2.DeepCmp(exp2), checker.Equals, true)
-}
-
-func (s *ValueSuite) TestString(c *checker.C) {
-	data := "10"
-	exp := int64(10)
-	c.Assert(NewValue(data).Int(), checker.DeepEquals, exp)
-}