Merge remote-tracking branch 'refs/remotes/ethereum/master'

build/ci.go

@@ -217,9 +217,16 @@ func doInstall(cmdline []string) {
 }
 
 func buildFlags(env build.Environment) (flags []string) {
-	// Set gitCommit constant via link-time assignment.
+	var ld []string
 	if env.Commit != "" {
-		flags = append(flags, "-ldflags", "-X main.gitCommit="+env.Commit)
+		ld = append(ld, "-X", "main.gitCommit="+env.Commit)
+	}
+	if runtime.GOOS == "darwin" {
+		ld = append(ld, "-s")
+	}
+
+	if len(ld) > 0 {
+		flags = append(flags, "-ldflags", strings.Join(ld, " "))
 	}
 	return flags
 }
@@ -266,6 +273,7 @@ func doTest(cmdline []string) {
 		coverage = flag.Bool("coverage", false, "Whether to record code coverage")
 	)
 	flag.CommandLine.Parse(cmdline)
+	env := build.Env()
 
 	packages := []string{"./..."}
 	if len(flag.CommandLine.Args()) > 0 {
@@ -279,7 +287,7 @@ func doTest(cmdline []string) {
 		spellcheck(packages)
 	}
 	// Run the actual tests.
-	gotest := goTool("test")
+	gotest := goTool("test", buildFlags(env)...)
 	// Test a single package at a time. CI builders are slow
 	// and some tests run into timeouts under load.
 	gotest.Args = append(gotest.Args, "-p", "1")

core/genesis.go

@@ -58,10 +58,10 @@ type GenesisAlloc map[common.Address]GenesisAccount
 
 // GenesisAccount is an account in the state of the genesis block.
 type GenesisAccount struct {
-	Code    []byte                      `json:"code" optional:"true"`
-	Storage map[common.Hash]common.Hash `json:"storage" optional:"true"`
+	Code    []byte                      `json:"code,omitempty" optional:"true"`
+	Storage map[common.Hash]common.Hash `json:"storage,omitempty" optional:"true"`
 	Balance *big.Int                    `json:"balance"`
-	Nonce   uint64                      `json:"nonce" optional:"true"`
+	Nonce   uint64                      `json:"nonce,omitempty" optional:"true"`
 }
 
 // field type overrides for gencodec