Hand edits in anticipation of the new auto-gen code

sdk/go/abis.go

@@ -55,7 +55,6 @@ func abisParseFunc(target interface{}, key, value string) (bool, error) {
 	}
 
 	// No enums
-
 	// EXISTING_CODE
 	if key == "proxyFor" {
 		opts, _ := target.(*AbisOptions)
@@ -78,4 +77,3 @@ func GetAbisOptions(args []string) (*AbisOptions, error) {
 }
 
 // No enums
-

sdk/go/blocks.go

@@ -66,8 +66,7 @@ func blocksParseFunc(target interface{}, key, value string) (bool, error) {
 		return false, fmt.Errorf("parseFunc(blocks): target is not of correct type")
 	}
 
-	switch key {
-	case "flow":
+	if key == "flow" {
 		var err error
 		values := strings.Split(value, ",")
 		if opts.Flow, err = enumFromBlocksFlow(values); err != nil {
@@ -96,8 +95,8 @@ func GetBlocksOptions(args []string) (*BlocksOptions, error) {
 type BlocksFlow int
 
 const (
-	NoBF BlocksFlow = 0
-	BFFrom = 1 << iota
+	NoBF   BlocksFlow = 0
+	BFFrom            = 1 << iota
 	BFTo
 	BFReward
 )
@@ -109,8 +108,8 @@ func (v BlocksFlow) String() string {
 	}
 
 	var m = map[BlocksFlow]string{
-		BFFrom: "from",
-		BFTo: "to",
+		BFFrom:   "from",
+		BFTo:     "to",
 		BFReward: "reward",
 	}
 
@@ -145,4 +144,3 @@ func enumFromBlocksFlow(values []string) (BlocksFlow, error) {
 
 	return result, nil
 }
-

sdk/go/chunks.go

@@ -69,8 +69,7 @@ func chunksParseFunc(target interface{}, key, value string) (bool, error) {
 		return false, fmt.Errorf("parseFunc(chunks): target is not of correct type")
 	}
 
-	switch key {
-	case "mode":
+	if key == "mode" {
 		var err error
 		values := strings.Split(value, ",")
 		if opts.Mode, err = enumFromChunksMode(values); err != nil {
@@ -99,8 +98,8 @@ func GetChunksOptions(args []string) (*ChunksOptions, error) {
 type ChunksMode int
 
 const (
-	NoCM2 ChunksMode = 0
-	CMManifest = 1 << iota
+	NoCHM      ChunksMode = 0
+	CMManifest            = 1 << iota
 	CMIndex
 	CMBlooms
 	CMPins
@@ -111,18 +110,18 @@ const (
 
 func (v ChunksMode) String() string {
 	switch v {
-	case NoCM2:
+	case NoCHM:
 		return "none"
 	}
 
 	var m = map[ChunksMode]string{
-		CMManifest: "manifest",
-		CMIndex: "index",
-		CMBlooms: "blooms",
-		CMPins: "pins",
-		CMAddresses: "addresses",
+		CMManifest:    "manifest",
+		CMIndex:       "index",
+		CMBlooms:      "blooms",
+		CMPins:        "pins",
+		CMAddresses:   "addresses",
 		CMAppearances: "appearances",
-		CMStats: "stats",
+		CMStats:       "stats",
 	}
 
 	var ret []string
@@ -137,7 +136,7 @@ func (v ChunksMode) String() string {
 
 func enumFromChunksMode(values []string) (ChunksMode, error) {
 	if len(values) == 0 {
-		return NoCM2, fmt.Errorf("no value provided for mode option")
+		return NoCHM, fmt.Errorf("no value provided for mode option")
 	}
 
 	var result ChunksMode
@@ -158,10 +157,9 @@ func enumFromChunksMode(values []string) (ChunksMode, error) {
 		case "stats":
 			result |= CMStats
 		default:
-			return NoCM2, fmt.Errorf("unknown mode: %s", val)
+			return NoCHM, fmt.Errorf("unknown mode: %s", val)
 		}
 	}
 
 	return result, nil
 }
-

sdk/go/config.go

@@ -50,8 +50,7 @@ func configParseFunc(target interface{}, key, value string) (bool, error) {
 		return false, fmt.Errorf("parseFunc(config): target is not of correct type")
 	}
 
-	switch key {
-	case "mode":
+	if key == "mode" {
 		var err error
 		values := strings.Split(value, ",")
 		if opts.Mode, err = enumFromConfigMode(values); err != nil {
@@ -80,14 +79,14 @@ func GetConfigOptions(args []string) (*ConfigOptions, error) {
 type ConfigMode int
 
 const (
-	NoCM1 ConfigMode = 0
-	CMShow = 1 << iota
+	NoCOM  ConfigMode = 0
+	CMShow            = 1 << iota
 	CMEdit
 )
 
 func (v ConfigMode) String() string {
 	switch v {
-	case NoCM1:
+	case NoCOM:
 		return "none"
 	}
 
@@ -108,7 +107,7 @@ func (v ConfigMode) String() string {
 
 func enumFromConfigMode(values []string) (ConfigMode, error) {
 	if len(values) == 0 {
-		return NoCM1, fmt.Errorf("no value provided for mode option")
+		return NoCOM, fmt.Errorf("no value provided for mode option")
 	}
 
 	var result ConfigMode
@@ -119,10 +118,9 @@ func enumFromConfigMode(values []string) (ConfigMode, error) {
 		case "edit":
 			result |= CMEdit
 		default:
-			return NoCM1, fmt.Errorf("unknown mode: %s", val)
+			return NoCOM, fmt.Errorf("unknown mode: %s", val)
 		}
 	}
 
 	return result, nil
 }
-

sdk/go/export.go

@@ -79,8 +79,7 @@ func exportParseFunc(target interface{}, key, value string) (bool, error) {
 		return false, fmt.Errorf("parseFunc(export): target is not of correct type")
 	}
 
-	switch key {
-	case "flow":
+	if key == "flow" {
 		var err error
 		values := strings.Split(value, ",")
 		if opts.Flow, err = enumFromExportFlow(values); err != nil {
@@ -110,7 +109,7 @@ type ExportFlow int
 
 const (
 	NoEF ExportFlow = 0
-	EFIn = 1 << iota
+	EFIn            = 1 << iota
 	EFOut
 	EFZero
 )
@@ -122,8 +121,8 @@ func (v ExportFlow) String() string {
 	}
 
 	var m = map[ExportFlow]string{
-		EFIn: "in",
-		EFOut: "out",
+		EFIn:   "in",
+		EFOut:  "out",
 		EFZero: "zero",
 	}
 
@@ -158,4 +157,3 @@ func enumFromExportFlow(values []string) (ExportFlow, error) {
 
 	return result, nil
 }
-

sdk/go/init.go

@@ -54,7 +54,6 @@ func initParseFunc(target interface{}, key, value string) (bool, error) {
 	}
 
 	// No enums
-
 	// EXISTING_CODE
 	// EXISTING_CODE
 
@@ -72,4 +71,3 @@ func GetInitOptions(args []string) (*InitOptions, error) {
 }
 
 // No enums
-

sdk/go/list.go

@@ -61,7 +61,6 @@ func listParseFunc(target interface{}, key, value string) (bool, error) {
 	}
 
 	// No enums
-
 	// EXISTING_CODE
 	// EXISTING_CODE
 
@@ -79,4 +78,3 @@ func GetListOptions(args []string) (*ListOptions, error) {
 }
 
 // No enums
-

sdk/go/logs.go

@@ -52,7 +52,6 @@ func logsParseFunc(target interface{}, key, value string) (bool, error) {
 	}
 
 	// No enums
-
 	// EXISTING_CODE
 	// EXISTING_CODE
 
@@ -70,4 +69,3 @@ func GetLogsOptions(args []string) (*LogsOptions, error) {
 }
 
 // No enums
-

sdk/go/monitors.go

@@ -60,7 +60,6 @@ func monitorsParseFunc(target interface{}, key, value string) (bool, error) {
 	}
 
 	// No enums
-
 	// EXISTING_CODE
 	// EXISTING_CODE
 
@@ -78,4 +77,3 @@ func GetMonitorsOptions(args []string) (*MonitorsOptions, error) {
 }
 
 // No enums
-

sdk/go/names.go

@@ -66,7 +66,6 @@ func namesParseFunc(target interface{}, key, value string) (bool, error) {
 	}
 
 	// No enums
-
 	// EXISTING_CODE
 	// EXISTING_CODE
 
@@ -84,4 +83,3 @@ func GetNamesOptions(args []string) (*NamesOptions, error) {
 }
 
 // No enums
-

sdk/go/receipts.go

@@ -50,7 +50,6 @@ func receiptsParseFunc(target interface{}, key, value string) (bool, error) {
 	}
 
 	// No enums
-
 	// EXISTING_CODE
 	// EXISTING_CODE
 
@@ -68,4 +67,3 @@ func GetReceiptsOptions(args []string) (*ReceiptsOptions, error) {
 }
 
 // No enums
-

sdk/go/scrape.go

@@ -73,4 +73,3 @@ func GetScrapeOptions(args []string) (*ScrapeOptions, error) {
 }
 
 // No enums
-

sdk/go/slurp.go

@@ -58,16 +58,16 @@ func slurpParseFunc(target interface{}, key, value string) (bool, error) {
 		return false, fmt.Errorf("parseFunc(slurp): target is not of correct type")
 	}
 
-	switch key {
-	case "types":
+	if key == "types" {
 		var err error
 		values := strings.Split(value, ",")
 		if opts.Types, err = enumFromSlurpTypes(values); err != nil {
 			return false, err
 		} else {
 			found = true
 		}
-	case "source":
+	}
+	if key == "source" {
 		var err error
 		values := strings.Split(value, ",")
 		if opts.Source, err = enumFromSlurpSource(values); err != nil {
@@ -96,17 +96,17 @@ func GetSlurpOptions(args []string) (*SlurpOptions, error) {
 type SlurpTypes int
 
 const (
-	NoST SlurpTypes = 0
-	STExt = 1 << iota
+	NoST  SlurpTypes = 0
+	STExt            = 1 << iota
 	STInt
 	STToken
 	STNfts
 	ST1155
 	STMiner
 	STUncles
 	STWithdrawals
-	STSome = STExt | STInt | STToken | STNfts | ST1155
-	STAll = STExt | STInt | STToken | STNfts | ST1155 | STMiner | STUncles | STWithdrawals
+	STSome = STExt | STInt | STToken | STNfts
+	STAll  = STExt | STInt | STToken | STNfts | ST1155 | STMiner | STUncles | STWithdrawals
 )
 
 func (v SlurpTypes) String() string {
@@ -120,13 +120,13 @@ func (v SlurpTypes) String() string {
 	}
 
 	var m = map[SlurpTypes]string{
-		STExt: "ext",
-		STInt: "int",
-		STToken: "token",
-		STNfts: "nfts",
-		ST1155: "1155",
-		STMiner: "miner",
-		STUncles: "uncles",
+		STExt:         "ext",
+		STInt:         "int",
+		STToken:       "token",
+		STNfts:        "nfts",
+		ST1155:        "1155",
+		STMiner:       "miner",
+		STUncles:      "uncles",
 		STWithdrawals: "withdrawals",
 	}
 
@@ -181,8 +181,8 @@ func enumFromSlurpTypes(values []string) (SlurpTypes, error) {
 type SlurpSource int
 
 const (
-	NoSS SlurpSource = 0
-	SSEtherscan = 1 << iota
+	NoSS        SlurpSource = 0
+	SSEtherscan             = 1 << iota
 	SSKey
 )
 
@@ -194,7 +194,7 @@ func (v SlurpSource) String() string {
 
 	var m = map[SlurpSource]string{
 		SSEtherscan: "etherscan",
-		SSKey: "key",
+		SSKey:       "key",
 	}
 
 	var ret []string
@@ -226,4 +226,3 @@ func enumFromSlurpSource(values []string) (SlurpSource, error) {
 
 	return result, nil
 }
-