Skip to content

Commit ce22cd7

Browse files
gballetgballet
committed
cast vm instructions to bytes
1 parent 6eb183a commit ce22cd7

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎core/state_processor_test.go‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -885,33 +885,33 @@ func TestProcessVerklExtCodeHashOpcode(t *testing.T) {
885885
config.ChainID.SetUint64(69421)
886886

887887
dummyContract := []byte{
888-
0x60, 2, // PUSH1 2
889-
0x60, 12, // PUSH1 12
890-
0x60, 0x00, // PUSH1 0
891-
0x39, // CODECOPY
888+
byte(vm.PUSH1), 2,
889+
byte(vm.PUSH1), 12,
890+
byte(vm.PUSH1), 0x00,
891+
byte(vm.CODECOPY),
892892

893-
0x60, 2, // PUSH1 2
894-
0x60, 0x00, // PUSH1 0
895-
0xF3, // RETURN
893+
byte(vm.PUSH1), 2, // PUSH1 2
894+
byte(vm.PUSH1), 0x00, // PUSH1 0
895+
byte(vm.RETURN),
896896

897897
// Contract that auto-calls EXTCODEHASH
898-
0x60, 42, // PUSH1 42
898+
byte(vm.PUSH1), 42, // PUSH1 42
899899
}
900900
dummyContractAddr := common.HexToAddress("3a220f351252089d385b29beca14e27f204c296a")
901901
extCodeHashContract := []byte{
902-
0x60, 22, // PUSH1 22
903-
0x60, 12, // PUSH1 12
904-
0x60, 0x00, // PUSH1 0
905-
0x39, // CODECOPY
902+
byte(vm.PUSH1), 22, // PUSH1 22
903+
byte(vm.PUSH1), 12, // PUSH1 12
904+
byte(vm.PUSH1), 0x00, // PUSH1 0
905+
byte(vm.CODECOPY),
906906

907-
0x60, 22, // PUSH1 22
908-
0x60, 0x00, // PUSH1 0
909-
0xF3, // RETURN
907+
byte(vm.PUSH1), 22, // PUSH1 22
908+
byte(vm.PUSH1), 0x00, // PUSH1 0
909+
byte(vm.RETURN),
910910

911911
// Contract that auto-calls EXTCODEHASH
912-
0x73, // PUSH20
912+
byte(vm.PUSH20),
913913
0x3a, 0x22, 0x0f, 0x35, 0x12, 0x52, 0x08, 0x9d, 0x38, 0x5b, 0x29, 0xbe, 0xca, 0x14, 0xe2, 0x7f, 0x20, 0x4c, 0x29, 0x6a,
914-
0x3F, // EXTCODEHASH
914+
byte(vm.EXTCODEHASH),
915915
}
916916
extCodeHashContractAddr := common.HexToAddress("db7d6ab1f17c6b31909ae466702703daef9269cf")
917917
_, _, _, _, statediffs := GenerateVerkleChainWithGenesis(gspec, beacon.New(ethash.NewFaker()), 2, func(i int, gen *BlockGen) {
@@ -997,9 +997,9 @@ func TestProcessVerkleBalanceOpcode(t *testing.T) {
997997
_, _, _, _, statediffs := GenerateVerkleChainWithGenesis(gspec, beacon.New(ethash.NewFaker()), 1, func(i int, gen *BlockGen) {
998998
gen.SetPoS()
999999
txData := []byte{
1000-
0x73, // PUSH20
1000+
byte(vm.PUSH20),
10011001
0x61, 0x77, 0x84, 0x3d, 0xb3, 0x13, 0x8a, 0xe6, 0x96, 0x79, 0xA5, 0x4b, 0x95, 0xcf, 0x34, 0x5E, 0xD7, 0x59, 0x45, 0x0d, // 0x6177843db3138ae69679A54b95cf345ED759450d
1002-
0x31, // BALANCE
1002+
byte(vm.BALANCE),
10031003
}
10041004
tx, _ := types.SignTx(types.NewContractCreation(0, big.NewInt(0), 100_000, big.NewInt(875000000), txData), signer, testKey)
10051005
gen.AddTx(tx)
@@ -1072,19 +1072,19 @@ func TestProcessVerkleSelfDestructInSeparateTx(t *testing.T) {
10721072
// in a previous transaction.
10731073

10741074
selfDestructContract := []byte{
1075-
0x60, 22, // PUSH1 22
1076-
0x60, 12, // PUSH1 12
1077-
0x60, 0x00, // PUSH1 0
1078-
0x39, // CODECOPY
1075+
byte(vm.PUSH1), 22,
1076+
byte(vm.PUSH1), 12,
1077+
byte(vm.PUSH1), 0x00,
1078+
byte(vm.CODECOPY),
10791079

1080-
0x60, 22, // PUSH1 22
1081-
0x60, 0x00, // PUSH1 0
1082-
0xF3, // RETURN
1080+
byte(vm.PUSH1), 22,
1081+
byte(vm.PUSH1), 0x00,
1082+
byte(vm.RETURN),
10831083

10841084
// Deployed code
1085-
0x73, // PUSH20
1085+
byte(vm.PUSH20),
10861086
0x61, 0x77, 0x84, 0x3d, 0xb3, 0x13, 0x8a, 0xe6, 0x96, 0x79, 0xA5, 0x4b, 0x95, 0xcf, 0x34, 0x5E, 0xD7, 0x59, 0x45, 0x0d, // 0x6177843db3138ae69679A54b95cf345ED759450d
1087-
0xFF, // SELFDESTRUCT
1087+
byte(vm.SELFDESTRUCT),
10881088
}
10891089
selfDestructContractAddr := common.HexToAddress("3a220f351252089d385b29beca14e27f204c296a")
10901090
_, _, _, _, statediffs := GenerateVerkleChainWithGenesis(gspec, beacon.New(ethash.NewFaker()), 2, func(i int, gen *BlockGen) {
@@ -1203,9 +1203,9 @@ func TestProcessVerkleSelfDestructInSameTx(t *testing.T) {
12031203
// in **the same** transaction sending the remaining balance to an external (i.e: not itself) account.
12041204

12051205
selfDestructContract := []byte{
1206-
0x73, // PUSH20
1206+
byte(vm.PUSH20),
12071207
0x61, 0x77, 0x84, 0x3d, 0xb3, 0x13, 0x8a, 0xe6, 0x96, 0x79, 0xA5, 0x4b, 0x95, 0xcf, 0x34, 0x5E, 0xD7, 0x59, 0x45, 0x0d, // 0x6177843db3138ae69679A54b95cf345ED759450d
1208-
0xFF, // SELFDESTRUCT
1208+
byte(vm.SELFDESTRUCT),
12091209
}
12101210
selfDestructContractAddr := common.HexToAddress("3a220f351252089d385b29beca14e27f204c296a")
12111211
_, _, _, _, statediffs := GenerateVerkleChainWithGenesis(gspec, beacon.New(ethash.NewFaker()), 1, func(i int, gen *BlockGen) {
@@ -1311,19 +1311,19 @@ func TestProcessVerkleSelfDestructInSeparateTxWithSelfBeneficiary(t *testing.T)
13111311
// in a *previous* transaction sending the remaining balance to itself.
13121312

13131313
selfDestructContract := []byte{
1314-
0x60, 22, // PUSH1 22
1315-
0x60, 12, // PUSH1 12
1316-
0x60, 0x00, // PUSH1 0
1317-
0x39, // CODECOPY
1314+
byte(vm.PUSH1), 22, // PUSH1 22
1315+
byte(vm.PUSH1), 12, // PUSH1 12
1316+
byte(vm.PUSH1), 0x00, // PUSH1 0
1317+
byte(vm.CODECOPY),
13181318

1319-
0x60, 22, // PUSH1 22
1320-
0x60, 0x00, // PUSH1 0
1321-
0xF3, // RETURN
1319+
byte(vm.PUSH1), 22, // PUSH1 22
1320+
byte(vm.PUSH1), 0x00, // PUSH1 0
1321+
byte(vm.RETURN),
13221322

13231323
// Deployed code
1324-
0x73, // PUSH20
1324+
byte(vm.PUSH20), // PUSH20
13251325
0x3a, 0x22, 0x0f, 0x35, 0x12, 0x52, 0x08, 0x9d, 0x38, 0x5b, 0x29, 0xbe, 0xca, 0x14, 0xe2, 0x7f, 0x20, 0x4c, 0x29, 0x6a, // 0x3a220f351252089d385b29beca14e27f204c296a
1326-
0xFF, // SELFDESTRUCT
1326+
byte(vm.SELFDESTRUCT),
13271327
}
13281328
selfDestructContractAddr := common.HexToAddress("3a220f351252089d385b29beca14e27f204c296a")
13291329
_, _, _, _, statediffs := GenerateVerkleChainWithGenesis(gspec, beacon.New(ethash.NewFaker()), 2, func(i int, gen *BlockGen) {
@@ -1416,9 +1416,9 @@ func TestProcessVerkleSelfDestructInSameTxWithSelfBeneficiary(t *testing.T) {
14161416
// in **the same** transaction sending the remaining balance to itself.
14171417

14181418
selfDestructContract := []byte{
1419-
0x73, // PUSH20
1419+
byte(vm.PUSH20),
14201420
0x3a, 0x22, 0x0f, 0x35, 0x12, 0x52, 0x08, 0x9d, 0x38, 0x5b, 0x29, 0xbe, 0xca, 0x14, 0xe2, 0x7f, 0x20, 0x4c, 0x29, 0x6a, // 0x3a220f351252089d385b29beca14e27f204c296a
1421-
0xFF, // SELFDESTRUCT
1421+
byte(vm.SELFDESTRUCT),
14221422
}
14231423
selfDestructContractAddr := common.HexToAddress("3a220f351252089d385b29beca14e27f204c296a")
14241424
_, _, _, _, statediffs := GenerateVerkleChainWithGenesis(gspec, beacon.New(ethash.NewFaker()), 1, func(i int, gen *BlockGen) {

0 commit comments

Comments
 (0)