-
Notifications
You must be signed in to change notification settings - Fork 848
test: expand stateful tests to test all stateful RPCs #5283
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from 6 commits
e7fd668
d94573f
ce17a49
2b950a3
bdfcc04
4eb060e
b709e17
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |
| "github.com/ava-labs/libevm/core/vm" | ||
| "github.com/ava-labs/libevm/crypto" | ||
| "github.com/ava-labs/libevm/eth/tracers/logger" | ||
| "github.com/ava-labs/libevm/ethclient/gethclient" | ||
| "github.com/ava-labs/libevm/params" | ||
| "github.com/ava-labs/libevm/rpc" | ||
| "github.com/google/go-cmp/cmp" | ||
|
|
@@ -199,7 +200,7 @@ | |
| sut.testRPC(ctx, t, tests...) | ||
| } | ||
|
|
||
| func TestEthCall(t *testing.T) { | ||
| func TestStatefulRPCs(t *testing.T) { | ||
| opt, vmTime := withVMTime(t, time.Unix(saeparams.TauSeconds, 0)) | ||
| ctx, sut := newSUT(t, 1, opt) | ||
|
|
||
|
|
@@ -236,6 +237,26 @@ | |
| _, ok := sut.rawVM.consensusCritical.Load(b.Hash()) | ||
| require.Falsef(t, ok, "%T[%#x] still in VM memory", b, b.Hash()) | ||
|
|
||
| // Storage key for balances[recv] at mapping slot 0: | ||
| // keccak256(abi.encode(address, uint256(0))) | ||
| storageKey := crypto.Keccak256Hash( | ||
| common.LeftPadBytes(recv.Bytes(), 32), | ||
| common.Hash{}.Bytes(), | ||
|
Comment on lines
+204
to
+205
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit/question: should we actually use
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't know how much of an improvement that would be -- I think manually encoding is fine. There's a lot of ABI setup required, and the goal is test the RPCs. If you feel strongly I can change it. |
||
| ) | ||
| storageKeyHex := storageKey.Hex() | ||
|
|
||
| callMsg := ethereum.CallMsg{ | ||
| From: sut.wallet.Addresses()[0], | ||
| To: &escrowAddr, | ||
| Data: escrow.CallDataForBalance(recv), | ||
| } | ||
|
|
||
| gc := gethclient.New(sut.rpcClient) | ||
|
|
||
| wantBig := big.NewInt(val) | ||
| wantBytes := uint256.NewInt(val).PaddedBytes(32) | ||
| wantCode := escrow.ByteCode() | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| num rpc.BlockNumber | ||
|
|
@@ -251,15 +272,60 @@ | |
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| msg := ethereum.CallMsg{ | ||
| To: &escrowAddr, | ||
| Data: escrow.CallDataForBalance(recv), | ||
| } | ||
|
|
||
| got, err := sut.CallContract(ctx, msg, big.NewInt(int64(tt.num))) | ||
| t.Logf("%T.CallContract(%+v, %d)", sut.Client, msg, tt.num) // avoids having to repeat in failure messages | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The test name hierarchy now provides this information |
||
| require.NoError(t, err) | ||
| assert.Equal(t, uint256.NewInt(val).PaddedBytes(32), got) | ||
| blockNum := big.NewInt(int64(tt.num)) | ||
|
|
||
| t.Run("eth_call", func(t *testing.T) { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| got, err := sut.CallContract(ctx, callMsg, blockNum) | ||
| require.NoError(t, err, "CallContract()") | ||
| assert.Equal(t, wantBytes, got, "CallContract() result") | ||
| }) | ||
|
|
||
| t.Run("eth_getBalance", func(t *testing.T) { | ||
| got, err := sut.BalanceAt(ctx, escrowAddr, blockNum) | ||
| require.NoError(t, err, "BalanceAt()") | ||
| require.Zero(t, wantBig.Cmp(got), "BalanceAt(): want %d, got %s", val, got) | ||
|
JonathanOppenheimer marked this conversation as resolved.
Outdated
|
||
| }) | ||
|
|
||
| t.Run("eth_getCode", func(t *testing.T) { | ||
| got, err := sut.CodeAt(ctx, escrowAddr, blockNum) | ||
| require.NoError(t, err, "CodeAt()") | ||
| assert.Equal(t, wantCode, got, "CodeAt() result") | ||
| }) | ||
|
|
||
| t.Run("eth_getStorageAt", func(t *testing.T) { | ||
| got, err := sut.StorageAt(ctx, escrowAddr, storageKey, blockNum) | ||
| require.NoError(t, err, "StorageAt()") | ||
| assert.Equal(t, wantBytes, got, "StorageAt() result") | ||
| }) | ||
|
|
||
| t.Run("eth_getProof", func(t *testing.T) { | ||
| got, err := gc.GetProof(ctx, escrowAddr, []string{storageKeyHex}, blockNum) | ||
| require.NoError(t, err, "GetProof()") | ||
| require.NotNil(t, got, "GetProof() result") | ||
|
|
||
| assert.NotEmpty(t, got.AccountProof, "GetProof() accountProof") | ||
| require.Zero(t, wantBig.Cmp(got.Balance), "GetProof() balance: want %d, got %s", val, got.Balance) | ||
|
JonathanOppenheimer marked this conversation as resolved.
Outdated
JonathanOppenheimer marked this conversation as resolved.
Outdated
|
||
|
|
||
| require.Len(t, got.StorageProof, 1, "GetProof() storageProof length") | ||
| assert.NotEmpty(t, got.StorageProof[0].Proof, "GetProof() storageProof[0].Proof") | ||
| require.Zero(t, wantBig.Cmp(got.StorageProof[0].Value), "GetProof() storageProof[0].Value: want %d, got %s", val, got.StorageProof[0].Value) | ||
|
JonathanOppenheimer marked this conversation as resolved.
Outdated
|
||
| }) | ||
| }) | ||
| } | ||
|
|
||
| // eth_estimateGas and eth_createAccessList don't accept a block number | ||
| // parameter via ethclient/gethclient, so they always run against latest. | ||
| t.Run("eth_estimateGas", func(t *testing.T) { | ||
| got, err := sut.EstimateGas(ctx, callMsg) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These two tests are inherently different, given that they don't need to run in the table. I would put them in a separate test, and just create a new
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah I can do so, but there is just a lot of shared setup for these, which is why I put them in here... I can see how I can split them out.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can actually do a nice helper function for this.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This dif is bigger because we can use the helper function in other places, but I think this is a big improvement. |
||
| require.NoError(t, err, "EstimateGas()") | ||
| assert.Positive(t, got, "EstimateGas() result") | ||
| }) | ||
|
|
||
| t.Run("eth_createAccessList", func(t *testing.T) { | ||
| al, gas, errMsg, err := gc.CreateAccessList(ctx, callMsg) | ||
| require.NoError(t, err, "CreateAccessList()") | ||
| assert.Empty(t, errMsg, "CreateAccessList() error message") | ||
| assert.NotEmpty(t, al, "CreateAccessList() access list") | ||
| assert.Positive(t, gas, "CreateAccessList() gasUsed") | ||
| }) | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This RPC is actually already supported/tested, but it wasn't included in the list. When going through the list to add the ones for this PR, I thought I'd include it.