forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd/era: fix rebase errors

Browse source
This commit is contained in:
lightclient 2024-01-29 08:26:50 -07:00
parent e9cb2074d3
commit 2a4cbda115
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/era/main.go
View file

@ -121,10 +121,7 @@ func block(ctx *cli.Context) error {
return fmt.Errorf("error reading block %d: %w", num, err) return fmt.Errorf("error reading block %d: %w", num, err)
} }
// Convert block to JSON and print. // Convert block to JSON and print.
val, err := ethapi.RPCMarshalBlock(block, ctx.Bool(txsFlag.Name), ctx.Bool(txsFlag.Name), params.MainnetChainConfig) val := ethapi.RPCMarshalBlock(block, ctx.Bool(txsFlag.Name), ctx.Bool(txsFlag.Name), params.MainnetChainConfig)
if err != nil {
return fmt.Errorf("error marshaling json: %w", err)
}
b, err := json.MarshalIndent(val, "", " ") b, err := json.MarshalIndent(val, "", " ")
if err != nil { if err != nil {
return fmt.Errorf("error marshaling json: %w", err) return fmt.Errorf("error marshaling json: %w", err)

2
cmd/utils/history_test.go
View file

@ -170,7 +170,7 @@ func TestHistoryImportAndExport(t *testing.T) {
db2.Close() db2.Close()
}) })
genesis.MustCommit(db2) genesis.MustCommit(db2, trie.NewDatabase(db, trie.HashDefaults))
imported, err := core.NewBlockChain(db2, nil, genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil) imported, err := core.NewBlockChain(db2, nil, genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
if err != nil { if err != nil {
t.Fatalf("unable to initialize chain: %v", err) t.Fatalf("unable to initialize chain: %v", err)