Skip to content

Commit

Permalink
Move erigon-lib/rlp to erigon-lib/rlp2 (#12915)
Browse files Browse the repository at this point in the history
Since the change here : #12879
was too big and had to be reverted since it caused the pectra kurtosis
tests to fail due to rlp errors, I am breaking it down into a sequence
of smaller PRs.

This RP moves `erigon-lib/rlp` to `erigon-lib/rlp2` .


In a next PR I will move `rlp` to `erigon-lib/rlp` .

Co-authored-by: antonis19 <[email protected]>
  • Loading branch information
antonis19 and antonis19 authored Nov 29, 2024
1 parent dd5c46f commit 550d895
Show file tree
Hide file tree
Showing 31 changed files with 22 additions and 1,976 deletions.
2 changes: 1 addition & 1 deletion core/types/access_list_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (

"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/rlp"
)

Expand Down
2 changes: 1 addition & 1 deletion core/types/accounts/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/crypto"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/rlp"
)

Expand Down
2 changes: 1 addition & 1 deletion core/types/authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/length"
"github.com/erigontech/erigon-lib/crypto"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/rlp"
)
Expand Down
2 changes: 1 addition & 1 deletion core/types/blob_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/fixedgas"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/rlp"
)

Expand Down
2 changes: 1 addition & 1 deletion core/types/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/hexutil"
"github.com/erigontech/erigon-lib/common/hexutility"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/rlp"
)
Expand Down
2 changes: 1 addition & 1 deletion core/types/dynamic_fee_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/rlp"
)

Expand Down
2 changes: 1 addition & 1 deletion core/types/legacy_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/rlp"
)

Expand Down
2 changes: 1 addition & 1 deletion core/types/set_code_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/rlp"
)
Expand Down
2 changes: 1 addition & 1 deletion core/types/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/erigontech/erigon-lib/common/math"
libcrypto "github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/log/v3"
rlp2 "github.com/erigontech/erigon-lib/rlp"
rlp2 "github.com/erigontech/erigon-lib/rlp2"
"github.com/erigontech/erigon/rlp"
)

Expand Down
2 changes: 1 addition & 1 deletion erigon-lib/commitment/hex_patricia_hashed.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/length"
"github.com/erigontech/erigon-lib/rlp"
rlp "github.com/erigontech/erigon-lib/rlp2"
)

// keccakState wraps sha3.state. In addition to the usual hash methods, it also supports
Expand Down
2 changes: 1 addition & 1 deletion erigon-lib/crypto/crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"github.com/erigontech/erigon-lib/common/hexutil"
"github.com/erigontech/erigon-lib/common/math"
"github.com/erigontech/erigon-lib/crypto/cryptopool"
"github.com/erigontech/erigon-lib/rlp"
rlp "github.com/erigontech/erigon-lib/rlp2"
)

// SignatureLength indicates the byte length required to carry a signature with recovery id.
Expand Down
284 changes: 0 additions & 284 deletions erigon-lib/rlp/commitment.go

This file was deleted.

Loading

0 comments on commit 550d895

Please sign in to comment.