From 81dea2d8e796b60ca9325bd2a3e502b71e25e6cc Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 20 Feb 2015 11:35:40 +0100
Subject: update-license.go: add blank line after build tag
This silences "go install ./...". For some reason it started
complaining with go 1.4.2.
---
update-license.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/update-license.go b/update-license.go
index d5e21fdd3..832a94712 100644
--- a/update-license.go
+++ b/update-license.go
@@ -1,4 +1,5 @@
// +build none
+
/*
This command generates GPL license headers on top of all source files.
You can run it once per month, before cutting a release or just
--
cgit v1.2.3
From 4ab7a290cdc6495a7ebcea9384cdc6622f2fd000 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 20 Feb 2015 11:36:50 +0100
Subject: accounts: use crypto/randentropy in test
---
accounts/accounts_test.go | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
index da9406ebe..30e8c6285 100644
--- a/accounts/accounts_test.go
+++ b/accounts/accounts_test.go
@@ -1,8 +1,10 @@
package accounts
import (
- "github.com/ethereum/go-ethereum/crypto"
"testing"
+
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/randentropy"
)
func TestAccountManager(t *testing.T) {
@@ -10,7 +12,7 @@ func TestAccountManager(t *testing.T) {
am := NewAccountManager(ks)
pass := "" // not used but required by API
a1, err := am.NewAccount(pass)
- toSign := crypto.GetEntropyCSPRNG(32)
+ toSign := randentropy.GetEntropyCSPRNG(32)
_, err = am.Sign(a1, pass, toSign)
if err != nil {
t.Fatal(err)
--
cgit v1.2.3
From 01ce066d4307e6e8cab815eab9295a0b259130b9 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 20 Feb 2015 11:37:33 +0100
Subject: state: improve TestDump
---
state/state_test.go | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/state/state_test.go b/state/state_test.go
index 7c54cedc0..ee1cf9286 100644
--- a/state/state_test.go
+++ b/state/state_test.go
@@ -1,6 +1,8 @@
package state
import (
+ "math/big"
+
checker "gopkg.in/check.v1"
"github.com/ethereum/go-ethereum/ethdb"
@@ -16,11 +18,42 @@ var _ = checker.Suite(&StateSuite{})
// var ZeroHash256 = make([]byte, 32)
func (s *StateSuite) TestDump(c *checker.C) {
- key := []byte{0x01}
- value := []byte("foo")
- s.state.trie.Update(key, value)
- dump := s.state.Dump()
- c.Assert(dump, checker.NotNil)
+ // generate a few entries
+ obj1 := s.state.GetOrNewStateObject([]byte{0x01})
+ obj1.AddBalance(big.NewInt(22))
+ obj2 := s.state.GetOrNewStateObject([]byte{0x01, 0x02})
+ obj2.SetCode([]byte{3, 3, 3, 3, 3, 3, 3})
+ obj3 := s.state.GetOrNewStateObject([]byte{0x02})
+ obj3.SetBalance(big.NewInt(44))
+
+ // write some of them to the trie
+ s.state.UpdateStateObject(obj1)
+ s.state.UpdateStateObject(obj2)
+
+ // check that dump contains the state objects that are in trie
+ got := string(s.state.Dump())
+ want := `{
+ "root": "4e3a59299745ba6752247c8b91d0f716dac9ec235861c91f5ac1894a361d87ba",
+ "accounts": {
+ "0000000000000000000000000000000000000001": {
+ "balance": "22",
+ "nonce": 0,
+ "root": "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "codeHash": "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+ "storage": {}
+ },
+ "0000000000000000000000000000000000000102": {
+ "balance": "0",
+ "nonce": 0,
+ "root": "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "codeHash": "87874902497a5bb968da31a2998d8f22e949d1ef6214bcdedd8bae24cca4b9e3",
+ "storage": {}
+ }
+ }
+}`
+ if got != want {
+ c.Errorf("dump mismatch:\ngot: %s\nwant: %s\n", got, want)
+ }
}
func (s *StateSuite) SetUpTest(c *checker.C) {
--
cgit v1.2.3
From b3b6210886abd0962f97add91c081ac732639102 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 20 Feb 2015 11:38:52 +0100
Subject: tests/vm: add non-test Go file
This removes the annoying warning printed by "go install ./...".
---
tests/vm/nowarn.go | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 tests/vm/nowarn.go
diff --git a/tests/vm/nowarn.go b/tests/vm/nowarn.go
new file mode 100644
index 000000000..2a45a6cc6
--- /dev/null
+++ b/tests/vm/nowarn.go
@@ -0,0 +1,3 @@
+// This silences the warning given by 'go install ./...'.
+
+package vm
--
cgit v1.2.3
From 66abe2e3d43c1004630c0c2f52a7f427bd51293b Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 20 Feb 2015 11:55:13 +0100
Subject: gocoverage.sh: skip .
This is an attempt to get Travis working again.
---
gocoverage.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gocoverage.sh b/gocoverage.sh
index 4245e3901..d353bd08a 100755
--- a/gocoverage.sh
+++ b/gocoverage.sh
@@ -13,7 +13,7 @@ for dir in $(find . -maxdepth 10 -not -path './.git*' -not -path '*/_*' -type d)
do
if ls $dir/*.go &> /dev/null; then
# echo $dir
- if [[ $dir != "./tests/vm" ]]
+ if [[ $dir != "./tests/vm" && $dir != "." ]]
then
go test -covermode=count -coverprofile=$dir/profile.tmp $dir
fi
--
cgit v1.2.3
From 654f7f707c9bd327fcbf0dcb89715a5930f915eb Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 20 Feb 2015 12:15:08 +0100
Subject: .travis.yml: speed up tests on Travis
This should decrease test runtime to about 30 seconds.
---
.travis.yml | 3 ---
gocoverage.sh | 11 ++++++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2dfb7e283..cf8b02f5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,7 @@ install:
# - go get golang.org/x/tools/cmd/vet
- if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
- go get github.com/mattn/goveralls
- - go get gopkg.in/check.v1
- - go get github.com/tools/godep
before_script:
- - godep restore
- gofmt -l -w .
- goimports -l -w .
- golint .
diff --git a/gocoverage.sh b/gocoverage.sh
index d353bd08a..e54a5cab0 100755
--- a/gocoverage.sh
+++ b/gocoverage.sh
@@ -1,11 +1,16 @@
#!/bin/bash
-# The script does automatic checking on a Go package and its sub-packages, including:
-# 6. test coverage (http://blog.golang.org/cover)
set -e
-# Run test coverage on each subdirectories and merge the coverage profile.
+# Add godep workspace to GOPATH. We do it manually instead of using
+# 'godep go test' or 'godep restore' so godep doesn't need to be installed.
+GOPATH="$PWD/Godeps/_workspace:$GOPATH"
+
+# Install packages before testing. Not doing this would cause
+# 'go test' to recompile all package dependencies before testing each package.
+go install ./...
+# Run test coverage on each subdirectories and merge the coverage profile.
echo "mode: count" > profile.cov
# Standard go tooling behavior is to ignore dirs with leading underscors
--
cgit v1.2.3
From 3b12a9293c35fd336122d9387ab6bc9b67d2803a Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 20 Feb 2015 12:17:24 +0100
Subject: .travis.yml: don't run gofmt, goimports, golint
This should yield another 30-second speed up. Nobody looks
at the output of those anyway. We might want bring back gofmt later
and actually fail the build if source is not formatted.
---
.travis.yml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index cf8b02f5c..1b3104826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,15 +6,10 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -yqq libgmp3-dev libreadline6-dev qt54quickcontrols qt54webengine
install:
- - go get code.google.com/p/go.tools/cmd/goimports
- - go get github.com/golang/lint/golint
# - go get golang.org/x/tools/cmd/vet
- if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
- go get github.com/mattn/goveralls
before_script:
- - gofmt -l -w .
- - goimports -l -w .
- - golint .
# - go vet ./...
# - go test -race ./...
script:
--
cgit v1.2.3