Merge branch 'feat/replace-multistore-carv2' of github.com:filecoin-project/lotus into feat/replace-multistore-carv2

markets/dagstore/mocks/mock_lotus_accessor.go

@@ -0,0 +1,81 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: markets/dagstore/lotusaccessor.go
+
+// Package mock_dagstore is a generated GoMock package.
+package mock_dagstore
+
+import (
+	context "context"
+	io "io"
+	reflect "reflect"
+
+	gomock "github.com/golang/mock/gomock"
+	cid "github.com/ipfs/go-cid"
+)
+
+// MockLotusAccessor is a mock of LotusAccessor interface.
+type MockLotusAccessor struct {
+	ctrl     *gomock.Controller
+	recorder *MockLotusAccessorMockRecorder
+}
+
+// MockLotusAccessorMockRecorder is the mock recorder for MockLotusAccessor.
+type MockLotusAccessorMockRecorder struct {
+	mock *MockLotusAccessor
+}
+
+// NewMockLotusAccessor creates a new mock instance.
+func NewMockLotusAccessor(ctrl *gomock.Controller) *MockLotusAccessor {
+	mock := &MockLotusAccessor{ctrl: ctrl}
+	mock.recorder = &MockLotusAccessorMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockLotusAccessor) EXPECT() *MockLotusAccessorMockRecorder {
+	return m.recorder
+}
+
+// FetchUnsealedPiece mocks base method.
+func (m *MockLotusAccessor) FetchUnsealedPiece(ctx context.Context, pieceCid cid.Cid) (io.ReadCloser, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "FetchUnsealedPiece", ctx, pieceCid)
+	ret0, _ := ret[0].(io.ReadCloser)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// FetchUnsealedPiece indicates an expected call of FetchUnsealedPiece.
+func (mr *MockLotusAccessorMockRecorder) FetchUnsealedPiece(ctx, pieceCid interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchUnsealedPiece", reflect.TypeOf((*MockLotusAccessor)(nil).FetchUnsealedPiece), ctx, pieceCid)
+}
+
+// GetUnpaddedCARSize mocks base method.
+func (m *MockLotusAccessor) GetUnpaddedCARSize(pieceCid cid.Cid) (uint64, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetUnpaddedCARSize", pieceCid)
+	ret0, _ := ret[0].(uint64)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetUnpaddedCARSize indicates an expected call of GetUnpaddedCARSize.
+func (mr *MockLotusAccessorMockRecorder) GetUnpaddedCARSize(pieceCid interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUnpaddedCARSize", reflect.TypeOf((*MockLotusAccessor)(nil).GetUnpaddedCARSize), pieceCid)
+}
+
+// Start mocks base method.
+func (m *MockLotusAccessor) Start(ctx context.Context) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Start", ctx)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Start indicates an expected call of Start.
+func (mr *MockLotusAccessorMockRecorder) Start(ctx interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockLotusAccessor)(nil).Start), ctx)
+}

markets/dagstore/mocks/mock_lotus_mount_api.go

@@ -1,67 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: mount_api.go
-
-// Package mock_dagstore is a generated GoMock package.
-package mock_dagstore
-
-import (
-	context "context"
-	io "io"
-	reflect "reflect"
-
-	gomock "github.com/golang/mock/gomock"
-	cid "github.com/ipfs/go-cid"
-)
-
-// MockLotusMountAPI is a mock of LotusMountAPI interface.
-type MockLotusMountAPI struct {
-	ctrl     *gomock.Controller
-	recorder *MockLotusMountAPIMockRecorder
-}
-
-// MockLotusMountAPIMockRecorder is the mock recorder for MockLotusMountAPI.
-type MockLotusMountAPIMockRecorder struct {
-	mock *MockLotusMountAPI
-}
-
-// NewMockLotusMountAPI creates a new mock instance.
-func NewMockLotusMountAPI(ctrl *gomock.Controller) *MockLotusMountAPI {
-	mock := &MockLotusMountAPI{ctrl: ctrl}
-	mock.recorder = &MockLotusMountAPIMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockLotusMountAPI) EXPECT() *MockLotusMountAPIMockRecorder {
-	return m.recorder
-}
-
-// FetchUnsealedPiece mocks base method.
-func (m *MockLotusMountAPI) FetchUnsealedPiece(ctx context.Context, pieceCid cid.Cid) (io.ReadCloser, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "FetchUnsealedPiece", ctx, pieceCid)
-	ret0, _ := ret[0].(io.ReadCloser)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// FetchUnsealedPiece indicates an expected call of FetchUnsealedPiece.
-func (mr *MockLotusMountAPIMockRecorder) FetchUnsealedPiece(ctx, pieceCid interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchUnsealedPiece", reflect.TypeOf((*MockLotusMountAPI)(nil).FetchUnsealedPiece), ctx, pieceCid)
-}
-
-// GetUnpaddedCARSize mocks base method.
-func (m *MockLotusMountAPI) GetUnpaddedCARSize(pieceCid cid.Cid) (uint64, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetUnpaddedCARSize", pieceCid)
-	ret0, _ := ret[0].(uint64)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetUnpaddedCARSize indicates an expected call of GetUnpaddedCARSize.
-func (mr *MockLotusMountAPIMockRecorder) GetUnpaddedCARSize(pieceCid interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUnpaddedCARSize", reflect.TypeOf((*MockLotusMountAPI)(nil).GetUnpaddedCARSize), pieceCid)
-}

markets/dagstore/mount_test.go

@@ -26,7 +26,7 @@ func TestLotusMount(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	// create a mock lotus api that returns the reader we want
-	mockLotusMountAPI := mock_dagstore.NewMockLotusMountAPI(mockCtrl)
+	mockLotusMountAPI := mock_dagstore.NewMockLotusAccessor(mockCtrl)
 	mockLotusMountAPI.EXPECT().FetchUnsealedPiece(gomock.Any(), cid).Return(&readCloser{ioutil.NopCloser(strings.NewReader("testing"))}, nil).Times(1)
 	mockLotusMountAPI.EXPECT().FetchUnsealedPiece(gomock.Any(), cid).Return(&readCloser{ioutil.NopCloser(strings.NewReader("testing"))}, nil).Times(1)
 	mockLotusMountAPI.EXPECT().GetUnpaddedCARSize(cid).Return(uint64(100), nil).Times(1)
@@ -105,7 +105,7 @@ func TestLotusMountRegistration(t *testing.T) {
 	// when test is done, assert expectations on all mock objects.
 	defer mockCtrl.Finish()
 
-	mockLotusMountAPI := mock_dagstore.NewMockLotusMountAPI(mockCtrl)
+	mockLotusMountAPI := mock_dagstore.NewMockLotusAccessor(mockCtrl)
 	registry := mount.NewRegistry()
 	err = registry.Register(lotusScheme, NewLotusMountTemplate(mockLotusMountAPI))
 	require.NoError(t, err)

markets/dagstore/wrapper_test.go

@@ -181,6 +181,10 @@ func (m *mockDagStore) Close() error {
 type mockLotusMount struct {
 }
 
+func (m mockLotusMount) Start(ctx context.Context) error {
+	return nil
+}
+
 func (m mockLotusMount) FetchUnsealedPiece(ctx context.Context, pieceCid cid.Cid) (io.ReadCloser, error) {
 	panic("implement me")
 }