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

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

1 files changed, 0 insertions, 24 deletions

diff --git a/ethutil/rand.go b/ethutil/rand.go
deleted file mode 100644
index 91dafec7e..000000000
--- a/ethutil/rand.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package ethutil
-
-import (
-	"crypto/rand"
-	"encoding/binary"
-	"io"
-)
-
-func randomUint64(r io.Reader) (uint64, error) {
-	b := make([]byte, 8)
-	n, err := r.Read(b)
-	if n != len(b) {
-		return 0, io.ErrShortBuffer
-	}
-	if err != nil {
-		return 0, err
-	}
-	return binary.BigEndian.Uint64(b), nil
-}
-
-// RandomUint64 returns a cryptographically random uint64 value.
-func RandomUint64() (uint64, error) {
-	return randomUint64(rand.Reader)
-}