-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
.github/workflows,params/types/genesisT: change Ignore strategy; keep…
… original generated file tracked With the ignore strategy before, we would miss cases where, say, a field was added to the genesis type. Our 'hotpatched' version of the file would overwrite the newly-generated version, and we would not assert that our hotpatched version was 'on top of' the latest generated version. With this change, we generate the interested file (gen_genesis) to a filepath with a .go.orig extension, and track that 'original' version, using it to compare against the 'go generate' output; signalling to us if anything we assume changes. Date: 2023-01-12 07:10:47-08:00 Signed-off-by: meows <[email protected]>
- Loading branch information
Showing
3 changed files
with
126 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // Code generated by github.com/fjl/gencodec. DO NOT EDIT. | ||
|
|
||
| package genesisT | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "errors" | ||
| "math/big" | ||
|
|
||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/common/hexutil" | ||
| "github.com/ethereum/go-ethereum/common/math" | ||
| "github.com/ethereum/go-ethereum/params/types/ctypes" | ||
| ) | ||
|
|
||
| var _ = (*genesisSpecMarshaling)(nil) | ||
|
|
||
| // MarshalJSON marshals as JSON. | ||
| func (g Genesis) MarshalJSON() ([]byte, error) { | ||
| type Genesis struct { | ||
| Config ctypes.ChainConfigurator `json:"config"` | ||
| Nonce math.HexOrDecimal64 `json:"nonce"` | ||
| Timestamp math.HexOrDecimal64 `json:"timestamp"` | ||
| ExtraData hexutil.Bytes `json:"extraData"` | ||
| GasLimit math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"` | ||
| Difficulty *math.HexOrDecimal256 `json:"difficulty" gencodec:"required"` | ||
| Mixhash common.Hash `json:"mixHash"` | ||
| Coinbase common.Address `json:"coinbase"` | ||
| Alloc map[common.UnprefixedAddress]GenesisAccount `json:"alloc" gencodec:"required"` | ||
| Number math.HexOrDecimal64 `json:"number"` | ||
| GasUsed math.HexOrDecimal64 `json:"gasUsed"` | ||
| ParentHash common.Hash `json:"parentHash"` | ||
| BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas"` | ||
| } | ||
| var enc Genesis | ||
| enc.Config = g.Config | ||
| enc.Nonce = math.HexOrDecimal64(g.Nonce) | ||
| enc.Timestamp = math.HexOrDecimal64(g.Timestamp) | ||
| enc.ExtraData = g.ExtraData | ||
| enc.GasLimit = math.HexOrDecimal64(g.GasLimit) | ||
| enc.Difficulty = (*math.HexOrDecimal256)(g.Difficulty) | ||
| enc.Mixhash = g.Mixhash | ||
| enc.Coinbase = g.Coinbase | ||
| if g.Alloc != nil { | ||
| enc.Alloc = make(map[common.UnprefixedAddress]GenesisAccount, len(g.Alloc)) | ||
| for k, v := range g.Alloc { | ||
| enc.Alloc[common.UnprefixedAddress(k)] = v | ||
| } | ||
| } | ||
| enc.Number = math.HexOrDecimal64(g.Number) | ||
| enc.GasUsed = math.HexOrDecimal64(g.GasUsed) | ||
| enc.ParentHash = g.ParentHash | ||
| enc.BaseFee = (*math.HexOrDecimal256)(g.BaseFee) | ||
| return json.Marshal(&enc) | ||
| } | ||
|
|
||
| // UnmarshalJSON unmarshals from JSON. | ||
| func (g *Genesis) UnmarshalJSON(input []byte) error { | ||
| type Genesis struct { | ||
| Config ctypes.ChainConfigurator `json:"config"` | ||
| Nonce *math.HexOrDecimal64 `json:"nonce"` | ||
| Timestamp *math.HexOrDecimal64 `json:"timestamp"` | ||
| ExtraData *hexutil.Bytes `json:"extraData"` | ||
| GasLimit *math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"` | ||
| Difficulty *math.HexOrDecimal256 `json:"difficulty" gencodec:"required"` | ||
| Mixhash *common.Hash `json:"mixHash"` | ||
| Coinbase *common.Address `json:"coinbase"` | ||
| Alloc map[common.UnprefixedAddress]GenesisAccount `json:"alloc" gencodec:"required"` | ||
| Number *math.HexOrDecimal64 `json:"number"` | ||
| GasUsed *math.HexOrDecimal64 `json:"gasUsed"` | ||
| ParentHash *common.Hash `json:"parentHash"` | ||
| BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas"` | ||
| } | ||
| var dec Genesis | ||
| if err := json.Unmarshal(input, &dec); err != nil { | ||
| return err | ||
| } | ||
| if dec.Config != nil { | ||
| g.Config = dec.Config | ||
| } | ||
| if dec.Nonce != nil { | ||
| g.Nonce = uint64(*dec.Nonce) | ||
| } | ||
| if dec.Timestamp != nil { | ||
| g.Timestamp = uint64(*dec.Timestamp) | ||
| } | ||
| if dec.ExtraData != nil { | ||
| g.ExtraData = *dec.ExtraData | ||
| } | ||
| if dec.GasLimit == nil { | ||
| return errors.New("missing required field 'gasLimit' for Genesis") | ||
| } | ||
| g.GasLimit = uint64(*dec.GasLimit) | ||
| if dec.Difficulty == nil { | ||
| return errors.New("missing required field 'difficulty' for Genesis") | ||
| } | ||
| g.Difficulty = (*big.Int)(dec.Difficulty) | ||
| if dec.Mixhash != nil { | ||
| g.Mixhash = *dec.Mixhash | ||
| } | ||
| if dec.Coinbase != nil { | ||
| g.Coinbase = *dec.Coinbase | ||
| } | ||
| if dec.Alloc == nil { | ||
| return errors.New("missing required field 'alloc' for Genesis") | ||
| } | ||
| g.Alloc = make(GenesisAlloc, len(dec.Alloc)) | ||
| for k, v := range dec.Alloc { | ||
| g.Alloc[common.Address(k)] = v | ||
| } | ||
| if dec.Number != nil { | ||
| g.Number = uint64(*dec.Number) | ||
| } | ||
| if dec.GasUsed != nil { | ||
| g.GasUsed = uint64(*dec.GasUsed) | ||
| } | ||
| if dec.ParentHash != nil { | ||
| g.ParentHash = *dec.ParentHash | ||
| } | ||
| if dec.BaseFee != nil { | ||
| g.BaseFee = (*big.Int)(dec.BaseFee) | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters