chore: remove debugAPI option in testserver

pkg/api/accounting_test.go

@@ -56,7 +56,6 @@ func TestAccountingInfo(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithPeerAccountingFunc(accountingFunc)},
 	})
 
@@ -112,7 +111,6 @@ func TestAccountingInfoError(t *testing.T) {
 		return nil, wantErr
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithPeerAccountingFunc(accountingFunc)},
 	})
 

pkg/api/api_test.go

@@ -105,7 +105,6 @@ type testServerOptions struct {
 	Steward            steward.Interface
 	WsHeaders          http.Header
 	Authenticator      auth.Authenticator
-	DebugAPI           bool
 	Restricted         bool
 	DirectUpload       bool
 	Probe              *api.Probe

pkg/api/balances_test.go

@@ -32,7 +32,6 @@ func TestBalances(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithCompensatedBalancesFunc(compensatedBalancesFunc)},
 	})
 
@@ -72,7 +71,6 @@ func TestBalancesError(t *testing.T) {
 		return nil, wantErr
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithCompensatedBalancesFunc(compensatedBalancesFunc)},
 	})
 
@@ -92,7 +90,6 @@ func TestBalancesPeers(t *testing.T) {
 		return big.NewInt(100000000000000000), nil
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithCompensatedBalanceFunc(compensatedBalanceFunc)},
 	})
 
@@ -113,7 +110,6 @@ func TestBalancesPeersError(t *testing.T) {
 		return nil, wantErr
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithCompensatedBalanceFunc(compensatedBalanceFunc)},
 	})
 
@@ -133,7 +129,6 @@ func TestBalancesPeersNoBalance(t *testing.T) {
 		return nil, accounting.ErrPeerNoBalance
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithCompensatedBalanceFunc(compensatedBalanceFunc)},
 	})
 
@@ -186,7 +181,6 @@ func TestConsumedBalances(t *testing.T) {
 		return ret, err
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithBalancesFunc(balancesFunc)},
 	})
 
@@ -227,7 +221,6 @@ func TestConsumedError(t *testing.T) {
 		return nil, wantErr
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithBalancesFunc(balancesFunc)},
 	})
 
@@ -247,7 +240,6 @@ func TestConsumedPeers(t *testing.T) {
 		return big.NewInt(1000000000000000000), nil
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithBalanceFunc(balanceFunc)},
 	})
 
@@ -268,7 +260,6 @@ func TestConsumedPeersError(t *testing.T) {
 		return nil, wantErr
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithBalanceFunc(balanceFunc)},
 	})
 
@@ -288,7 +279,6 @@ func TestConsumedPeersNoBalance(t *testing.T) {
 		return nil, accounting.ErrPeerNoBalance
 	}
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		AccountingOpts: []mock.Option{mock.WithBalanceFunc(balanceFunc)},
 	})
 
@@ -303,7 +293,7 @@ func TestConsumedPeersNoBalance(t *testing.T) {
 func Test_peerBalanceHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name string
@@ -352,7 +342,7 @@ func Test_peerBalanceHandler_invalidInputs(t *testing.T) {
 func Test_compensatedPeerBalanceHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name string

pkg/api/chequebook_test.go

@@ -40,7 +40,6 @@ func TestChequebookBalance(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		ChequebookOpts: []mock.Option{
 			mock.WithChequebookBalanceFunc(chequebookBalanceFunc),
 			mock.WithChequebookAvailableBalanceFunc(chequebookAvailableBalanceFunc),
@@ -71,7 +70,6 @@ func TestChequebookBalanceError(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		ChequebookOpts: []mock.Option{mock.WithChequebookBalanceFunc(chequebookBalanceFunc)},
 	})
 
@@ -95,7 +93,6 @@ func TestChequebookAvailableBalanceError(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		ChequebookOpts: []mock.Option{
 			mock.WithChequebookBalanceFunc(chequebookBalanceFunc),
 			mock.WithChequebookAvailableBalanceFunc(chequebookAvailableBalanceFunc),
@@ -118,7 +115,6 @@ func TestChequebookAddress(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:       true,
 		ChequebookOpts: []mock.Option{mock.WithChequebookAddressFunc(chequebookAddressFunc)},
 	})
 
@@ -154,7 +150,6 @@ func TestChequebookWithdraw(t *testing.T) {
 		}
 
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI:       true,
 			ChequebookOpts: []mock.Option{mock.WithChequebookWithdrawFunc(chequebookWithdrawFunc)},
 		})
 
@@ -184,7 +179,6 @@ func TestChequebookWithdraw(t *testing.T) {
 		}
 
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI:       true,
 			ChequebookOpts: []mock.Option{mock.WithChequebookWithdrawFunc(chequebookWithdrawFunc)},
 		})
 
@@ -218,7 +212,6 @@ func TestChequebookDeposit(t *testing.T) {
 		}
 
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI:       true,
 			ChequebookOpts: []mock.Option{mock.WithChequebookDepositFunc(chequebookDepositFunc)},
 		})
 
@@ -249,7 +242,6 @@ func TestChequebookDeposit(t *testing.T) {
 		}
 
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI:       true,
 			ChequebookOpts: []mock.Option{mock.WithChequebookDepositFunc(chequebookDepositFunc)},
 		})
 
@@ -358,7 +350,6 @@ func TestChequebookLastCheques(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		SwapOpts: []swapmock.Option{swapmock.WithLastReceivedChequesFunc(lastReceivedChequesFunc), swapmock.WithLastSentChequesFunc(lastSentChequesFunc)},
 	})
 
@@ -472,7 +463,6 @@ func TestChequebookLastChequesPeer(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		SwapOpts: []swapmock.Option{swapmock.WithLastReceivedChequeFunc(lastReceivedChequeFunc), swapmock.WithLastSentChequeFunc(lastSentChequeFunc)},
 	})
 
@@ -512,7 +502,6 @@ func TestChequebookCashout(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		SwapOpts: []swapmock.Option{swapmock.WithCashChequeFunc(cashChequeFunc)},
 	})
 
@@ -543,7 +532,6 @@ func TestChequebookCashout_CustomGas(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		SwapOpts: []swapmock.Option{swapmock.WithCashChequeFunc(cashChequeFunc)},
 	})
 
@@ -619,7 +607,6 @@ func TestChequebookCashoutStatus(t *testing.T) {
 		}
 
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI: true,
 			SwapOpts: []swapmock.Option{swapmock.WithCashoutStatusFunc(cashoutStatusFunc)},
 		})
 
@@ -667,7 +654,6 @@ func TestChequebookCashoutStatus(t *testing.T) {
 		}
 
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI: true,
 			SwapOpts: []swapmock.Option{swapmock.WithCashoutStatusFunc(cashoutStatusFunc)},
 		})
 
@@ -706,7 +692,6 @@ func TestChequebookCashoutStatus(t *testing.T) {
 		}
 
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI: true,
 			SwapOpts: []swapmock.Option{swapmock.WithCashoutStatusFunc(cashoutStatusFunc)},
 		})
 
@@ -733,7 +718,7 @@ func TestChequebookCashoutStatus(t *testing.T) {
 func Test_chequebookLastPeerHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name string

pkg/api/debugstorage_test.go

@@ -35,8 +35,7 @@ func TestDebugStorage(t *testing.T) {
 		}
 
 		ts, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI: true,
-			Storer:   mockstorer.NewWithDebugInfo(want),
+			Storer: mockstorer.NewWithDebugInfo(want),
 		})
 
 		jsonhttptest.Request(t, ts, http.MethodGet, "/debugstore", http.StatusOK,

pkg/api/logger_test.go

@@ -72,7 +72,7 @@ func TestGetLoggers(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 	jsonhttptest.Request(t, client, http.MethodGet, "/loggers", http.StatusOK,
 		jsonhttptest.WithUnmarshalJSONResponse(&have),
 	)
@@ -88,7 +88,7 @@ func TestSetLoggerVerbosity(t *testing.T) {
 		api.ReplaceLogSetVerbosityByExp(fn)
 	}(api.LogSetVerbosityByExp)
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	type data struct {
 		exp string
@@ -143,7 +143,7 @@ func TestSetLoggerVerbosity(t *testing.T) {
 func Test_loggerGetHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name string
@@ -192,7 +192,7 @@ func Test_loggerGetHandler_invalidInputs(t *testing.T) {
 func Test_loggerSetVerbosityHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name      string

pkg/api/p2p_test.go

@@ -40,7 +40,6 @@ func TestAddresses(t *testing.T) {
 	ethereumAddress := common.HexToAddress("abcd")
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI:        true,
 		PublicKey:       privateKey.PublicKey,
 		PSSPublicKey:    pssPrivateKey.PublicKey,
 		Overlay:         overlay,
@@ -79,7 +78,6 @@ func TestAddresses_error(t *testing.T) {
 	testErr := errors.New("test error")
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		P2P: mock.New(mock.WithAddressesFunc(func() ([]multiaddr.Multiaddr, error) {
 			return nil, testErr
 		})),

pkg/api/peer_test.go

@@ -51,7 +51,6 @@ func TestConnect(t *testing.T) {
 	}
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		P2P: mock.New(mock.WithConnectFunc(func(ctx context.Context, addr ma.Multiaddr) (*bzz.Address, error) {
 			if addr.String() == errorUnderlay {
 				return nil, testErr
@@ -82,7 +81,6 @@ func TestConnect(t *testing.T) {
 	t.Run("error - add peer", func(t *testing.T) {
 		t.Parallel()
 		testServer, _, _, _ := newTestServer(t, testServerOptions{
-			DebugAPI: true,
 			P2P: mock.New(mock.WithConnectFunc(func(ctx context.Context, addr ma.Multiaddr) (*bzz.Address, error) {
 				if addr.String() == errorUnderlay {
 					return nil, testErr
@@ -109,7 +107,6 @@ func TestDisconnect(t *testing.T) {
 	testErr := errors.New("test error")
 
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		P2P: mock.New(mock.WithDisconnectFunc(func(addr swarm.Address, reason string) error {
 			if reason != "user requested disconnect" {
 				return testErr
@@ -166,7 +163,6 @@ func TestPeer(t *testing.T) {
 
 	overlay := swarm.MustParseHexAddress("ca1e9f3938cc1425c6061b96ad9eb93e134dfe8734ad490164ef20af9d1cf59c")
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		P2P: mock.New(mock.WithPeersFunc(func() []p2p.Peer {
 			return []p2p.Peer{{Address: overlay}}
 		})),
@@ -188,7 +184,6 @@ func TestBlocklistedPeers(t *testing.T) {
 
 	overlay := swarm.MustParseHexAddress("ca1e9f3938cc1425c6061b96ad9eb93e134dfe8734ad490164ef20af9d1cf59c")
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		P2P: mock.New(mock.WithBlocklistedPeersFunc(func() ([]p2p.BlockListedPeer, error) {
 			return []p2p.BlockListedPeer{{Peer: p2p.Peer{Address: overlay}}}, nil
 		})),
@@ -206,7 +201,6 @@ func TestBlocklistedPeersErr(t *testing.T) {
 
 	overlay := swarm.MustParseHexAddress("ca1e9f3938cc1425c6061b96ad9eb93e134dfe8734ad490164ef20af9d1cf59c")
 	testServer, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		P2P: mock.New(mock.WithBlocklistedPeersFunc(func() ([]p2p.BlockListedPeer, error) {
 			return []p2p.BlockListedPeer{{Peer: p2p.Peer{Address: overlay}}}, errors.New("some error")
 		})),
@@ -224,7 +218,7 @@ func TestBlocklistedPeersErr(t *testing.T) {
 func Test_peerConnectHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name         string
@@ -260,7 +254,7 @@ func Test_peerConnectHandler_invalidInputs(t *testing.T) {
 func Test_peerDisconnectHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name    string

pkg/api/pingpong_test.go

@@ -39,7 +39,6 @@ func TestPingpong(t *testing.T) {
 	})
 
 	ts, _, _, _ := newTestServer(t, testServerOptions{
-		DebugAPI: true,
 		Pingpong: pingpongService,
 	})
 
@@ -79,7 +78,7 @@ func TestPingpong(t *testing.T) {
 func Test_pingpongHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 
-	client, _, _, _ := newTestServer(t, testServerOptions{DebugAPI: true})
+	client, _, _, _ := newTestServer(t, testServerOptions{})
 
 	tests := []struct {
 		name    string