From 117f66e82375b752cc6a9ff22aa0d398ac337bb4 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 6 Jan 2015 12:13:57 +0100 Subject: Added license headers --- cmd/ethtest/main.go | 2 -- 1 file changed, 2 deletions(-) (limited to 'cmd/ethtest') diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 96ef94e40..05e99564c 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -17,8 +17,6 @@ /** * @authors: * Jeffrey Wilcke - * @date 2014 - * */ package main -- cgit v1.2.3 From fed3e6a808921fb8274b50043c5c39a24a1bbccf Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 7 Jan 2015 13:17:48 +0100 Subject: Refactored ethutil.Config.Db out --- cmd/ethtest/main.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cmd/ethtest') diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 05e99564c..7d1c3de01 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -29,6 +29,7 @@ import ( "os" "strings" + "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/tests/helper" @@ -41,8 +42,8 @@ type Account struct { Storage map[string]string } -func StateObjectFromAccount(addr string, account Account) *state.StateObject { - obj := state.NewStateObject(ethutil.Hex2Bytes(addr)) +func StateObjectFromAccount(db ethutil.Database, addr string, account Account) *state.StateObject { + obj := state.NewStateObject(ethutil.Hex2Bytes(addr), db) obj.SetBalance(ethutil.Big(account.Balance)) if ethutil.IsHex(account.Code) { @@ -74,9 +75,10 @@ func RunVmTest(js string) (failed int) { } for name, test := range tests { - state := state.New(helper.NewTrie()) + db, _ := ethdb.NewMemDatabase() + state := state.New(nil, db) for addr, account := range test.Pre { - obj := StateObjectFromAccount(addr, account) + obj := StateObjectFromAccount(db, addr, account) state.SetStateObject(obj) } -- cgit v1.2.3 From 982c812e81304cad835796d4fa3d67c8f08141b6 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 7 Jan 2015 13:38:28 +0100 Subject: Read directly from stdin --- cmd/ethtest/main.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'cmd/ethtest') diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 7d1c3de01..9e9eda450 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -24,10 +24,10 @@ package main import ( "bytes" "encoding/json" + "io" "io/ioutil" "log" "os" - "strings" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" @@ -65,10 +65,10 @@ type VmTest struct { Pre map[string]Account } -func RunVmTest(js string) (failed int) { +func RunVmTest(r io.Reader) (failed int) { tests := make(map[string]VmTest) - data, _ := ioutil.ReadAll(strings.NewReader(js)) + data, _ := ioutil.ReadAll(r) err := json.Unmarshal(data, &tests) if err != nil { log.Fatalln(err) @@ -125,9 +125,6 @@ func RunVmTest(js string) (failed int) { func main() { helper.Logger.SetLogLevel(5) - if len(os.Args) == 1 { - log.Fatalln("no json supplied") - } - os.Exit(RunVmTest(os.Args[1])) + os.Exit(RunVmTest(os.Stdin)) } -- cgit v1.2.3 From 585f259b63db323c87643a235fcbb9dc46d3125f Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 9 Jan 2015 12:04:54 +0100 Subject: Support input from args --- cmd/ethtest/main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cmd/ethtest') diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 9e9eda450..ac473d58c 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -28,6 +28,7 @@ import ( "io/ioutil" "log" "os" + "strings" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" @@ -126,5 +127,9 @@ func RunVmTest(r io.Reader) (failed int) { func main() { helper.Logger.SetLogLevel(5) - os.Exit(RunVmTest(os.Stdin)) + if len(os.Args) > 1 { + os.Exit(RunVmTest(strings.NewReader(os.Args[1]))) + } else { + os.Exit(RunVmTest(os.Stdin)) + } } -- cgit v1.2.3 From d5d9746ca3b6a4f6f8494cf8d6b89d86a89620c8 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 15 Jan 2015 10:46:42 +0100 Subject: updated tests --- cmd/ethtest/main.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmd/ethtest') diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index ac473d58c..e1c4806ad 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -32,6 +32,7 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/tests/helper" ) @@ -119,6 +120,8 @@ func RunVmTest(r io.Reader) (failed int) { } } } + + logger.Flush() } return -- cgit v1.2.3