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
2 changed files with 0 additions and 10 deletions
Showing only changes of commit 2c5798464e - Show all commits

View File

@ -17,19 +17,10 @@
package common package common
import ( import (
"fmt"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
) )
// MakeName creates a node name that follows the ethereum convention
// for such names. It adds the operation system name and Go runtime version
// the name.
func MakeName(name, version string) string {
return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version())
}
// FileExist checks if a file exists at filePath. // FileExist checks if a file exists at filePath.
func FileExist(filePath string) bool { func FileExist(filePath string) bool {
_, err := os.Stat(filePath) _, err := os.Stat(filePath)

View File

@ -94,7 +94,6 @@ type Config struct {
DiscoveryV5 bool `toml:",omitempty"` DiscoveryV5 bool `toml:",omitempty"`
// Name sets the node name of this server. // Name sets the node name of this server.
// Use common.MakeName to create a name that follows existing conventions.
Name string `toml:"-"` Name string `toml:"-"`
// BootstrapNodes are used to establish connectivity // BootstrapNodes are used to establish connectivity