core/vm: rename opSuicide to opSelfdestruct (ethereum#24022)

axic · web-flow · commit 2be129b5cf6b · 2021-12-01T10:33:29.000+01:00
The opcode was renamed in the codebase in 2017, but the functions were kept unchanged.
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -805,7 +805,7 @@ func opStop(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byt
 	return nil, errStopToken
 }
 
-func opSuicide(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
+func opSelfdestruct(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
 	if interpreter.readOnly {
 		return nil, ErrWriteProtection
 	}
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
@@ -996,7 +996,7 @@ func newFrontierInstructionSet() JumpTable {
 			memorySize: memoryReturn,
 		},
 		SELFDESTRUCT: {
-			execute:    opSuicide,
+			execute:    opSelfdestruct,
 			dynamicGas: gasSelfdestruct,
 			minStack:   minStack(1, 0),
 			maxStack:   maxStack(1, 0),

Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ func opStop(pc uint64, interpreter EVMInterpreter, scope *ScopeContext) ([]byt`
`805`	`805`	`return nil, errStopToken`
`806`	`806`	`}`
`807`	`807`
`808`		`-func opSuicide(pc uint64, interpreter EVMInterpreter, scope *ScopeContext) ([]byte, error) {`
	`808`	`+func opSelfdestruct(pc uint64, interpreter EVMInterpreter, scope *ScopeContext) ([]byte, error) {`
`809`	`809`	`if interpreter.readOnly {`
`810`	`810`	`return nil, ErrWriteProtection`
`811`	`811`	`}`