Merge branch 'main' into feat/noncar-files

cmd/booster-http/run.go

@@ -50,6 +50,11 @@ var runCmd = &cli.Command{
 			Name:  "pprof",
 			Usage: "run pprof web server on localhost:6070",
 		},
+		&cli.UintFlag{
+			Name:  "pprof-port",
+			Usage: "the http port to serve pprof on",
+			Value: 6070,
+		},
 		&cli.StringFlag{
 			Name:  "base-path",
 			Usage: "the base path at which to run the web server",
@@ -178,8 +183,9 @@ var runCmd = &cli.Command{
 		}
 
 		if cctx.Bool("pprof") {
+			pprofPort := cctx.Int("pprof-port")
 			go func() {
-				err := http.ListenAndServe("localhost:6070", nil)
+				err := http.ListenAndServe(fmt.Sprintf("localhost:%d", pprofPort), nil)
 				if err != nil {
 					log.Error(err)
 				}

storagemarket/provider_test.go

@@ -168,6 +168,8 @@ func TestMultipleDealsConcurrent(t *testing.T) {
 }
 
 func TestDealsRejectedForFunds(t *testing.T) {
+	t.Skip("flaky test")
+
 	ctx := context.Background()
 	// setup the provider test harness with configured publish fee per deal and a total wallet balance.
 	harness := NewHarness(t, withMinPublishFees(abi.NewTokenAmount(100)), withPublishWalletBal(1000))