mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-21 14:14:30 +00:00
3ab3cd2c2b
## Why this should be merged Support for configurable `core/types.Block` with RLP encoding, including interplay with `Body`. ## How this works `Block` doesn't export most of its fields so relies on an internal type, `extblock`, for RLP encoding. This type is modified to implement the `rlp.Encoder` and `Decoder` methods as a point to inject hooks using `rlp.Fields` (as in #120 for `Body`). `Block` shares the same registered extra type as `Body`. Unlike `Header`, which has its own field in a `Block`, the fields in `Body` are promoted to be carried directly. This suggests that (at least for pure data payloads) the modifications might be equivalent (and `ava-labs/coreth` evidences this). Should different payloads be absolutely required in the future, we can split the types—the `RegisterExtras` signature is already too verbose though 😢. ## How this was tested Explicit inclusion of a backwards-compatibility test for `NOOPBlockBodyHooks` + implicit testing via the multiple upstream tests in `block_test.go`. Re implicit testing: default behaviour is now to use the noop hooks even when no registration is performed, but if we change this then the tests in `block_test.go` can still be called as subtests from a test that explicitly registers noops. --------- Signed-off-by: Arran Schlosberg <519948+ARR4N@users.noreply.github.com> Co-authored-by: Quentin McGaw <quentin.mcgaw@avalabs.org>
91 lines
2.6 KiB
Go
91 lines
2.6 KiB
Go
// Copyright 2024 the libevm authors.
|
|
//
|
|
// The libevm additions to go-ethereum are free software: you can redistribute
|
|
// them and/or modify them under the terms of the GNU Lesser General Public License
|
|
// as published by the Free Software Foundation, either version 3 of the License,
|
|
// or (at your option) any later version.
|
|
//
|
|
// The libevm additions are distributed in the hope that they will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
|
|
// General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
package state
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/ava-labs/libevm/common"
|
|
"github.com/ava-labs/libevm/core/types"
|
|
)
|
|
|
|
func TestStateObjectEmpty(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
registerAndSet func(*types.StateAccount)
|
|
wantEmpty bool
|
|
}{
|
|
{
|
|
name: "no registered types.StateAccount extra payload",
|
|
registerAndSet: func(*types.StateAccount) {},
|
|
wantEmpty: true,
|
|
},
|
|
{
|
|
name: "erroneously non-nil types.StateAccountExtra when no registered payload",
|
|
registerAndSet: func(acc *types.StateAccount) {
|
|
acc.Extra = &types.StateAccountExtra{}
|
|
},
|
|
wantEmpty: true,
|
|
},
|
|
{
|
|
name: "explicit false bool",
|
|
registerAndSet: func(acc *types.StateAccount) {
|
|
types.RegisterExtras[
|
|
types.NOOPHeaderHooks, *types.NOOPHeaderHooks,
|
|
types.NOOPBlockBodyHooks, *types.NOOPBlockBodyHooks,
|
|
bool,
|
|
]().StateAccount.Set(acc, false)
|
|
},
|
|
wantEmpty: true,
|
|
},
|
|
{
|
|
name: "implicit false bool",
|
|
registerAndSet: func(*types.StateAccount) {
|
|
types.RegisterExtras[
|
|
types.NOOPHeaderHooks, *types.NOOPHeaderHooks,
|
|
types.NOOPBlockBodyHooks, *types.NOOPBlockBodyHooks,
|
|
bool,
|
|
]()
|
|
},
|
|
wantEmpty: true,
|
|
},
|
|
{
|
|
name: "true bool",
|
|
registerAndSet: func(acc *types.StateAccount) {
|
|
types.RegisterExtras[
|
|
types.NOOPHeaderHooks, *types.NOOPHeaderHooks,
|
|
types.NOOPBlockBodyHooks, *types.NOOPBlockBodyHooks,
|
|
bool,
|
|
]().StateAccount.Set(acc, true)
|
|
},
|
|
wantEmpty: false,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
types.TestOnlyClearRegisteredExtras()
|
|
t.Cleanup(types.TestOnlyClearRegisteredExtras)
|
|
|
|
obj := newObject(nil, common.Address{}, nil)
|
|
tt.registerAndSet(&obj.data)
|
|
require.Equalf(t, tt.wantEmpty, obj.empty(), "%T.empty()", obj)
|
|
})
|
|
}
|
|
}
|