From 29166f0fc84708f8efd9a131bcb46e2616f6d739 Mon Sep 17 00:00:00 2001 From: Jonathan Oppenheimer <147infiniti@gmail.com> Date: Fri, 12 Dec 2025 16:11:23 -0500 Subject: [PATCH] refactor: move `pseudo` to `internal` (#250) ## Why this should be merged the `pseudo` package should not be used outside of libevm. Moving it to internal enforces this. ## How this was tested CI --- core/state/state.libevm.go | 2 +- core/types/block.go | 2 +- core/types/block.libevm.go | 2 +- core/types/block.libevm_test.go | 2 +- core/types/rlp_payload.libevm.go | 2 +- core/types/state_account.libevm_test.go | 2 +- {libevm => internal/libevm}/pseudo/accessor.go | 0 {libevm => internal/libevm}/pseudo/constructor.go | 0 {libevm => internal/libevm}/pseudo/constructor_test.go | 0 {libevm => internal/libevm}/pseudo/fmt.go | 0 {libevm => internal/libevm}/pseudo/fmt_test.go | 0 {libevm => internal/libevm}/pseudo/reflect.go | 0 {libevm => internal/libevm}/pseudo/rlp_test.go | 2 +- {libevm => internal/libevm}/pseudo/type.go | 0 {libevm => internal/libevm}/pseudo/type_test.go | 0 params/config.go | 2 +- params/config.libevm.go | 2 +- params/config.libevm_test.go | 2 +- params/json.libevm_test.go | 2 +- 19 files changed, 11 insertions(+), 11 deletions(-) rename {libevm => internal/libevm}/pseudo/accessor.go (100%) rename {libevm => internal/libevm}/pseudo/constructor.go (100%) rename {libevm => internal/libevm}/pseudo/constructor_test.go (100%) rename {libevm => internal/libevm}/pseudo/fmt.go (100%) rename {libevm => internal/libevm}/pseudo/fmt_test.go (100%) rename {libevm => internal/libevm}/pseudo/reflect.go (100%) rename {libevm => internal/libevm}/pseudo/rlp_test.go (98%) rename {libevm => internal/libevm}/pseudo/type.go (100%) rename {libevm => internal/libevm}/pseudo/type_test.go (100%) diff --git a/core/state/state.libevm.go b/core/state/state.libevm.go index 369fea975b..136c105f3a 100644 --- a/core/state/state.libevm.go +++ b/core/state/state.libevm.go @@ -19,7 +19,7 @@ package state import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/types" - "github.com/ava-labs/libevm/libevm/pseudo" + "github.com/ava-labs/libevm/internal/libevm/pseudo" ) // GetExtra returns the extra payload from the [types.StateAccount] associated diff --git a/core/types/block.go b/core/types/block.go index 95d0df68f7..a065961fdf 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -28,7 +28,7 @@ import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" - "github.com/ava-labs/libevm/libevm/pseudo" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/rlp" ) diff --git a/core/types/block.libevm.go b/core/types/block.libevm.go index 4b83dac8c2..fd460ca638 100644 --- a/core/types/block.libevm.go +++ b/core/types/block.libevm.go @@ -20,7 +20,7 @@ import ( "encoding/json" "io" - "github.com/ava-labs/libevm/libevm/pseudo" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/rlp" ) diff --git a/core/types/block.libevm_test.go b/core/types/block.libevm_test.go index 5a7b1752a5..1a9eb7a110 100644 --- a/core/types/block.libevm_test.go +++ b/core/types/block.libevm_test.go @@ -30,8 +30,8 @@ import ( . "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/libevm/ethtest" - "github.com/ava-labs/libevm/libevm/pseudo" "github.com/ava-labs/libevm/rlp" ) diff --git a/core/types/rlp_payload.libevm.go b/core/types/rlp_payload.libevm.go index f72790ad35..21545f4e6b 100644 --- a/core/types/rlp_payload.libevm.go +++ b/core/types/rlp_payload.libevm.go @@ -21,8 +21,8 @@ import ( "io" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/libevm" - "github.com/ava-labs/libevm/libevm/pseudo" "github.com/ava-labs/libevm/libevm/register" "github.com/ava-labs/libevm/libevm/testonly" "github.com/ava-labs/libevm/log" diff --git a/core/types/state_account.libevm_test.go b/core/types/state_account.libevm_test.go index a7b699c7f8..7f2cffda34 100644 --- a/core/types/state_account.libevm_test.go +++ b/core/types/state_account.libevm_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" "github.com/ava-labs/libevm/common" - "github.com/ava-labs/libevm/libevm/pseudo" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/rlp" ) diff --git a/libevm/pseudo/accessor.go b/internal/libevm/pseudo/accessor.go similarity index 100% rename from libevm/pseudo/accessor.go rename to internal/libevm/pseudo/accessor.go diff --git a/libevm/pseudo/constructor.go b/internal/libevm/pseudo/constructor.go similarity index 100% rename from libevm/pseudo/constructor.go rename to internal/libevm/pseudo/constructor.go diff --git a/libevm/pseudo/constructor_test.go b/internal/libevm/pseudo/constructor_test.go similarity index 100% rename from libevm/pseudo/constructor_test.go rename to internal/libevm/pseudo/constructor_test.go diff --git a/libevm/pseudo/fmt.go b/internal/libevm/pseudo/fmt.go similarity index 100% rename from libevm/pseudo/fmt.go rename to internal/libevm/pseudo/fmt.go diff --git a/libevm/pseudo/fmt_test.go b/internal/libevm/pseudo/fmt_test.go similarity index 100% rename from libevm/pseudo/fmt_test.go rename to internal/libevm/pseudo/fmt_test.go diff --git a/libevm/pseudo/reflect.go b/internal/libevm/pseudo/reflect.go similarity index 100% rename from libevm/pseudo/reflect.go rename to internal/libevm/pseudo/reflect.go diff --git a/libevm/pseudo/rlp_test.go b/internal/libevm/pseudo/rlp_test.go similarity index 98% rename from libevm/pseudo/rlp_test.go rename to internal/libevm/pseudo/rlp_test.go index 91bfafec0f..c581e6606a 100644 --- a/libevm/pseudo/rlp_test.go +++ b/internal/libevm/pseudo/rlp_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "github.com/ava-labs/libevm/core/types" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/libevm/ethtest" - "github.com/ava-labs/libevm/libevm/pseudo" "github.com/ava-labs/libevm/rlp" ) diff --git a/libevm/pseudo/type.go b/internal/libevm/pseudo/type.go similarity index 100% rename from libevm/pseudo/type.go rename to internal/libevm/pseudo/type.go diff --git a/libevm/pseudo/type_test.go b/internal/libevm/pseudo/type_test.go similarity index 100% rename from libevm/pseudo/type_test.go rename to internal/libevm/pseudo/type_test.go diff --git a/params/config.go b/params/config.go index 4690569f61..625cf0b76d 100644 --- a/params/config.go +++ b/params/config.go @@ -21,7 +21,7 @@ import ( "math/big" "github.com/ava-labs/libevm/common" - "github.com/ava-labs/libevm/libevm/pseudo" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/params/forks" ) diff --git a/params/config.libevm.go b/params/config.libevm.go index 0cbae661a2..2ce1330f1c 100644 --- a/params/config.libevm.go +++ b/params/config.libevm.go @@ -21,8 +21,8 @@ import ( "math/big" "reflect" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/libevm" - "github.com/ava-labs/libevm/libevm/pseudo" "github.com/ava-labs/libevm/libevm/register" "github.com/ava-labs/libevm/log" ) diff --git a/params/config.libevm_test.go b/params/config.libevm_test.go index a9b82b446f..831dc705d4 100644 --- a/params/config.libevm_test.go +++ b/params/config.libevm_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/ava-labs/libevm/internal/libevm/pseudo" "github.com/ava-labs/libevm/libevm" - "github.com/ava-labs/libevm/libevm/pseudo" "github.com/ava-labs/libevm/libevm/register" ) diff --git a/params/json.libevm_test.go b/params/json.libevm_test.go index 18fe1ffbfb..6595847b46 100644 --- a/params/json.libevm_test.go +++ b/params/json.libevm_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ava-labs/libevm/libevm/pseudo" + "github.com/ava-labs/libevm/internal/libevm/pseudo" ) type nestedChainConfigExtra struct {