Remove license from mocks (ava-labs#2574)

iCave-Developments · Jan 2, 2024 · e26d9c9 · e26d9c9
1 parent 561efd7
commit e26d9c9
Show file tree

Hide file tree

Showing 56 changed files with 80 additions and 231 deletions.
diff --git a/api/server/mock_server.go b/api/server/mock_server.go
diff --git a/chains/atomic/mock_shared_memory.go b/chains/atomic/mock_shared_memory.go
diff --git a/codec/mock_manager.go b/codec/mock_manager.go
diff --git a/database/mock_batch.go b/database/mock_batch.go
diff --git a/database/mock_iterator.go b/database/mock_iterator.go
diff --git a/indexer/indexer_test.go b/indexer/indexer_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
 	"github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex"
-	"github.com/ava-labs/avalanchego/snow/engine/snowman/block/mocks"
+	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
 	"github.com/ava-labs/avalanchego/snow/snowtest"
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/logging"
@@ -163,7 +163,7 @@ func TestIndexer(t *testing.T) {
 	require.False(previouslyIndexed)
 
 	// Register this chain, creating a new index
-	chainVM := mocks.NewMockChainVM(ctrl)
+	chainVM := block.NewMockChainVM(ctrl)
 	idxr.RegisterChain("chain1", chain1Ctx, chainVM)
 	isIncomplete, err = idxr.isIncomplete(chain1Ctx.ChainID)
 	require.NoError(err)
@@ -426,7 +426,7 @@ func TestIncompleteIndex(t *testing.T) {
 	previouslyIndexed, err := idxr.previouslyIndexed(chain1Ctx.ChainID)
 	require.NoError(err)
 	require.False(previouslyIndexed)
-	chainVM := mocks.NewMockChainVM(ctrl)
+	chainVM := block.NewMockChainVM(ctrl)
 	idxr.RegisterChain("chain1", chain1Ctx, chainVM)
 	isIncomplete, err = idxr.isIncomplete(chain1Ctx.ChainID)
 	require.NoError(err)
@@ -507,7 +507,7 @@ func TestIgnoreNonDefaultChains(t *testing.T) {
 	})
 
 	// RegisterChain should return without adding an index for this chain
-	chainVM := mocks.NewMockChainVM(ctrl)
+	chainVM := block.NewMockChainVM(ctrl)
 	idxr.RegisterChain("chain1", chain1Ctx, chainVM)
 	require.Empty(idxr.blockIndices)
 }
diff --git a/message/mock_message.go b/message/mock_message.go
diff --git a/message/mock_outbound_message_builder.go b/message/mock_outbound_message_builder.go
diff --git a/scripts/mock.gen.sh b/scripts/mock.gen.sh
@@ -14,13 +14,6 @@ then
   go install -v go.uber.org/mock/[email protected]
 fi
 
-if ! command -v go-license &> /dev/null
-then
-  echo "go-license not found, installing..."
-  # https://github.com/palantir/go-license
-  go install -v github.com/palantir/[email protected]
-fi
-
 source ./scripts/constants.sh
 
 # tuples of (source interface import path, comma-separated interface names, output file path)
@@ -32,9 +25,6 @@ do
   echo "Generating ${output_path}..."
   mockgen -package=${package_name} -destination=${output_path} ${src_import_path} ${interface_name}
 
-  go-license \
-  --config=./header.yml \
-  "${output_path}"
 done < "$input"
 
 echo "SUCCESS"
diff --git a/scripts/mocks.mockgen.txt b/scripts/mocks.mockgen.txt
@@ -7,10 +7,10 @@ github.com/ava-labs/avalanchego/message=OutboundMessage=message/mock_message.go
 github.com/ava-labs/avalanchego/message=OutboundMsgBuilder=message/mock_outbound_message_builder.go
 github.com/ava-labs/avalanchego/snow/consensus/snowman=Block=snow/consensus/snowman/mock_block.go
 github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex=LinearizableVM=snow/engine/avalanche/vertex/mock_vm.go
-github.com/ava-labs/avalanchego/snow/engine/snowman/block=BuildBlockWithContextChainVM=snow/engine/snowman/block/mocks/build_block_with_context_vm.go
-github.com/ava-labs/avalanchego/snow/engine/snowman/block=ChainVM=snow/engine/snowman/block/mocks/chain_vm.go
-github.com/ava-labs/avalanchego/snow/engine/snowman/block=StateSyncableVM=snow/engine/snowman/block/mocks/state_syncable_vm.go
-github.com/ava-labs/avalanchego/snow/engine/snowman/block=WithVerifyContext=snow/engine/snowman/block/mocks/with_verify_context.go
+github.com/ava-labs/avalanchego/snow/engine/snowman/block=BuildBlockWithContextChainVM=snow/engine/snowman/block/mock_build_block_with_context_vm.go
+github.com/ava-labs/avalanchego/snow/engine/snowman/block=ChainVM=snow/engine/snowman/block/mock_chain_vm.go
+github.com/ava-labs/avalanchego/snow/engine/snowman/block=StateSyncableVM=snow/engine/snowman/block/mock_state_syncable_vm.go
+github.com/ava-labs/avalanchego/snow/engine/snowman/block=WithVerifyContext=snow/engine/snowman/block/mock_with_verify_context.go
 github.com/ava-labs/avalanchego/snow/networking/handler=Handler=snow/networking/handler/mock_handler.go
 github.com/ava-labs/avalanchego/snow/networking/timeout=Manager=snow/networking/timeout/mock_manager.go
 github.com/ava-labs/avalanchego/snow/networking/tracker=Targeter=snow/networking/tracker/mock_targeter.go

diff --git a/snow/consensus/snowman/mock_block.go b/snow/consensus/snowman/mock_block.go
diff --git a/snow/engine/avalanche/vertex/mock_vm.go b/snow/engine/avalanche/vertex/mock_vm.go
diff --git a/...lock/mocks/build_block_with_context_vm.go → ...block/mock_build_block_with_context_vm.go b/...lock/mocks/build_block_with_context_vm.go → ...block/mock_build_block_with_context_vm.go
diff --git a/snow/engine/snowman/block/mocks/chain_vm.go → snow/engine/snowman/block/mock_chain_vm.go b/snow/engine/snowman/block/mocks/chain_vm.go → snow/engine/snowman/block/mock_chain_vm.go
diff --git a/.../snowman/block/mocks/state_syncable_vm.go → ...e/snowman/block/mock_state_syncable_vm.go b/.../snowman/block/mocks/state_syncable_vm.go → ...e/snowman/block/mock_state_syncable_vm.go
diff --git a/...nowman/block/mocks/with_verify_context.go → ...snowman/block/mock_with_verify_context.go b/...nowman/block/mocks/with_verify_context.go → ...snowman/block/mock_with_verify_context.go
diff --git a/snow/engine/snowman/getter/getter_test.go b/snow/engine/snowman/getter/getter_test.go
@@ -20,7 +20,6 @@ import (
 	"github.com/ava-labs/avalanchego/snow/consensus/snowman"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
-	"github.com/ava-labs/avalanchego/snow/engine/snowman/block/mocks"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/set"
 )
@@ -29,15 +28,15 @@ var errUnknownBlock = errors.New("unknown block")
 
 type StateSyncEnabledMock struct {
 	*block.TestVM
-	*mocks.MockStateSyncableVM
+	*block.MockStateSyncableVM
 }
 
 func newTest(t *testing.T) (common.AllGetsServer, StateSyncEnabledMock, *common.SenderTest) {
 	ctrl := gomock.NewController(t)
 
 	vm := StateSyncEnabledMock{
 		TestVM:              &block.TestVM{},
-		MockStateSyncableVM: mocks.NewMockStateSyncableVM(ctrl),
+		MockStateSyncableVM: block.NewMockStateSyncableVM(ctrl),
 	}
 
 	sender := &common.SenderTest{

diff --git a/snow/networking/handler/mock_handler.go b/snow/networking/handler/mock_handler.go
diff --git a/snow/networking/timeout/mock_manager.go b/snow/networking/timeout/mock_manager.go
diff --git a/snow/networking/tracker/mock_resource_tracker.go b/snow/networking/tracker/mock_resource_tracker.go
diff --git a/snow/networking/tracker/mock_targeter.go b/snow/networking/tracker/mock_targeter.go
diff --git a/snow/uptime/mock_calculator.go b/snow/uptime/mock_calculator.go
diff --git a/snow/validators/mock_state.go b/snow/validators/mock_state.go
diff --git a/snow/validators/mock_subnet_connector.go b/snow/validators/mock_subnet_connector.go
diff --git a/utils/crypto/keychain/mock_ledger.go b/utils/crypto/keychain/mock_ledger.go
diff --git a/utils/filesystem/mock_io.go b/utils/filesystem/mock_io.go
diff --git a/utils/hashing/mock_hasher.go b/utils/hashing/mock_hasher.go
diff --git a/utils/resource/mock_user.go b/utils/resource/mock_user.go
diff --git a/vms/avm/block/mock_block.go b/vms/avm/block/mock_block.go
diff --git a/vms/avm/metrics/mock_metrics.go b/vms/avm/metrics/mock_metrics.go