Skip to content

Commit

Permalink
chore: rebase PSS branch with main (#1689)
Browse files Browse the repository at this point in the history
* Update tests/mbt/driver/mbt_test.go

* nits

* revert unwanted line deletion from linter

---------

Co-authored-by: Philip Offtermatt <[email protected]>
  • Loading branch information
sainoe and p-offtermatt authored Mar 18, 2024
1 parent a4ecead commit 3947a69
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion tests/e2e/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/test_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion tests/mbt/driver/mbt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3947a69

Please sign in to comment.