Merge branch 'ethereum:master' into portal

This commit is contained in:
Chen Kai 2024-04-29 17:47:17 +08:00 committed by GitHub
commit 1ca1268ee2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -374,7 +374,7 @@ type ChainConfig struct {
type EthashConfig struct{} type EthashConfig struct{}
// String implements the stringer interface, returning the consensus engine details. // String implements the stringer interface, returning the consensus engine details.
func (c *EthashConfig) String() string { func (c EthashConfig) String() string {
return "ethash" return "ethash"
} }
@ -385,8 +385,8 @@ type CliqueConfig struct {
} }
// String implements the stringer interface, returning the consensus engine details. // String implements the stringer interface, returning the consensus engine details.
func (c *CliqueConfig) String() string { func (c CliqueConfig) String() string {
return "clique" return fmt.Sprintf("clique(period: %d, epoch: %d)", c.Period, c.Epoch)
} }
// Description returns a human-readable description of ChainConfig. // Description returns a human-readable description of ChainConfig.