Fix the rest of the tests

.github/workflows/test.yml

@@ -44,22 +44,22 @@ jobs:
           name: "${{ steps.def-vars.outputs.file-prefix }}-pkgs.txt"
           path: ./pkgs.txt
       - name: Split pkgs into parts
-        # The x/marker/simulation test-race takes around 6ish minutes and is by far the longest running one.
-        # The next longest running is x/metadata/client/cli at 2.5ish minutes.
-        # So take x/marker/simulation out of the list, split the list into 3 parts and create a 4th part
-        # with just the x/marker/simulation test.
-        # Temporarily, several tests are known to still fail, so we make them all part 3, and split the rest among 0-2.
-        # TODO[1760]: Re-analyze how long tests tests take and change the splitting back to be based on speed.
+        # With a standard split, test-race (03) takes the longest of all these at around 6m35s.
+        # and test-race (00) is the shortest (of the race tests) at around 4m00s.
+        # The x/sanction/simulation test-race is one of the longer ones (at almost 2 minutes), and ends up in part 03.
+        # By forcing that one into 00, it ends up reducing the overall run-time of this whole workflow by about a minute.
+        # The x/marker/client/cli tests take around 30s (35s for race), and would be in 01.
+        # Moving it to 00 ends up leveling out the times a bit more.
         run: |
           grep -vF \
-            -e 'github.com/provenance-io/provenance/x/ibcratelimit/simulation' \
-            -e 'github.com/provenance-io/provenance/x/oracle/simulation' \
+            -e 'github.com/provenance-io/provenance/x/sanction/simulation' \
+            -e 'github.com/provenance-io/provenance/x/marker/client/cli' \
             pkgs.txt > pkgs.txt.tmp
-          split -d -n l/3 pkgs.txt.tmp pkgs.txt.part.
+          split -d -n l/4 pkgs.txt.tmp pkgs.txt.part.
           printf '%s\n' \
-            'github.com/provenance-io/provenance/x/ibcratelimit/simulation' \
-            'github.com/provenance-io/provenance/x/oracle/simulation' \
-            > pkgs.txt.part.03
+            'github.com/provenance-io/provenance/x/sanction/simulation' \
+            'github.com/provenance-io/provenance/x/marker/client/cli' \
+            >> pkgs.txt.part.00
       - uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.def-vars.outputs.file-prefix }}-pkgs.txt.part.00"

CHANGELOG.md

@@ -96,6 +96,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
   * `marker` add `UpdateParams` endpoint and cli [#1991](https://github.com/provenance-io/provenance/pull/1991).
   * `name` add `UpdateParams` endpoint and cli [#2004](https://github.com/provenance-io/provenance/pull/2004).
 * Update the exchange `commitment-settlement-fee-calc` cli query to utilize the keyring [#2001](https://github.com/provenance-io/provenance/pull/2001).
+* Implement the ProposalMsgs module interface for the internal/provwasm, ibcratelimit, oracle, and sanction modules [#1993](https://github.com/provenance-io/provenance/pull/1993.)
 
 ### Client Breaking
 

app/app.go

@@ -770,7 +770,7 @@ func New(
 
 		// IBC
 		ibc.NewAppModule(app.IBCKeeper),
-		ibcratelimitmodule.NewAppModule(appCodec, *app.RateLimitingKeeper, app.AccountKeeper, app.BankKeeper),
+		ibcratelimitmodule.NewAppModule(appCodec, *app.RateLimitingKeeper),
 		ibchooks.NewAppModule(app.AccountKeeper, *app.IBCHooksKeeper),
 		ibctransfer.NewAppModule(*app.TransferKeeper),
 		icqModule,
@@ -1015,7 +1015,7 @@ func New(
 
 		// IBC
 		ibc.NewAppModule(app.IBCKeeper),
-		ibcratelimitmodule.NewAppModule(appCodec, *app.RateLimitingKeeper, app.AccountKeeper, app.BankKeeper),
+		ibcratelimitmodule.NewAppModule(appCodec, *app.RateLimitingKeeper),
 		ibchooks.NewAppModule(app.AccountKeeper, *app.IBCHooksKeeper),
 		ibctransfer.NewAppModule(*app.TransferKeeper),
 		icaModule,

app/params/weights.go

@@ -14,32 +14,19 @@ const (
 	DefaultWeightMsgDeleteDistinctAttribute int = 5
 	DefaultWeightMsgSetAccountData          int = 10
 	// Marker
-	DefaultWeightSupplyIncreaseProposalContent      int = 5
-	DefaultWeightSupplyDecreaseProposalContent      int = 5
-	DefaultWeightSetAdministratorProposalContent    int = 5
-	DefaultWeightRemoveAdministratorProposalContent int = 5
-	DefaultWeightChangeStatusProposalContent        int = 5
-	DefaultWeightSetDenomMetadataProposalContent    int = 5
-	// Adjusted marker operations to a cumulative weight of 100
 	DefaultWeightMsgAddMarker                 int = 30
 	DefaultWeightMsgChangeStatus              int = 10
 	DefaultWeightMsgFinalize                  int = 10
 	DefaultWeightMsgAddAccess                 int = 10
 	DefaultWeightMsgAddFinalizeActivateMarker int = 10
 	DefaultWeightMsgAddMarkerProposal         int = 40
 	DefaultWeightMsgUpdateDenySendList        int = 10
-	// MsgFees
-	DefaultWeightAddMsgFeeProposalContent    int = 75
-	DefaultWeightRemoveMsgFeeProposalContent int = 25
-	// Rewards
-	DefaultWeightSubmitCreateRewards int = 95
-	DefaultWeightSubmitEndRewards    int = 5
 	// Trigger
 	DefaultWeightSubmitCreateTrigger  int = 95
 	DefaultWeightSubmitDestroyTrigger int = 5
 	// Oracle
 	DefaultWeightUpdateOracle    int = 25
 	DefaultWeightSendOracleQuery int = 75
 	// Ibc Rate Limiter
-	DefaultWeightUpdateParams int = 100
+	DefaultWeightIBCRLUpdateParams int = 100
 )

internal/helpers/rand.go

@@ -0,0 +1,43 @@
+package helpers
+
+import (
+	"fmt"
+	"math/rand"
+
+	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
+)
+
+// RandIntBetween generates a random number between min and max inclusive.
+func RandIntBetween(r *rand.Rand, min, max int) int {
+	return r.Intn(max-min+1) + min
+}
+
+// SelectRandomEntries selects count entries from the ones provided.
+// The entriesType string is used in the error message to describe the entries slice.
+func SelectRandomEntries[E any](r *rand.Rand, entries []E, count int, entriesType string) ([]E, error) {
+	if count == 0 {
+		return nil, nil
+	}
+	if len(entries) < count {
+		return nil, fmt.Errorf("cannot choose %d %s because there are only %d", count, entriesType, len(entries))
+	}
+	if count == 1 {
+		if len(entries) == 1 {
+			return entries, nil
+		}
+		pivot := r.Intn(len(entries))
+		return entries[pivot : pivot+1], nil
+	}
+
+	randomized := make([]E, 0, len(entries))
+	randomized = append(randomized, entries...)
+	r.Shuffle(len(randomized), func(i, j int) {
+		randomized[i], randomized[j] = randomized[j], randomized[i]
+	})
+	return randomized[:count], nil
+}
+
+// SelectRandomAccounts selects count accounts from the ones provided.
+func SelectRandomAccounts(r *rand.Rand, accs []simtypes.Account, count int) ([]simtypes.Account, error) {
+	return SelectRandomEntries(r, accs, count, "accounts")
+}