chore: revert rlpgen -internal_methods feature

Author: ARR4N

core/types/block.go

@@ -59,7 +59,7 @@ func (n *BlockNonce) UnmarshalText(input []byte) error {
 }
 
 //go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go
-//go:generate go run ../../rlp/rlpgen -type Header -internal_methods -out gen_header_rlp.go
+//go:generate go run ../../rlp/rlpgen -type Header -out gen_header_rlp.go
 
 // Header represents a block header in the Ethereum blockchain.
 type Header struct {

rlp/rlpgen/gen.go

@@ -35,8 +35,6 @@ type buildContext struct {
 	rawValueType *types.Named
 
 	typeToStructCache map[types.Type]*rlpstruct.Type
-
-	internalMethods bool
 }
 
 func newBuildContext(packageRLP *types.Package) *buildContext {
@@ -100,8 +98,6 @@ type genContext struct {
 	inPackage   *types.Package
 	imports     map[string]struct{}
 	tempCounter int
-
-	internalMethods bool
 }
 
 func newGenContext(inPackage *types.Package) *genContext {
@@ -740,7 +736,7 @@ func generateDecoder(ctx *genContext, typ string, op op) []byte {
 
 	result, code := op.genDecode(ctx)
 	var b bytes.Buffer
-	fmt.Fprintf(&b, "func (obj *%s) %s(dec *rlp.Stream) error {\n", typ, ctx.decoderMethod())
+	fmt.Fprintf(&b, "func (obj *%s) DecodeRLP(dec *rlp.Stream) error {\n", typ)
 	fmt.Fprint(&b, code)
 	fmt.Fprintf(&b, "  *obj = %s\n", result)
 	fmt.Fprintf(&b, "  return nil\n")
@@ -755,7 +751,7 @@ func generateEncoder(ctx *genContext, typ string, op op) []byte {
 	ctx.addImport(pathOfPackageRLP)
 
 	var b bytes.Buffer
-	fmt.Fprintf(&b, "func (obj *%s) %s(_w io.Writer) error {\n", typ, ctx.encoderMethod())
+	fmt.Fprintf(&b, "func (obj *%s) EncodeRLP(_w io.Writer) error {\n", typ)
 	fmt.Fprintf(&b, "  w := rlp.NewEncoderBuffer(_w)\n")
 	fmt.Fprint(&b, op.genWrite(ctx, "obj"))
 	fmt.Fprintf(&b, "  return w.Flush()\n")
@@ -777,7 +773,6 @@ func (bctx *buildContext) generate(typ *types.Named, encoder, decoder bool) ([]b
 		encSource []byte
 		decSource []byte
 	)
-	ctx.internalMethods = bctx.internalMethods
 	if encoder {
 		encSource = generateEncoder(ctx, typ.Obj().Name(), op)
 	}

rlp/rlpgen/gen.libevm.go

@@ -36,7 +36,6 @@ func main() {
 		genEncoder = flag.Bool("encoder", true, "generate EncodeRLP?")
 		genDecoder = flag.Bool("decoder", false, "generate DecodeRLP?")
 		typename   = flag.String("type", "", "type to generate methods for")
-		internal   = flag.Bool("internal_methods", false, "generate internal (lower-case) method names")
 	)
 	flag.Parse()
 
@@ -45,7 +44,6 @@ func main() {
 		Type:            *typename,
 		GenerateEncoder: *genEncoder,
 		GenerateDecoder: *genDecoder,
-		InternalMethods: *internal,
 	}
 	code, err := cfg.process()
 	if err != nil {
@@ -69,8 +67,6 @@ type Config struct {
 
 	GenerateEncoder bool
 	GenerateDecoder bool
-
-	InternalMethods bool
 }
 
 // process generates the Go code.
@@ -105,7 +101,6 @@ func (cfg *Config) process() (code []byte, err error) {
 		}
 	}
 	bctx := newBuildContext(packageRLP)
-	bctx.internalMethods = cfg.InternalMethods
 
 	// Find the type and generate.
 	typ, err := lookupStructType(pkg.Scope(), cfg.Type)