diff options
Diffstat (limited to 'console/console_test.go')
| -rw-r--r-- | console/console_test.go | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/console/console_test.go b/console/console_test.go index 8ac499bd1..7b1629c03 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -27,6 +27,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/internal/jsre" @@ -67,6 +68,7 @@ func (p *hookedPrompter) PromptConfirm(prompt string) (bool, error) { } func (p *hookedPrompter) SetHistory(history []string) {} func (p *hookedPrompter) AppendHistory(command string) {} +func (p *hookedPrompter) ClearHistory() {} func (p *hookedPrompter) SetWordCompleter(completer WordCompleter) {} // tester is a console test environment for the console tests to operate on. @@ -94,9 +96,11 @@ func newTester(t *testing.T, confOverride func(*eth.Config)) *tester { t.Fatalf("failed to create node: %v", err) } ethConf := ð.Config{ - Genesis: core.DevGenesisBlock(), + Genesis: core.DeveloperGenesisBlock(15, common.Address{}), Etherbase: common.HexToAddress(testAddress), - PowTest: true, + Ethash: ethash.Config{ + PowMode: ethash.ModeTest, + }, } if confOverride != nil { confOverride(ethConf) @@ -160,7 +164,7 @@ func TestWelcome(t *testing.T) { tester.console.Welcome() - output := string(tester.output.Bytes()) + output := tester.output.String() if want := "Welcome"; !strings.Contains(output, want) { t.Fatalf("console output missing welcome message: have\n%s\nwant also %s", output, want) } @@ -184,7 +188,7 @@ func TestEvaluate(t *testing.T) { defer tester.Close(t) tester.console.Evaluate("2 + 2") - if output := string(tester.output.Bytes()); !strings.Contains(output, "4") { + if output := tester.output.String(); !strings.Contains(output, "4") { t.Fatalf("statement evaluation failed: have %s, want %s", output, "4") } } @@ -214,7 +218,7 @@ func TestInteractive(t *testing.T) { case <-time.After(time.Second): t.Fatalf("secondary prompt timeout") } - if output := string(tester.output.Bytes()); !strings.Contains(output, "4") { + if output := tester.output.String(); !strings.Contains(output, "4") { t.Fatalf("statement evaluation failed: have %s, want %s", output, "4") } } @@ -226,7 +230,7 @@ func TestPreload(t *testing.T) { defer tester.Close(t) tester.console.Evaluate("preloaded") - if output := string(tester.output.Bytes()); !strings.Contains(output, "some-preloaded-string") { + if output := tester.output.String(); !strings.Contains(output, "some-preloaded-string") { t.Fatalf("preloaded variable missing: have %s, want %s", output, "some-preloaded-string") } } @@ -239,7 +243,7 @@ func TestExecute(t *testing.T) { tester.console.Execute("exec.js") tester.console.Evaluate("execed") - if output := string(tester.output.Bytes()); !strings.Contains(output, "some-executed-string") { + if output := tester.output.String(); !strings.Contains(output, "some-executed-string") { t.Fatalf("execed variable missing: have %s, want %s", output, "some-executed-string") } } @@ -271,7 +275,7 @@ func TestPrettyPrint(t *testing.T) { string: ` + two + ` } ` - if output := string(tester.output.Bytes()); output != want { + if output := tester.output.String(); output != want { t.Fatalf("pretty print mismatch: have %s, want %s", output, want) } } @@ -283,7 +287,7 @@ func TestPrettyError(t *testing.T) { tester.console.Evaluate("throw 'hello'") want := jsre.ErrorColor("hello") + "\n" - if output := string(tester.output.Bytes()); output != want { + if output := tester.output.String(); output != want { t.Fatalf("pretty error mismatch: have %s, want %s", output, want) } } |