feat(core): port contract tests on removing data requests

Also improve tests on gas metering and payouts.

Author: gluax

testutil/contract_msgs.go

@@ -68,17 +68,17 @@ func StakeMsg(stakerPubKey, proof, memo string) []byte {
 	}`, stakerPubKey, proof, memo))
 }
 
-func PostDataRequestMsg(execProgHash, tallyProgHash []byte, requestMemo string, replicationFactor int) []byte {
+func PostDataRequestMsg(execProgHash, tallyProgHash []byte, requestMemo string, replicationFactor int, execGasLimit, tallyGasLimit uint64) []byte {
 	return []byte(fmt.Sprintf(`{
 		"post_data_request": {
 		  "posted_dr": {
 			"version": "0.0.1",
 			"exec_program_id": "%s",
 			"exec_inputs": "ZXhlY19pbnB1dHM=",
-			"exec_gas_limit": 100000000000000000,
+			"exec_gas_limit": %d,
 			"tally_program_id": "%s",
 			"tally_inputs": "dGFsbHlfaW5wdXRz",
-			"tally_gas_limit": 300000000000000,
+			"tally_gas_limit": %d,
 			"replication_factor": %d,
 			"consensus_filter": "AA==",
 			"gas_price": "2000",
@@ -87,5 +87,5 @@ func PostDataRequestMsg(execProgHash, tallyProgHash []byte, requestMemo string,
 		  "seda_payload": "",
 		  "payback_address": "AQID"
 		}
-	}`, hex.EncodeToString(execProgHash), hex.EncodeToString(tallyProgHash), replicationFactor, requestMemo))
+	}`, hex.EncodeToString(execProgHash), execGasLimit, hex.EncodeToString(tallyProgHash), tallyGasLimit, replicationFactor, requestMemo))
 }

testutil/testwasms/testwasms.go

@@ -96,6 +96,25 @@ var TestWasms = [][]byte{
 	HelloWorldWasm(),
 }
 
+var TestWasmNames = []string{
+	"sample_tally",
+	"sample_tally_2",
+	"random_string_tally",
+	"invalid_import",
+	"chaos_dr",
+	"data_proxy",
+	"http_heavy",
+	"long_http",
+	"max_dr",
+	"max_result",
+	"memory",
+	"mock_api",
+	"price_feed",
+	"random_number",
+	"big",
+	"hello_world",
+}
+
 // v1.0.16 Core Contract with commit/reveal refund tx call removed
 func CoreContractWasm() []byte {
 	return coreContract

x/core/keeper/core_test.go

@@ -158,6 +158,79 @@ func TestEndBlock(t *testing.T) {
 	}
 }
 
+// TestPayouts focuses on checking before and after balances of relevant accounts
+// and objects (data request poster, executors, and data proxies).
+func TestPayouts(t *testing.T) {
+	f := testutil.InitFixture(t, false, nil)
+
+	// Set up 5 executors and 2 data proxies.
+	f.AddStakers(t, 5)
+
+	proxyPubKeys := []string{"03b27f2df0cbdb5cdadff5b4be0c9fda5aa3a59557ef6d0b49b4298ef42c8ce2b0", "020173bd90e73c5f8576b3141c53aa9959b10a1daf1bc9c0ccf0a942932c703dec"}
+	proxyPayoutAddrs := []sdk.AccAddress{sdk.MustAccAddressFromBech32("seda1zcds6ws7l0e005h3xrmg5tx0378nyg8gtmn64f"), sdk.MustAccAddressFromBech32("seda149sewl80wccuzhhukxgn2jg4kcun02d8qclwkt")}
+	f.AddDataProxy(t, proxyPubKeys[0], proxyPayoutAddrs[0].String(), sdk.NewCoin(testutil.BondDenom, math.NewInt(4e18)))
+	f.AddDataProxy(t, proxyPubKeys[1], proxyPayoutAddrs[1].String(), sdk.NewCoin(testutil.BondDenom, math.NewInt(6e18)))
+
+	tests := []struct {
+		name               string
+		gasUsed            uint64
+		expExecutorRewards [5]math.Int
+		expProxyRewards    [2]math.Int
+	}{
+		{
+			name:               "replication factor of 1",
+			gasUsed:            150e15,
+			expExecutorRewards: [5]math.Int{math.NewInt(145e15).Mul(math.NewInt(2e3)), math.ZeroInt(), math.ZeroInt(), math.ZeroInt(), math.ZeroInt()},
+			expProxyRewards:    [2]math.Int{math.NewInt(4e18), math.NewInt(6e18)},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Check balances before
+			proxyBalancesBefore := make([]math.Int, len(proxyPayoutAddrs))
+			for i, addr := range proxyPayoutAddrs {
+				balance := f.BankKeeper.GetBalance(f.Context(), addr, testutil.BondDenom)
+				proxyBalancesBefore[i] = balance.Amount
+			}
+
+			executorBalancesBefore := make([]math.Int, len(f.Stakers))
+			for i, staker := range f.Stakers {
+				executor, err := f.CoreKeeper.GetStaker(f.Context(), staker.PubKey)
+				require.NoError(t, err)
+				executorBalancesBefore[i] = executor.PendingWithdrawal
+			}
+
+			// Execute data request flow and core end block
+			dr := testutil.NewTestDRWithRandomPrograms(
+				[]byte("reveal"), // reveal
+				base64.StdEncoding.EncodeToString([]byte("memo")), // memo
+				tt.gasUsed, // gas used
+				0,          // exit code
+				proxyPubKeys,
+				1, // replication factor
+				f.Context().BlockTime(),
+			)
+
+			dr.ExecuteDataRequestFlow(f, 1, 1, false)
+
+			err := f.CoreKeeper.EndBlock(f.Context())
+			require.NoError(t, err)
+
+			// Check balances after
+			for i, addr := range proxyPayoutAddrs {
+				balance := f.BankKeeper.GetBalance(f.Context(), addr, testutil.BondDenom)
+				require.Equal(t, proxyBalancesBefore[i].Add(tt.expProxyRewards[i]), balance.Amount)
+			}
+
+			for i, staker := range f.Stakers {
+				executor, err := f.CoreKeeper.GetStaker(f.Context(), staker.PubKey)
+				require.NoError(t, err)
+				require.Equal(t, executorBalancesBefore[i].Add(tt.expExecutorRewards[i]), executor.PendingWithdrawal)
+			}
+		})
+	}
+}
+
 func TestTxFeeRefund(t *testing.T) {
 	f := testutil.InitFixture(t, false, nil)
 	f.AddStakers(t, 5)

x/core/keeper/data_request_tests/post_test.go

@@ -19,7 +19,7 @@ func TestPostWorks(t *testing.T) {
 	_ = f.CreateStakedTestAccount("alice", 22, 10)
 
 	// try to get dr that doesn't exist yet
-	_, err := bob.GetDataRequest("44f24df3aa5d1b5e809090a67b63539cd89b974a7aba0d661e1b7c6436624663")
+	_, err := bob.GetDataRequest("b426fdf3c5aabe17ab030427965f3e1c35de064090343dc78eb7f5967b57b949")
 	require.ErrorContains(t, err, "not found")
 
 	// Bob posts a data request
@@ -28,7 +28,7 @@ func TestPostWorks(t *testing.T) {
 	require.NoError(t, err)
 
 	// Dr can now be found
-	drFound, err := bob.GetDataRequest("44f24df3aa5d1b5e809090a67b63539cd89b974a7aba0d661e1b7c6436624663")
+	drFound, err := bob.GetDataRequest("b426fdf3c5aabe17ab030427965f3e1c35de064090343dc78eb7f5967b57b949")
 	require.NoError(t, err)
 	require.Equal(t, postDrResult.DrID, drFound.DataRequest.ID)
 

x/core/keeper/data_request_tests/query_by_status_test.go

@@ -138,7 +138,7 @@ func TestDrsAreSortedByGasAndHeight(t *testing.T) {
 	require.Equal(t, int64(1), drsResp.DataRequests[3].PostedHeight)
 }
 
-func TestLastSeenIndexWorks(t *testing.T) {
+func TestLastSeenIndex(t *testing.T) {
 	f := testutil.InitFixture(t, false, nil)
 
 	bob := f.CreateTestAccount("bob", 22)
@@ -148,34 +148,34 @@ func TestLastSeenIndexWorks(t *testing.T) {
 	dr2 := bob.CalculateDrIDAndArgs("2", 1)
 	dr3 := bob.CalculateDrIDAndArgs("3", 1)
 
-	// They all have same gas price, and height so ID will determine order
-	_, err := bob.PostDataRequest(dr1, 1, nil)
+	// They all have same gas price and height, so ID will determine order
+	// Note the sorted order is descending by gas price, then height, then ID.
+	postResult1, err := bob.PostDataRequest(dr1, 1, nil) // b426fdf3c5aabe17ab030427965f3e1c35de064090343dc78eb7f5967b57b949
 	require.NoError(t, err)
-	// This dr ID winds up being first
-	postDrResult2, err := bob.PostDataRequest(dr2, 1, nil)
+	_, err = bob.PostDataRequest(dr2, 1, nil) // 43699c923a6696aa63315589b04a8cf181aab5560239725b1454fb0f66993e27
 	require.NoError(t, err)
-	_, err = bob.PostDataRequest(dr3, 1, nil)
+	_, err = bob.PostDataRequest(dr3, 1, nil) // 13bcf175ebdd0ab970bfff9e773ac15ef95ee0ac4bdbbbff8a36c8405b1f8056
 	require.NoError(t, err)
 
 	firstDrResp, err := bob.GetDataRequestsByStatus(types.DATA_REQUEST_STATUS_COMMITTING, 1, nil)
 	require.NoError(t, err)
 	require.Len(t, firstDrResp.DataRequests, 1)
-	require.Equal(t, postDrResult2.DrID, firstDrResp.DataRequests[0].ID)
+	require.Equal(t, postResult1.DrID, firstDrResp.DataRequests[0].ID)
 
 	remainingDrResp, err := bob.GetDataRequestsByStatus(types.DATA_REQUEST_STATUS_COMMITTING, 10, &firstDrResp.LastSeenIndex)
 	require.NoError(t, err)
 	require.Len(t, remainingDrResp.DataRequests, 2)
 
-	var dr2Seen bool
+	var dr1Seen bool
 	for _, dr := range remainingDrResp.DataRequests {
-		if dr.ID == postDrResult2.DrID {
-			dr2Seen = true
+		if dr.ID == postResult1.DrID {
+			dr1Seen = true
 		}
 	}
-	require.False(t, dr2Seen)
+	require.False(t, dr1Seen)
 }
 
-func TestQueryByStatusManyDrsWorks(t *testing.T) {
+func TestQueryByStatusManyDrs(t *testing.T) {
 	f := testutil.InitFixture(t, false, nil)
 
 	bob := f.CreateTestAccount("bob", 2+25*20)
@@ -220,7 +220,7 @@ func TestQueryByStatusManyDrsWorks(t *testing.T) {
 	require.Len(t, tallyingDrsResp.DataRequests, 3)
 }
 
-func TestQueryByStatusManyMoreDrsWorks(t *testing.T) {
+func TestQueryByStatusManyMoreDrs(t *testing.T) {
 	f := testutil.InitFixture(t, false, nil)
 
 	bob := f.CreateTestAccount("bob", 2+163*20)
@@ -323,7 +323,7 @@ func TestQueryByStatusManyMoreDrsWorks(t *testing.T) {
 	require.Len(t, tallyingDrsResp.DataRequests, 0)
 }
 
-func TestQueryStatusesWorks(t *testing.T) {
+func TestQueryStatuses(t *testing.T) {
 	f := testutil.InitFixture(t, false, nil)
 
 	bob := f.CreateStakedTestAccount("bob", 22, 1)