diff --git a/api/gateway/bindings_test.go b/api/gateway/bindings_test.go
index 5d27d5e4c7..ffd986d17d 100644
--- a/api/gateway/bindings_test.go
+++ b/api/gateway/bindings_test.go
@@ -109,7 +109,6 @@ func hasEndpointRegistered(router *mux.Router, path string, method string) bool
 		}
 		return nil
 	})
-
 	if err != nil {
 		fmt.Println("Error walking through routes:", err)
 		return false
diff --git a/api/gateway/header.go b/api/gateway/header.go
index 5b8a82351c..f76d5d48e1 100644
--- a/api/gateway/header.go
+++ b/api/gateway/header.go
@@ -15,9 +15,7 @@ const (
 	headerByHeightEndpoint = "/header"
 )
 
-var (
-	heightKey = "height"
-)
+var heightKey = "height"
 
 func (h *Handler) handleHeadRequest(w http.ResponseWriter, r *http.Request) {
 	head, err := h.header.LocalHead(r.Context())
diff --git a/api/rpc_test.go b/api/rpc_test.go
index ff38a42045..e019412f4d 100644
--- a/api/rpc_test.go
+++ b/api/rpc_test.go
@@ -139,7 +139,7 @@ func TestAuthedRPC(t *testing.T) {
 	adminToken, err := perms.NewTokenWithPerms(signer, perms.AllPerms)
 	require.NoError(t, err)
 
-	var tests = []struct {
+	tests := []struct {
 		perm  int
 		token string
 	}{
@@ -280,7 +280,6 @@ func implementsMarshaler(t *testing.T, typ reflect.Type) {
 	default:
 		return
 	}
-
 }
 
 // setupNodeWithAuthedRPC sets up a node and overrides its JWT
diff --git a/blob/blob_test.go b/blob/blob_test.go
index 020bfb191b..665abb7d89 100644
--- a/blob/blob_test.go
+++ b/blob/blob_test.go
@@ -19,7 +19,7 @@ func TestBlob(t *testing.T) {
 	blob, err := convertBlobs(appBlobs...)
 	require.NoError(t, err)
 
-	var test = []struct {
+	test := []struct {
 		name        string
 		expectedRes func(t *testing.T)
 	}{
diff --git a/blob/parser.go b/blob/parser.go
index 8999afcb22..51f8a3a17c 100644
--- a/blob/parser.go
+++ b/blob/parser.go
@@ -20,7 +20,8 @@ type parser struct {
 	verifyFn func(blob *Blob) bool
 }
 
-// NOTE: passing shares here needed to detect padding shares(as we do not need this check in addShares)
+// NOTE: passing shares here needed to detect padding shares(as we do not need this check in
+// addShares)
 func (p *parser) set(index int, shrs []shares.Share) ([]shares.Share, error) {
 	if len(shrs) == 0 {
 		return nil, errEmptyShares
diff --git a/blob/service_test.go b/blob/service_test.go
index 4bda8d993b..65a4a67359 100644
--- a/blob/service_test.go
+++ b/blob/service_test.go
@@ -49,7 +49,7 @@ func TestBlobService_Get(t *testing.T) {
 	require.NoError(t, err)
 
 	service := createService(ctx, t, append(blobs0, blobs1...))
-	var test = []struct {
+	test := []struct {
 		name           string
 		doFn           func() (interface{}, error)
 		expectedResult func(interface{}, error)
@@ -305,7 +305,6 @@ func TestBlobService_Get(t *testing.T) {
 				assert.Empty(t, blobs)
 				require.Error(t, err)
 				require.ErrorIs(t, err, ErrBlobNotFound)
-
 			},
 		},
 		{
diff --git a/cmd/auth.go b/cmd/auth.go
index 6ffdab656e..d79a320d54 100644
--- a/cmd/auth.go
+++ b/cmd/auth.go
@@ -20,7 +20,7 @@ import (
 )
 
 func AuthCmd(fsets ...*flag.FlagSet) *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:   "auth [permission-level (e.g. read || write || admin)]",
 		Short: "Signs and outputs a hex-encoded JWT token with the given permissions.",
 		Long: "Signs and outputs a hex-encoded JWT token with the given permissions. NOTE: only use this command when " +
@@ -37,7 +37,6 @@ func AuthCmd(fsets ...*flag.FlagSet) *cobra.Command {
 			ks, err := newKeystore(StorePath(cmd.Context()))
 			if err != nil {
 				return err
-
 			}
 
 			key, err := ks.Get(nodemod.SecretName)
diff --git a/core/fetcher.go b/core/fetcher.go
index 35c9a83dc9..f2b160e108 100644
--- a/core/fetcher.go
+++ b/core/fetcher.go
@@ -103,7 +103,7 @@ func (f *BlockFetcher) Commit(ctx context.Context, height *int64) (*types.Commit
 // ValidatorSet queries Core for the ValidatorSet from the
 // block at the given height.
 func (f *BlockFetcher) ValidatorSet(ctx context.Context, height *int64) (*types.ValidatorSet, error) {
-	var perPage = 100
+	perPage := 100
 
 	vals, total := make([]*types.Validator, 0), -1
 	for page := 1; len(vals) != total; page++ {
diff --git a/core/listener.go b/core/listener.go
index 885d19b18a..5260067154 100644
--- a/core/listener.go
+++ b/core/listener.go
@@ -248,7 +248,7 @@ func (cl *Listener) handleNewSignedBlock(ctx context.Context, b types.EventDataS
 		if err != nil && !errors.Is(err, context.Canceled) {
 			log.Errorw("listener: broadcasting data hash",
 				"height", b.Header.Height,
-				"hash", b.Header.Hash(), "err", err) //TODO: hash or datahash?
+				"hash", b.Header.Hash(), "err", err) // TODO: hash or datahash?
 		}
 	}
 
diff --git a/core/listener_test.go b/core/listener_test.go
index 0c6bc7f256..9850efec5b 100644
--- a/core/listener_test.go
+++ b/core/listener_test.go
@@ -128,7 +128,6 @@ func TestListener_DoesNotStoreHistoric(t *testing.T) {
 		require.NoError(t, err)
 		assert.False(t, has)
 	}
-
 }
 
 func createMocknetWithTwoPubsubEndpoints(ctx context.Context, t *testing.T) (*pubsub.PubSub, *pubsub.PubSub) {
diff --git a/das/backoff_test.go b/das/backoff_test.go
index e032ec175a..4e780588bd 100644
--- a/das/backoff_test.go
+++ b/das/backoff_test.go
@@ -30,7 +30,8 @@ func Test_exponentialBackoff(t *testing.T) {
 				4 * time.Minute,
 				16 * time.Minute,
 				64 * time.Minute,
-			}},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/das/daser.go b/das/daser.go
index 69d677c970..3956bff5d9 100644
--- a/das/daser.go
+++ b/das/daser.go
@@ -39,8 +39,10 @@ type DASer struct {
 	running        int32
 }
 
-type listenFn func(context.Context, *header.ExtendedHeader)
-type sampleFn func(context.Context, *header.ExtendedHeader) error
+type (
+	listenFn func(context.Context, *header.ExtendedHeader)
+	sampleFn func(context.Context, *header.ExtendedHeader) error
+)
 
 // NewDASer creates a new DASer.
 func NewDASer(
diff --git a/das/daser_test.go b/das/daser_test.go
index 56fc70ade5..d0b60125a1 100644
--- a/das/daser_test.go
+++ b/das/daser_test.go
@@ -263,7 +263,7 @@ func TestDASer_SamplingWindow(t *testing.T) {
 		WithSamplingWindow(time.Second))
 	require.NoError(t, err)
 
-	var tests = []struct {
+	tests := []struct {
 		timestamp    time.Time
 		withinWindow bool
 	}{
@@ -282,7 +282,6 @@ func TestDASer_SamplingWindow(t *testing.T) {
 			assert.Equal(t, tt.withinWindow, daser.isWithinSamplingWindow(eh))
 		})
 	}
-
 }
 
 // createDASerSubcomponents takes numGetter (number of headers
@@ -403,7 +402,8 @@ type benchGetterStub struct {
 
 func newBenchGetter() benchGetterStub {
 	return benchGetterStub{header: &header.ExtendedHeader{
-		DAH: &share.Root{RowRoots: make([][]byte, 0)}}}
+		DAH: &share.Root{RowRoots: make([][]byte, 0)},
+	}}
 }
 
 func (m benchGetterStub) GetByHeight(context.Context, uint64) (*header.ExtendedHeader, error) {
@@ -423,7 +423,8 @@ func (m getterStub) GetByHeight(_ context.Context, height uint64) (*header.Exten
 	return &header.ExtendedHeader{
 		Commit:    &types.Commit{},
 		RawHeader: header.RawHeader{Height: int64(height)},
-		DAH:       &share.Root{RowRoots: make([][]byte, 0)}}, nil
+		DAH:       &share.Root{RowRoots: make([][]byte, 0)},
+	}, nil
 }
 
 func (m getterStub) GetRangeByHeight(
diff --git a/das/store.go b/das/store.go
index 1d63a5083b..67626c0be4 100644
--- a/das/store.go
+++ b/das/store.go
@@ -27,7 +27,8 @@ type checkpointStore struct {
 func newCheckpointStore(ds datastore.Datastore) checkpointStore {
 	return checkpointStore{
 		namespace.Wrap(ds, storePrefix),
-		newDone("checkpoint store")}
+		newDone("checkpoint store"),
+	}
 }
 
 // load loads the DAS checkpoint from disk and returns it.
@@ -65,7 +66,8 @@ func (s *checkpointStore) store(ctx context.Context, cp checkpoint) error {
 func (s *checkpointStore) runBackgroundStore(
 	ctx context.Context,
 	storeInterval time.Duration,
-	getCheckpoint func(ctx context.Context) (checkpoint, error)) {
+	getCheckpoint func(ctx context.Context) (checkpoint, error),
+) {
 	defer s.indicateDone()
 
 	// runBackgroundStore could be disabled by setting storeInterval = 0
diff --git a/header/headertest/fraud/testing.go b/header/headertest/fraud/testing.go
index e2ff13a4e0..66965cf178 100644
--- a/header/headertest/fraud/testing.go
+++ b/header/headertest/fraud/testing.go
@@ -85,6 +85,7 @@ func (f *FraudMaker) MakeExtendedHeader(odsSize int, edsStore *eds.Store) header
 		return header.MakeExtendedHeader(h, comm, vals, eds)
 	}
 }
+
 func CreateFraudExtHeader(
 	t *testing.T,
 	eh *header.ExtendedHeader,
diff --git a/header/headertest/testing.go b/header/headertest/testing.go
index 1285e2cdd0..22d8230382 100644
--- a/header/headertest/testing.go
+++ b/header/headertest/testing.go
@@ -94,7 +94,6 @@ func MakeCommit(
 	blockID types.BlockID, height int64, round int32,
 	voteSet *types.VoteSet, validators []types.PrivValidator, now time.Time,
 ) (*types.Commit, error) {
-
 	// all sign
 	for i := 0; i < len(validators); i++ {
 		pubKey, err := validators[i].GetPubKey()
diff --git a/libs/keystore/fs_keystore.go b/libs/keystore/fs_keystore.go
index 02361f0084..fd40219382 100644
--- a/libs/keystore/fs_keystore.go
+++ b/libs/keystore/fs_keystore.go
@@ -24,7 +24,7 @@ type fsKeystore struct {
 // NewFSKeystore creates a new Keystore over OS filesystem.
 // The path must point to a directory. It is created automatically if necessary.
 func NewFSKeystore(path string, ring keyring.Keyring) (Keystore, error) {
-	err := os.Mkdir(path, 0755)
+	err := os.Mkdir(path, 0o755)
 	if err != nil && !os.IsExist(err) {
 		return nil, fmt.Errorf("keystore: failed to make a dir: %w", err)
 	}
@@ -49,7 +49,7 @@ func (f *fsKeystore) Put(n KeyName, pk PrivKey) error {
 		return fmt.Errorf("keystore: failed to marshal key '%s': %w", n, err)
 	}
 
-	err = os.WriteFile(path, data, 0600)
+	err = os.WriteFile(path, data, 0o600)
 	if err != nil {
 		return fmt.Errorf("keystore: failed to write key '%s': %w", n, err)
 	}
@@ -138,7 +138,7 @@ func (f *fsKeystore) pathTo(file string) string {
 }
 
 func checkPerms(perms os.FileMode) error {
-	if perms&0077 != 0 {
+	if perms&0o077 != 0 {
 		return fmt.Errorf("required: 0600, got: %#o", perms)
 	}
 	return nil
diff --git a/libs/utils/address_test.go b/libs/utils/address_test.go
index 48a7747a4a..b18ead91a1 100644
--- a/libs/utils/address_test.go
+++ b/libs/utils/address_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestSanitizeAddr(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		addr string
 		want string
 		err  error
@@ -39,7 +39,7 @@ func TestValidateAddr(t *testing.T) {
 		addr       string
 		unresolved bool
 	}
-	var tests = []struct {
+	tests := []struct {
 		addr string
 		want want
 	}{
diff --git a/nodebuilder/init.go b/nodebuilder/init.go
index fb3aeedf02..9ac6741b91 100644
--- a/nodebuilder/init.go
+++ b/nodebuilder/init.go
@@ -146,7 +146,7 @@ func IsInit(path string) bool {
 	return false
 }
 
-const perms = 0755
+const perms = 0o755
 
 // initRoot initializes(creates) directory if not created and check if it is writable
 func initRoot(path string) error {
diff --git a/nodebuilder/node_test.go b/nodebuilder/node_test.go
index 41eff32fab..833729dcda 100644
--- a/nodebuilder/node_test.go
+++ b/nodebuilder/node_test.go
@@ -21,7 +21,7 @@ import (
 )
 
 func TestLifecycle(t *testing.T) {
-	var test = []struct {
+	test := []struct {
 		tp node.Type
 	}{
 		{tp: node.Bridge},
@@ -58,7 +58,7 @@ func TestLifecycle_WithMetrics(t *testing.T) {
 
 	otelCollectorURL := strings.ReplaceAll(url, "http://", "")
 
-	var test = []struct {
+	test := []struct {
 		tp           node.Type
 		coreExpected bool
 	}{
@@ -130,7 +130,7 @@ func TestEmptyBlockExists(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	var test = []struct {
+	test := []struct {
 		tp node.Type
 	}{
 		{tp: node.Bridge},
@@ -155,5 +155,4 @@ func TestEmptyBlockExists(t *testing.T) {
 			require.NoError(t, err)
 		})
 	}
-
 }
diff --git a/nodebuilder/p2p/flags_test.go b/nodebuilder/p2p/flags_test.go
index cfbb5fed5d..8b226c8968 100644
--- a/nodebuilder/p2p/flags_test.go
+++ b/nodebuilder/p2p/flags_test.go
@@ -79,12 +79,10 @@ func TestParseNetwork_emptyFlag(t *testing.T) {
 
 	_, err = ParseNetwork(cmd)
 	assert.Error(t, err)
-
 }
 
 // Set empty network flag and ensure error returned
 func TestParseNetwork_emptyEnvEmptyFlag(t *testing.T) {
-
 	t.Setenv(EnvCustomNetwork, "")
 
 	cmd := createCmdWithNetworkFlag()
@@ -93,12 +91,10 @@ func TestParseNetwork_emptyEnvEmptyFlag(t *testing.T) {
 
 	_, err = ParseNetwork(cmd)
 	require.Error(t, err)
-
 }
 
 // Env overrides empty flag to take precedence
 func TestParseNetwork_envOverridesEmptyFlag(t *testing.T) {
-
 	t.Setenv(EnvCustomNetwork, "custom-network")
 
 	cmd := createCmdWithNetworkFlag()
@@ -108,12 +104,10 @@ func TestParseNetwork_envOverridesEmptyFlag(t *testing.T) {
 	network, err := ParseNetwork(cmd)
 	require.NoError(t, err)
 	assert.Equal(t, Network("custom-network"), network)
-
 }
 
 // Explicitly set flag but env should still override
 func TestParseNetwork_envOverridesFlag(t *testing.T) {
-
 	t.Setenv(EnvCustomNetwork, "custom-network")
 
 	cmd := createCmdWithNetworkFlag()
@@ -123,5 +117,4 @@ func TestParseNetwork_envOverridesFlag(t *testing.T) {
 	network, err := ParseNetwork(cmd)
 	require.NoError(t, err)
 	assert.Equal(t, Network("custom-network"), network)
-
 }
diff --git a/nodebuilder/p2p/module_test.go b/nodebuilder/p2p/module_test.go
index cb7c945547..96b5aac789 100644
--- a/nodebuilder/p2p/module_test.go
+++ b/nodebuilder/p2p/module_test.go
@@ -31,7 +31,7 @@ func testModule(tp node.Type) fx.Option {
 }
 
 func TestModuleBuild(t *testing.T) {
-	var test = []struct {
+	test := []struct {
 		tp node.Type
 	}{
 		{tp: node.Bridge},
@@ -49,7 +49,7 @@ func TestModuleBuild(t *testing.T) {
 }
 
 func TestModuleBuild_WithMetrics(t *testing.T) {
-	var test = []struct {
+	test := []struct {
 		tp node.Type
 	}{
 		{tp: node.Full},
diff --git a/nodebuilder/share/cmd/share.go b/nodebuilder/share/cmd/share.go
index 7f53e7fe54..58d6befecb 100644
--- a/nodebuilder/share/cmd/share.go
+++ b/nodebuilder/share/cmd/share.go
@@ -42,7 +42,6 @@ var sharesAvailableCmd = &cobra.Command{
 		defer client.Close()
 
 		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
-
 		if err != nil {
 			return err
 		}
@@ -80,7 +79,6 @@ var getSharesByNamespaceCmd = &cobra.Command{
 		defer client.Close()
 
 		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
-
 		if err != nil {
 			return err
 		}
@@ -107,7 +105,6 @@ var getShare = &cobra.Command{
 		defer client.Close()
 
 		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
-
 		if err != nil {
 			return err
 		}
@@ -156,7 +153,6 @@ var getEDS = &cobra.Command{
 		defer client.Close()
 
 		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
-
 		if err != nil {
 			return err
 		}
diff --git a/nodebuilder/state/cmd/state.go b/nodebuilder/state/cmd/state.go
index ff7ef609ca..833f4afc06 100644
--- a/nodebuilder/state/cmd/state.go
+++ b/nodebuilder/state/cmd/state.go
@@ -12,9 +12,7 @@ import (
 	"github.com/celestiaorg/celestia-node/state"
 )
 
-var (
-	amount uint64
-)
+var amount uint64
 
 func init() {
 	Cmd.AddCommand(
diff --git a/nodebuilder/state/module.go b/nodebuilder/state/module.go
index 29a1ed157e..0856884b98 100644
--- a/nodebuilder/state/module.go
+++ b/nodebuilder/state/module.go
@@ -37,11 +37,13 @@ func ConstructModule(tp node.Type, cfg *Config, coreCfg *core.Config) fx.Option
 		fxutil.ProvideIf(coreCfg.IsEndpointConfigured(), fx.Annotate(
 			coreAccessor,
 			fx.OnStart(func(ctx context.Context,
-				breaker *modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader]) error {
+				breaker *modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader],
+			) error {
 				return breaker.Start(ctx)
 			}),
 			fx.OnStop(func(ctx context.Context,
-				breaker *modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader]) error {
+				breaker *modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader],
+			) error {
 				return breaker.Stop(ctx)
 			}),
 		)),
diff --git a/nodebuilder/state/state.go b/nodebuilder/state/state.go
index 949d7f9a26..c13aef4086 100644
--- a/nodebuilder/state/state.go
+++ b/nodebuilder/state/state.go
@@ -18,7 +18,6 @@ var _ Module = (*API)(nil)
 //go:generate mockgen -destination=mocks/api.go -package=mocks . Module
 //nolint:dupl
 type Module interface {
-
 	// AccountAddress retrieves the address of the node's account/signer
 	AccountAddress(ctx context.Context) (state.Address, error)
 	// Balance retrieves the Celestia coin balance for the node's account/signer
diff --git a/nodebuilder/store_test.go b/nodebuilder/store_test.go
index 4193d8b79b..64c41de66a 100644
--- a/nodebuilder/store_test.go
+++ b/nodebuilder/store_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 func TestRepo(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		tp node.Type
 	}{
 		{tp: node.Bridge}, {tp: node.Light}, {tp: node.Full},
diff --git a/nodebuilder/tests/api_test.go b/nodebuilder/tests/api_test.go
index a3b99a750b..56c26382ff 100644
--- a/nodebuilder/tests/api_test.go
+++ b/nodebuilder/tests/api_test.go
@@ -62,7 +62,6 @@ func TestNodeModule(t *testing.T) {
 	perms, err = client.Node.AuthVerify(ctx, writeJWT)
 	require.NoError(t, err)
 	require.Equal(t, perms, writePerms)
-
 }
 
 func TestGetByHeight(t *testing.T) {
diff --git a/nodebuilder/tests/blob_test.go b/nodebuilder/tests/blob_test.go
index 9b6496ab9b..60af146f67 100644
--- a/nodebuilder/tests/blob_test.go
+++ b/nodebuilder/tests/blob_test.go
@@ -66,7 +66,7 @@ func TestBlobModule(t *testing.T) {
 	_, err = lightClient.Header.WaitForHeight(ctx, height)
 	require.NoError(t, err)
 
-	var test = []struct {
+	test := []struct {
 		name string
 		doFn func(t *testing.T)
 	}{
@@ -191,7 +191,6 @@ func TestBlobModule(t *testing.T) {
 				included, err := fullClient.Blob.Included(ctx, h, blobs[0].Namespace(), proof, blobs[0].Commitment)
 				require.NoError(t, err)
 				require.True(t, included)
-
 			},
 		},
 	}
diff --git a/nodebuilder/tests/da_test.go b/nodebuilder/tests/da_test.go
index bdcd4e638c..12cbe17fdd 100644
--- a/nodebuilder/tests/da_test.go
+++ b/nodebuilder/tests/da_test.go
@@ -70,7 +70,7 @@ func TestDaModule(t *testing.T) {
 	ids, err := fullClient.DA.Submit(ctx, daBlobs, -1, namespace)
 	require.NoError(t, err)
 
-	var test = []struct {
+	test := []struct {
 		name string
 		doFn func(t *testing.T)
 	}{
diff --git a/pruner/metrics.go b/pruner/metrics.go
index c43217dc3d..6e94ba74da 100644
--- a/pruner/metrics.go
+++ b/pruner/metrics.go
@@ -8,9 +8,7 @@ import (
 	"go.opentelemetry.io/otel/metric"
 )
 
-var (
-	meter = otel.Meter("storage_pruner")
-)
+var meter = otel.Meter("storage_pruner")
 
 type metrics struct {
 	prunedCounter metric.Int64Counter
diff --git a/share/availability/light/availability.go b/share/availability/light/availability.go
index 97046f4438..b188a33c14 100644
--- a/share/availability/light/availability.go
+++ b/share/availability/light/availability.go
@@ -128,7 +128,8 @@ func (la *ShareAvailability) SharesAvailable(ctx context.Context, header *header
 	wg.Wait()
 
 	if errors.Is(ctx.Err(), context.Canceled) {
-		// Availability did not complete due to context cancellation, return context error instead of share.ErrNotAvailable
+		// Availability did not complete due to context cancellation, return context error instead of
+		// share.ErrNotAvailable
 		return ctx.Err()
 	}
 
diff --git a/share/availability/light/availability_test.go b/share/availability/light/availability_test.go
index 68da3698b5..2f7b7a6cf9 100644
--- a/share/availability/light/availability_test.go
+++ b/share/availability/light/availability_test.go
@@ -148,7 +148,7 @@ func TestGetShare(t *testing.T) {
 }
 
 func TestService_GetSharesByNamespace(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		squareSize         int
 		expectedShareCount int
 	}{
@@ -232,7 +232,7 @@ func TestService_GetSharesByNamespaceNotFound(t *testing.T) {
 }
 
 func BenchmarkService_GetSharesByNamespace(b *testing.B) {
-	var tests = []struct {
+	tests := []struct {
 		amountShares int
 	}{
 		{amountShares: 4},
diff --git a/share/eds/byzantine/bad_encoding.go b/share/eds/byzantine/bad_encoding.go
index fbb6b592ea..da4c60a252 100644
--- a/share/eds/byzantine/bad_encoding.go
+++ b/share/eds/byzantine/bad_encoding.go
@@ -110,9 +110,7 @@ var (
 	errNMTTreeRootsMatch       = errors.New("recomputed root matches the DAH root")
 )
 
-var (
-	invalidProofPrefix = fmt.Sprintf("invalid %s proof", BadEncoding)
-)
+var invalidProofPrefix = fmt.Sprintf("invalid %s proof", BadEncoding)
 
 // Validate ensures that fraud proof is correct.
 // Validate checks that provided Merkle Proofs correspond to the shares,
diff --git a/share/eds/byzantine/bad_encoding_test.go b/share/eds/byzantine/bad_encoding_test.go
index e42e3c287c..4695c8db9a 100644
--- a/share/eds/byzantine/bad_encoding_test.go
+++ b/share/eds/byzantine/bad_encoding_test.go
@@ -48,7 +48,7 @@ func TestBEFP_Validate(t *testing.T) {
 	proof := CreateBadEncodingProof([]byte("hash"), 0, errByz)
 	befp, ok := proof.(*BadEncodingProof)
 	require.True(t, ok)
-	var test = []struct {
+	test := []struct {
 		name           string
 		prepareFn      func() error
 		expectedResult func(error)
diff --git a/share/eds/byzantine/share_proof_test.go b/share/eds/byzantine/share_proof_test.go
index a9021d806d..9c883233ce 100644
--- a/share/eds/byzantine/share_proof_test.go
+++ b/share/eds/byzantine/share_proof_test.go
@@ -28,7 +28,7 @@ func TestGetProof(t *testing.T) {
 
 	dah, err := da.NewDataAvailabilityHeader(in)
 	require.NoError(t, err)
-	var tests = []struct {
+	tests := []struct {
 		roots [][]byte
 	}{
 		{dah.RowRoots},
diff --git a/share/eds/cache/cache.go b/share/eds/cache/cache.go
index 3ec3d2f279..ff38faafba 100644
--- a/share/eds/cache/cache.go
+++ b/share/eds/cache/cache.go
@@ -16,9 +16,7 @@ var (
 	meter = otel.Meter("eds_store_cache")
 )
 
-var (
-	errCacheMiss = errors.New("accessor not found in blockstore cache")
-)
+var errCacheMiss = errors.New("accessor not found in blockstore cache")
 
 type CloseMetricsFn func() error
 
diff --git a/share/eds/eds_test.go b/share/eds/eds_test.go
index ffb05343b9..b5e02fe14a 100644
--- a/share/eds/eds_test.go
+++ b/share/eds/eds_test.go
@@ -227,7 +227,7 @@ func writeRandomEDS(t *testing.T) *rsmt2d.ExtendedDataSquare {
 	tmpDir := t.TempDir()
 	err := os.Chdir(tmpDir)
 	require.NoError(t, err, "error changing to the temporary test directory")
-	f, err := os.OpenFile("test.car", os.O_WRONLY|os.O_CREATE, 0600)
+	f, err := os.OpenFile("test.car", os.O_WRONLY|os.O_CREATE, 0o600)
 	require.NoError(t, err, "error opening file")
 
 	eds := edstest.RandEDS(t, 4)
@@ -239,7 +239,7 @@ func writeRandomEDS(t *testing.T) *rsmt2d.ExtendedDataSquare {
 
 func openWrittenEDS(t *testing.T) *os.File {
 	t.Helper()
-	f, err := os.OpenFile("test.car", os.O_RDONLY, 0600)
+	f, err := os.OpenFile("test.car", os.O_RDONLY, 0o600)
 	require.NoError(t, err, "error opening file")
 	return f
 }
@@ -261,7 +261,7 @@ func createTestData(t *testing.T, testDir string) { //nolint:unused
 	require.NoError(t, err, "changing to the directory")
 	os.RemoveAll("example.car")
 	require.NoError(t, err, "removing old file")
-	f, err := os.OpenFile("example.car", os.O_WRONLY|os.O_CREATE, 0600)
+	f, err := os.OpenFile("example.car", os.O_WRONLY|os.O_CREATE, 0o600)
 	require.NoError(t, err, "opening file")
 
 	eds := edstest.RandEDS(t, 4)
@@ -275,7 +275,7 @@ func createTestData(t *testing.T, testDir string) { //nolint:unused
 	require.NoError(t, err, "marshaling example root")
 	os.RemoveAll("example-root.json")
 	require.NoError(t, err, "removing old file")
-	f, err = os.OpenFile("example-root.json", os.O_WRONLY|os.O_CREATE, 0600)
+	f, err = os.OpenFile("example-root.json", os.O_WRONLY|os.O_CREATE, 0o600)
 	require.NoError(t, err, "opening file")
 	_, err = f.Write(header)
 	require.NoError(t, err, "writing example root to file")
diff --git a/share/eds/retriever.go b/share/eds/retriever.go
index 9389d8b6b2..b4a3e70158 100644
--- a/share/eds/retriever.go
+++ b/share/eds/retriever.go
@@ -87,8 +87,8 @@ func (r *Retriever) Retrieve(ctx context.Context, dah *da.DataAvailabilityHeader
 			// check to ensure it is not a catastrophic ErrByzantine case, otherwise handle accordingly
 			var errByz *rsmt2d.ErrByzantineData
 			if errors.As(err, &errByz) {
-				// session should be closed before constructing the Byzantine error to allow constructor to access nmt proofs
-				// computed during the session
+				// session should be closed before constructing the Byzantine error to allow constructor to access
+				// nmt proofs computed during the session
 				ses.close(false)
 				span.RecordError(err)
 				return nil, byzantine.NewErrByzantine(ctx, r.bServ, dah, errByz)
diff --git a/share/eds/store.go b/share/eds/store.go
index da26e16ef4..8a73f9bf07 100644
--- a/share/eds/store.go
+++ b/share/eds/store.go
@@ -242,7 +242,7 @@ func (s *Store) put(ctx context.Context, root share.DataHash, square *rsmt2d.Ext
 	}
 
 	key := root.String()
-	f, err := os.OpenFile(s.basepath+blocksPath+key, os.O_CREATE|os.O_WRONLY, 0600)
+	f, err := os.OpenFile(s.basepath+blocksPath+key, os.O_CREATE|os.O_WRONLY, 0o600)
 	if err != nil {
 		return err
 	}
diff --git a/share/getters/getter_test.go b/share/getters/getter_test.go
index 7297766652..0e132885ae 100644
--- a/share/getters/getter_test.go
+++ b/share/getters/getter_test.go
@@ -117,7 +117,7 @@ func TestStoreGetter(t *testing.T) {
 		assert.Len(t, shares.Flatten(), 2)
 
 		// 'corrupt' existing CAR by overwriting with a random EDS
-		f, err := os.OpenFile(tmpDir+"/blocks/"+eh.DAH.String(), os.O_WRONLY, 0644)
+		f, err := os.OpenFile(tmpDir+"/blocks/"+eh.DAH.String(), os.O_WRONLY, 0o644)
 		require.NoError(t, err)
 		edsToOverwriteWith, eh := randomEDS(t)
 		err = eds.WriteEDS(ctx, edsToOverwriteWith, f)
diff --git a/share/getters/utils_test.go b/share/getters/utils_test.go
index 65de9d47f2..ce94d3ac04 100644
--- a/share/getters/utils_test.go
+++ b/share/getters/utils_test.go
@@ -31,63 +31,72 @@ func Test_ErrorContains(t *testing.T) {
 		args args
 		want bool
 	}{
-		{"nil err",
+		{
+			"nil err",
 			args{
 				err:    nil,
 				target: err1,
 			},
 			false,
 		},
-		{"nil target",
+		{
+			"nil target",
 			args{
 				err:    err1,
 				target: nil,
 			},
 			true,
 		},
-		{"errors.Is true",
+		{
+			"errors.Is true",
 			args{
 				err:    w1(err1),
 				target: err1,
 			},
 			true,
 		},
-		{"errors.Is false",
+		{
+			"errors.Is false",
 			args{
 				err:    w1(err1),
 				target: err2,
 			},
 			false,
 		},
-		{"same wrap but different base error",
+		{
+			"same wrap but different base error",
 			args{
 				err:    w1(err1),
 				target: w1(err2),
 			},
 			false,
 		},
-		{"both wrapped true",
+		{
+			"both wrapped true",
 			args{
 				err:    w1(err1),
 				target: w2(err1),
 			},
 			true,
 		},
-		{"both wrapped false",
+		{
+			"both wrapped false",
 			args{
 				err:    w1(err1),
 				target: w2(err2),
 			},
 			false,
 		},
-		{"multierr first in slice",
+		{
+			"multierr first in slice",
 			args{
 				err:    errors.Join(w1(err1), w2(err2)),
 				target: w2(err1),
 			},
 			true,
 		},
-		{"multierr second in slice",
+		{
+			"multierr second in slice",
 			args{
 				err:    errors.Join(w1(err1), w2(err2)),
 				target: w1(err2),
diff --git a/share/ipld/get_shares_test.go b/share/ipld/get_shares_test.go
index 580efcb69b..c9796eb4be 100644
--- a/share/ipld/get_shares_test.go
+++ b/share/ipld/get_shares_test.go
@@ -152,7 +152,7 @@ func TestGetSharesByNamespace(t *testing.T) {
 	t.Cleanup(cancel)
 	bServ := NewMemBlockservice()
 
-	var tests = []struct {
+	tests := []struct {
 		rawData []share.Share
 	}{
 		{rawData: sharetest.RandShares(t, 4)},
@@ -262,7 +262,7 @@ func TestCollectLeavesByNamespace_AbsentNamespaceId(t *testing.T) {
 		copy(share.GetNamespace(shr), maxIncluded)
 	}
 
-	var tests = []struct {
+	tests := []struct {
 		name             string
 		data             []share.Share
 		missingNamespace share.Namespace
@@ -329,7 +329,7 @@ func TestGetSharesWithProofsByNamespace(t *testing.T) {
 	t.Cleanup(cancel)
 	bServ := NewMemBlockservice()
 
-	var tests = []struct {
+	tests := []struct {
 		rawData []share.Share
 	}{
 		{rawData: sharetest.RandShares(t, 4)},
diff --git a/share/ipld/nmt.go b/share/ipld/nmt.go
index 6dba300965..de662bb4b4 100644
--- a/share/ipld/nmt.go
+++ b/share/ipld/nmt.go
@@ -23,9 +23,7 @@ import (
 	"github.com/celestiaorg/celestia-node/share"
 )
 
-var (
-	log = logging.Logger("ipld")
-)
+var log = logging.Logger("ipld")
 
 const (
 	// Below used multiformats (one codec, one multihash) seem free:
diff --git a/share/ipld/nmt_test.go b/share/ipld/nmt_test.go
index 77268d7112..ecff64bf15 100644
--- a/share/ipld/nmt_test.go
+++ b/share/ipld/nmt_test.go
@@ -16,7 +16,7 @@ import (
 // TestNamespaceFromCID checks that deriving the Namespaced hash from
 // the given CID works correctly.
 func TestNamespaceFromCID(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		eds *rsmt2d.ExtendedDataSquare
 	}{
 		// note that the number of shares must be a power of two
diff --git a/share/namespace_test.go b/share/namespace_test.go
index 786441b043..9593319f00 100644
--- a/share/namespace_test.go
+++ b/share/namespace_test.go
@@ -34,7 +34,8 @@ func TestNewNamespaceV0(t *testing.T) {
 			expected: Namespace{
 				0x0,
 				0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, // filled zeros
-				0x0, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8}, // id with left padding
+				0x0, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8,
+			}, // id with left padding
 			wantErr: false,
 		},
 		{
@@ -43,7 +44,8 @@ func TestNewNamespaceV0(t *testing.T) {
 			expected: Namespace{
 				0x0,                                                                                      // version
 				0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, // filled zeros
-				0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0x10}, // id
+				0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0x10,
+			}, // id
 			wantErr: false,
 		},
 		{
diff --git a/share/p2p/peers/manager_test.go b/share/p2p/peers/manager_test.go
index 52a6fd7302..b6b44597ef 100644
--- a/share/p2p/peers/manager_test.go
+++ b/share/p2p/peers/manager_test.go
@@ -454,7 +454,6 @@ func TestIntegration(t *testing.T) {
 		case <-ctx.Done():
 			require.NoError(t, ctx.Err())
 		}
-
 	})
 }
 
@@ -478,7 +477,6 @@ func testManager(ctx context.Context, headerSub libhead.Subscriber[*header.Exten
 		connGater,
 		WithShrexSubPools(shrexSub, headerSub),
 	)
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/share/p2p/shrexnd/server.go b/share/p2p/shrexnd/server.go
index 4d540c20ba..9773ad7327 100644
--- a/share/p2p/shrexnd/server.go
+++ b/share/p2p/shrexnd/server.go
@@ -158,7 +158,6 @@ func (srv *Server) readRequest(
 	_, err = serde.Read(stream, &req)
 	if err != nil {
 		return nil, fmt.Errorf("reading request: %w", err)
-
 	}
 
 	logger.Debugw("new request")
@@ -175,7 +174,8 @@ func (srv *Server) readRequest(
 }
 
 func (srv *Server) getNamespaceData(ctx context.Context,
-	hash share.DataHash, namespace share.Namespace) (share.NamespacedShares, pb.StatusCode, error) {
+	hash share.DataHash, namespace share.Namespace,
+) (share.NamespacedShares, pb.StatusCode, error) {
 	dah, err := srv.store.GetDAH(ctx, hash)
 	if err != nil {
 		if errors.Is(err, eds.ErrNotFound) {
diff --git a/share/p2p/shrexsub/pubsub_test.go b/share/p2p/shrexsub/pubsub_test.go
index 85b16c055b..788d4ca73c 100644
--- a/share/p2p/shrexsub/pubsub_test.go
+++ b/share/p2p/shrexsub/pubsub_test.go
@@ -39,7 +39,7 @@ func TestPubSub(t *testing.T) {
 	subs, err := pSub2.Subscribe()
 	require.NoError(t, err)
 
-	var tests = []struct {
+	tests := []struct {
 		name        string
 		notif       Notification
 		errExpected bool
@@ -120,5 +120,4 @@ func TestPubSub(t *testing.T) {
 			require.Equal(t, tt.notif, got)
 		})
 	}
-
 }
diff --git a/share/share.go b/share/share.go
index 4079028d82..b98ffc94a0 100644
--- a/share/share.go
+++ b/share/share.go
@@ -8,21 +8,17 @@ import (
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 )
 
-var (
-	// DefaultRSMT2DCodec sets the default rsmt2d.Codec for shares.
-	DefaultRSMT2DCodec = appconsts.DefaultCodec
-)
+// DefaultRSMT2DCodec sets the default rsmt2d.Codec for shares.
+var DefaultRSMT2DCodec = appconsts.DefaultCodec
 
 const (
 	// Size is a system-wide size of a share, including both data and namespace GetNamespace
 	Size = appconsts.ShareSize
 )
 
-var (
-	// MaxSquareSize is currently the maximum size supported for unerasured data in
-	// rsmt2d.ExtendedDataSquare.
-	MaxSquareSize = appconsts.SquareSizeUpperBound(appconsts.LatestVersion)
-)
+// MaxSquareSize is currently the maximum size supported for unerasured data in
+// rsmt2d.ExtendedDataSquare.
+var MaxSquareSize = appconsts.SquareSizeUpperBound(appconsts.LatestVersion)
 
 // Share contains the raw share data without the corresponding namespace.
 // NOTE: Alias for the byte is chosen to keep maximal compatibility, especially with rsmt2d.
diff --git a/state/core_access.go b/state/core_access.go
index 589ee973a2..0adc07fe8e 100644
--- a/state/core_access.go
+++ b/state/core_access.go
@@ -370,7 +370,8 @@ func (ca *CoreAccessor) BalanceForAddress(ctx context.Context, addr Address) (*B
 	err = ca.prt.VerifyValueFromKeys(
 		result.Response.GetProofOps(),
 		head.AppHash,
-		[][]byte{[]byte(banktypes.StoreKey),
+		[][]byte{
+			[]byte(banktypes.StoreKey),
 			prefixedAccountKey,
 		}, value)
 	if err != nil {
@@ -569,6 +570,7 @@ func (ca *CoreAccessor) QueryUnbonding(
 		ValidatorAddr: valAddr.String(),
 	})
 }
+
 func (ca *CoreAccessor) QueryRedelegations(
 	ctx context.Context,
 	srcValAddr,
diff --git a/state/core_access_test.go b/state/core_access_test.go
index 6e56c896f0..0f9b0f5318 100644
--- a/state/core_access_test.go
+++ b/state/core_access_test.go
@@ -90,7 +90,6 @@ func TestSubmitPayForBlob(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func extractPort(addr string) string {