chore: placate the linter

Author: ARR4N

core/state/state.libevm.go

@@ -27,7 +27,7 @@ import (
 func GetExtra[SA any](s *StateDB, p types.ExtraPayloads[SA], addr common.Address) SA {
 	stateObject := s.getStateObject(addr)
 	if stateObject != nil {
-		return p.FromPayloadCarrier(&stateObject.data)
+		return p.StateAccount.Get(&stateObject.data)
 	}
 	var zero SA
 	return zero
@@ -45,9 +45,9 @@ func setExtraOnObject[SA any](s *stateObject, p types.ExtraPayloads[SA], addr co
 	s.db.journal.append(extraChange[SA]{
 		payloads: p,
 		account:  &addr,
-		prev:     p.FromPayloadCarrier(&s.data),
+		prev:     p.StateAccount.Get(&s.data),
 	})
-	p.SetOnPayloadCarrier(&s.data, extra)
+	p.StateAccount.Set(&s.data, extra)
 }
 
 // extraChange is a [journalEntry] for [SetExtra] / [setExtraOnObject].
@@ -60,5 +60,5 @@ type extraChange[SA any] struct {
 func (e extraChange[SA]) dirtied() *common.Address { return e.account }
 
 func (e extraChange[SA]) revert(s *StateDB) {
-	e.payloads.SetOnPayloadCarrier(&s.getStateObject(*e.account).data, e.prev)
+	e.payloads.StateAccount.Set(&s.getStateObject(*e.account).data, e.prev)
 }

core/state/state.libevm_test.go

@@ -87,7 +87,7 @@ func TestGetSetExtra(t *testing.T) {
 				Root:     types.EmptyRootHash,
 				CodeHash: types.EmptyCodeHash[:],
 			}
-			payloads.SetOnPayloadCarrier(want, extra)
+			payloads.StateAccount.Set(want, extra)
 
 			if diff := cmp.Diff(want, got); diff != "" {
 				t.Errorf("types.FullAccount(%T.Account()) diff (-want +got):\n%s", iter, diff)

core/state/state_object.libevm_test.go

@@ -46,7 +46,7 @@ func TestStateObjectEmpty(t *testing.T) {
 		{
 			name: "explicit false bool",
 			registerAndSet: func(acc *types.StateAccount) {
-				types.RegisterExtras[bool]().SetOnPayloadCarrier(acc, false)
+				types.RegisterExtras[bool]().StateAccount.Set(acc, false)
 			},
 			wantEmpty: true,
 		},
@@ -60,7 +60,7 @@ func TestStateObjectEmpty(t *testing.T) {
 		{
 			name: "true bool",
 			registerAndSet: func(acc *types.StateAccount) {
-				types.RegisterExtras[bool]().SetOnPayloadCarrier(acc, true)
+				types.RegisterExtras[bool]().StateAccount.Set(acc, true)
 			},
 			wantEmpty: false,
 		},

core/types/rlp_payload.libevm.go

@@ -42,7 +42,7 @@ func RegisterExtras[SA any]() ExtraPayloads[SA] {
 	}
 
 	extra := ExtraPayloads[SA]{
-		Account: pseudo.NewAccessor[ExtraPayloadCarrier, SA](
+		StateAccount: pseudo.NewAccessor[ExtraPayloadCarrier, SA](
 			func(a ExtraPayloadCarrier) *pseudo.Type { return a.extra().payload() },
 			func(a ExtraPayloadCarrier, t *pseudo.Type) { a.extra().t = t },
 		),
@@ -91,7 +91,7 @@ func (e *StateAccountExtra) clone() *StateAccountExtra {
 // [StateAccount] and [SlimAccount] structs. The only valid way to construct an
 // instance is by a call to [RegisterExtras].
 type ExtraPayloads[SA any] struct {
-	Account pseudo.Accessor[ExtraPayloadCarrier, SA]
+	StateAccount pseudo.Accessor[ExtraPayloadCarrier, SA] // Also provides [SlimAccount] access.
 }
 
 func (ExtraPayloads[SA]) cloneStateAccount(s *StateAccountExtra) *StateAccountExtra {
@@ -115,9 +115,9 @@ var _ = []ExtraPayloadCarrier{
 
 // FromPayloadCarrier returns the carriers's payload.
 //
-// Deprecated: use the equivalent [ExtraPayloads.Account] method.
+// Deprecated: use the equivalent [ExtraPayloads.StateAccount] method.
 func (e ExtraPayloads[SA]) FromPayloadCarrier(a ExtraPayloadCarrier) SA {
-	return e.Account.Get(a)
+	return e.StateAccount.Get(a)
 }
 
 // PointerFromPayloadCarrier returns a pointer to the carriers's extra payload.
@@ -128,16 +128,16 @@ func (e ExtraPayloads[SA]) FromPayloadCarrier(a ExtraPayloadCarrier) SA {
 // therefore be shared by all copies. If this is not the desired behaviour, use
 // [StateAccount.Copy] or [ExtraPayloads.SetOnPayloadCarrier].
 //
-// Deprecated: use the equivalent [ExtraPayloads.Account] method.
+// Deprecated: use the equivalent [ExtraPayloads.StateAccount] method.
 func (e ExtraPayloads[SA]) PointerFromPayloadCarrier(a ExtraPayloadCarrier) *SA {
-	return e.Account.GetPointer(a)
+	return e.StateAccount.GetPointer(a)
 }
 
 // SetOnPayloadCarrier sets the carriers's payload.
 //
-// Deprecated: use the equivalent [ExtraPayloads.Account] method.
+// Deprecated: use the equivalent [ExtraPayloads.StateAccount] method.
 func (e ExtraPayloads[SA]) SetOnPayloadCarrier(a ExtraPayloadCarrier, val SA) {
-	e.Account.Set(a, val)
+	e.StateAccount.Set(a, val)
 }
 
 // A StateAccountExtra carries the extra payload, if any, registered with

core/types/state_account_storage.libevm_test.go

@@ -63,6 +63,7 @@ func TestStateAccountExtraViaTrieStorage(t *testing.T) {
 		{
 			name: "vanilla geth",
 			registerAndSetExtra: func(a *types.StateAccount) (*types.StateAccount, assertion) {
+				//nolint:thelper // It's more useful if this test failure shows this line instead of its call site
 				return a, func(t *testing.T, got *types.StateAccount) {
 					assert.Truef(t, a.Extra.Equal(nil), "%T.%T.IsEmpty()", a, a.Extra)
 				}
@@ -74,7 +75,7 @@ func TestStateAccountExtraViaTrieStorage(t *testing.T) {
 			registerAndSetExtra: func(a *types.StateAccount) (*types.StateAccount, assertion) {
 				e := types.RegisterExtras[bool]()
 				e.SetOnPayloadCarrier(a, true)
-				return a, func(t *testing.T, got *types.StateAccount) {
+				return a, func(t *testing.T, got *types.StateAccount) { //nolint:thelper
 					assert.Truef(t, e.FromPayloadCarrier(got), "")
 				}
 			},
@@ -85,7 +86,8 @@ func TestStateAccountExtraViaTrieStorage(t *testing.T) {
 			registerAndSetExtra: func(a *types.StateAccount) (*types.StateAccount, assertion) {
 				e := types.RegisterExtras[bool]()
 				e.SetOnPayloadCarrier(a, false) // the explicit part
-				return a, func(t *testing.T, got *types.StateAccount) {
+
+				return a, func(t *testing.T, got *types.StateAccount) { //nolint:thelper
 					assert.Falsef(t, e.FromPayloadCarrier(got), "")
 				}
 			},
@@ -96,7 +98,7 @@ func TestStateAccountExtraViaTrieStorage(t *testing.T) {
 			registerAndSetExtra: func(a *types.StateAccount) (*types.StateAccount, assertion) {
 				e := types.RegisterExtras[bool]()
 				// Note that `a` is reflected, unchanged (the implicit part).
-				return a, func(t *testing.T, got *types.StateAccount) {
+				return a, func(t *testing.T, got *types.StateAccount) { //nolint:thelper
 					assert.Falsef(t, e.FromPayloadCarrier(got), "")
 				}
 			},
@@ -108,7 +110,7 @@ func TestStateAccountExtraViaTrieStorage(t *testing.T) {
 				e := types.RegisterExtras[arbitraryPayload]()
 				p := arbitraryPayload{arbitraryData}
 				e.SetOnPayloadCarrier(a, p)
-				return a, func(t *testing.T, got *types.StateAccount) {
+				return a, func(t *testing.T, got *types.StateAccount) { //nolint:thelper
 					assert.Equalf(t, arbitraryPayload{arbitraryData}, e.FromPayloadCarrier(got), "")
 				}
 			},