aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-02-02 23:24:38 +0800
committerobscuren <geffobscura@gmail.com>2014-02-02 23:24:38 +0800
commit928a1303f6b53d155fa43a323d28ff440f3ed2d2 (patch)
tree685700c800dc5c6f83972f449f110c1b4d43c3ff
parentf07b53da2db90aa84dbb5044de15d072e19fb849 (diff)
parentbd9af2a7fde1f83c9131d883554c6d9e91e27fa6 (diff)
downloadgo-tangerine-928a1303f6b53d155fa43a323d28ff440f3ed2d2.tar
go-tangerine-928a1303f6b53d155fa43a323d28ff440f3ed2d2.tar.gz
go-tangerine-928a1303f6b53d155fa43a323d28ff440f3ed2d2.tar.bz2
go-tangerine-928a1303f6b53d155fa43a323d28ff440f3ed2d2.tar.lz
go-tangerine-928a1303f6b53d155fa43a323d28ff440f3ed2d2.tar.xz
go-tangerine-928a1303f6b53d155fa43a323d28ff440f3ed2d2.tar.zst
go-tangerine-928a1303f6b53d155fa43a323d28ff440f3ed2d2.zip
Merge branch 'master' of github.com-obscure:ethereum/go-ethereum
-rw-r--r--README.md12
-rw-r--r--test_runner_test.go3
2 files changed, 11 insertions, 4 deletions
diff --git a/README.md b/README.md
index 3693fb6b0..10527931e 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,18 @@ Deps
Ethereum Go makes use of a modified `secp256k1-go` and therefor GMP.
-Install
+Ubuntu 12+
+* `apt-get install gmp-dev`
+
+OS X 10.9+:
+* `brew install gmp`
+
+Build
=======
-```go get -u -t github.com/ethereum/go-ethereum```
+* `go get -u -t github.com/ethereum/go-ethereum`
+* `cd $GOPATH/src/github.com/ethereum/go-etherum`
+* `go build`
Command line options
diff --git a/test_runner_test.go b/test_runner_test.go
index 0a0b0d69c..5c8461ad8 100644
--- a/test_runner_test.go
+++ b/test_runner_test.go
@@ -27,8 +27,7 @@ func TestTestRunner(t *testing.T) {
for key, value := range source.Inputs {
trie.Update(key, value)
}
-
- if hex.EncodeToString([]byte(trie.Root)) != source.Expectation {
+ if hex.EncodeToString(trie.Root.([]byte)) != source.Expectation {
t.Error("trie root did not match")
}
})