chore: rebase PSS branch with main (#1689)

* Update tests/mbt/driver/mbt_test.go

* nits

* revert unwanted line deletion from linter

---------

Co-authored-by: Philip Offtermatt <57488781+p-offtermatt@users.noreply.github.com>

tests/e2e/builder.go

@@ -82,7 +82,6 @@ func generateImageName(version string, cfg TargetConfig) (string, error) {
 		tagName = "local" // this refers to build from local workspace
 	} else {
 		// use git hash of rev as docker image tag
-
 		cmd := exec.Command("git", "log", "--pretty=format:%h", "-n", "1", version)
 		out, err := cmd.CombinedOutput()
 		if err != nil {

tests/e2e/test_target.go

@@ -28,7 +28,7 @@ type ExecutionTarget interface {
 type DockerContainer struct {
 	targetConfig TargetConfig
 	containerCfg ContainerConfig
-	images       []string //images needed to build the target container
+	images       []string // images needed to build the target container
 	ImageName    string
 }
 

tests/mbt/driver/mbt_test.go

@@ -129,7 +129,7 @@ func RunItfTrace(t *testing.T, path string) {
 	// consumerAddrNames are the human readable names of consumer addresses in the model
 	// "realAddrs" are the addresses of the consumer keys on chain
 	// these maps relate the consumerAddrNames to the priv validators (from which one can get the real address)
-	// and from the real ddresses to the consumerAddrNames to allow converting between the two easily
+	// and from the real addresses to the consumerAddrNames to allow converting between the two easily
 	consumerAddrNamesToPrivVals := make(map[string]cmttypes.PrivValidator, len(consumerAddressesExpr))
 	realAddrsToModelConsAddrs := make(map[string]string, len(consumerAddressesExpr))
 	i := 0