mirror of
https://github.com/scroll-tech/scroll.git
synced 2026-04-23 03:00:50 -04:00
try work with go 1.19
This commit is contained in:
@@ -71,10 +71,16 @@ func ReadGenesis(genesisPath string) (*core.Genesis, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() {
|
||||
if closeErr := file.Close(); closeErr != nil && err == nil {
|
||||
err = closeErr
|
||||
}
|
||||
}()
|
||||
|
||||
genesis := new(core.Genesis)
|
||||
if err := json.NewDecoder(file).Decode(genesis); err != nil {
|
||||
return nil, errors.Join(err, file.Close())
|
||||
return nil, err
|
||||
}
|
||||
return genesis, file.Close()
|
||||
return genesis, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user