more var renaming

da/celestia/mock/server.go

@@ -23,7 +23,7 @@ import (
 
 // Server mocks celestia-node HTTP API.
 type Server struct {
-	mock      *local.DataAvailabilityLayerClient
+	da        *local.DataAvailabilityLayerClient
 	blockTime time.Duration
 	server    *http.Server
 	logger    log.Logger
@@ -32,19 +32,19 @@ type Server struct {
 // NewServer creates new instance of Server.
 func NewServer(blockTime time.Duration, logger log.Logger) *Server {
 	return &Server{
-		mock:      new(local.DataAvailabilityLayerClient),
+		da:        new(local.DataAvailabilityLayerClient),
 		blockTime: blockTime,
 		logger:    logger,
 	}
 }
 
 // Start starts HTTP server with given listener.
 func (s *Server) Start(listener net.Listener) error {
-	err := s.mock.Init([]byte(s.blockTime.String()), pubsub.NewServer(), store.NewDefaultInMemoryKVStore(), s.logger)
+	err := s.da.Init([]byte(s.blockTime.String()), pubsub.NewServer(), store.NewDefaultInMemoryKVStore(), s.logger)
 	if err != nil {
 		return err
 	}
-	err = s.mock.Start()
+	err = s.da.Start()
 	if err != nil {
 		return err
 	}
@@ -93,7 +93,7 @@ func (s *Server) submit(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	res := s.mock.SubmitBatch(&batch)
+	res := s.da.SubmitBatch(&batch)
 	code := 0
 	if res.Code != da.StatusSuccess {
 		code = 3
@@ -122,7 +122,7 @@ func (s *Server) shares(w http.ResponseWriter, r *http.Request) {
 	daMetaData := &da.DASubmitMetaData{
 		Height: height,
 	}
-	res := s.mock.RetrieveBatches(daMetaData)
+	res := s.da.RetrieveBatches(daMetaData)
 	if res.Code != da.StatusSuccess {
 		s.writeError(w, errors.New(res.Message))
 		return
@@ -167,7 +167,7 @@ func (s *Server) data(w http.ResponseWriter, r *http.Request) {
 	daMetaData := &da.DASubmitMetaData{
 		Height: height,
 	}
-	res := s.mock.RetrieveBatches(daMetaData)
+	res := s.da.RetrieveBatches(daMetaData)
 	if res.Code != da.StatusSuccess {
 		s.writeError(w, errors.New(res.Message))
 		return

da/grpc/mockserv/mockserv.go

@@ -23,12 +23,12 @@ func GetServer(kv store.KVStore, conf grpcda.Config, mockConfig []byte) *grpc.Se
 
 	srv := grpc.NewServer()
 	mockImpl := &mockImpl{}
-	err := mockImpl.mock.Init(mockConfig, pubsub.NewServer(), kv, logger)
+	err := mockImpl.da.Init(mockConfig, pubsub.NewServer(), kv, logger)
 	if err != nil {
 		logger.Error("failed to initialize mock DALC", "error", err)
 		panic(err)
 	}
-	err = mockImpl.mock.Start()
+	err = mockImpl.da.Start()
 	if err != nil {
 		logger.Error("failed to start mock DALC", "error", err)
 		panic(err)
@@ -38,7 +38,7 @@ func GetServer(kv store.KVStore, conf grpcda.Config, mockConfig []byte) *grpc.Se
 }
 
 type mockImpl struct {
-	mock local.DataAvailabilityLayerClient
+	da local.DataAvailabilityLayerClient
 }
 
 func (m *mockImpl) SubmitBatch(_ context.Context, request *dalc.SubmitBatchRequest) (*dalc.SubmitBatchResponse, error) {
@@ -47,7 +47,7 @@ func (m *mockImpl) SubmitBatch(_ context.Context, request *dalc.SubmitBatchReque
 	if err != nil {
 		return nil, err
 	}
-	resp := m.mock.SubmitBatch(&b)
+	resp := m.da.SubmitBatch(&b)
 	return &dalc.SubmitBatchResponse{
 		Result: &dalc.DAResponse{
 			Code:            dalc.StatusCode(resp.Code),
@@ -62,7 +62,7 @@ func (m *mockImpl) CheckBatchAvailability(_ context.Context, request *dalc.Check
 	daMetaData := &da.DASubmitMetaData{
 		Height: request.DataLayerHeight,
 	}
-	resp := m.mock.CheckBatchAvailability(daMetaData)
+	resp := m.da.CheckBatchAvailability(daMetaData)
 	return &dalc.CheckBatchAvailabilityResponse{
 		Result: &dalc.DAResponse{
 			Code:    dalc.StatusCode(resp.Code),
@@ -75,7 +75,7 @@ func (m *mockImpl) RetrieveBatches(context context.Context, request *dalc.Retrie
 	dataMetaData := &da.DASubmitMetaData{
 		Height: request.DataLayerHeight,
 	}
-	resp := m.mock.RetrieveBatches(dataMetaData)
+	resp := m.da.RetrieveBatches(dataMetaData)
 	batches := make([]*dymint.Batch, len(resp.Batches))
 	for i := range resp.Batches {
 		batches[i] = resp.Batches[i].ToProto()