cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb4a97f33f - Show all commits

4
rpc/types.go
View File

@ -69,7 +69,7 @@ const (
) )
// UnmarshalJSON parses the given JSON fragment into a BlockNumber. It supports: // UnmarshalJSON parses the given JSON fragment into a BlockNumber. It supports:
// - "latest", "earliest" or "pending" as string arguments // - "safe", "finalized", "latest", "earliest" or "pending" as string arguments
// - the block number // - the block number
// Returned errors: // Returned errors:
// - an invalid block number error when the given argument isn't a known strings // - an invalid block number error when the given argument isn't a known strings
@ -110,7 +110,7 @@ func (bn *BlockNumber) UnmarshalJSON(data []byte) error {
} }
// MarshalText implements encoding.TextMarshaler. It marshals: // MarshalText implements encoding.TextMarshaler. It marshals:
// - "latest", "earliest" or "pending" as strings // - "safe", "finalized", "latest", "earliest" or "pending" as strings
// - other numbers as hex // - other numbers as hex
func (bn BlockNumber) MarshalText() ([]byte, error) { func (bn BlockNumber) MarshalText() ([]byte, error) {
switch bn { switch bn {