GC LoadTypeSet

2 files changed, 3 insertions, 13 deletions

diff --git a/storage/src/tests/storageserver/rpc/message_codec_provider_test.cpp b/storage/src/tests/storageserver/rpc/message_codec_provider_test.cpp
index 0d4e3b8df93..67474f86df0 100644
--- a/storage/src/tests/storageserver/rpc/message_codec_provider_test.cpp
+++ b/storage/src/tests/storageserver/rpc/message_codec_provider_test.cpp
@@ -2,7 +2,6 @@
 #include <vespa/storage/storageserver/rpc/message_codec_provider.h>
 #include <vespa/storageapi/mbusprot/protocolserialization7.h>
 #include <vespa/document/base/testdocman.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 using namespace ::testing;
@@ -12,17 +11,13 @@ namespace storage::rpc {
 struct MessageCodecProviderTest : Test {
     std::shared_ptr<const document::DocumentTypeRepo> _repo1;
     std::shared_ptr<const document::DocumentTypeRepo> _repo2;
-    std::shared_ptr<const documentapi::LoadTypeSet> _load_types1;
-    std::shared_ptr<const documentapi::LoadTypeSet> _load_types2;
     MessageCodecProvider _provider;
 
     // We don't care about repo/set contents, just their pointer identities
     MessageCodecProviderTest()
         : _repo1(document::TestDocRepo().getTypeRepoSp()),
           _repo2(document::TestDocRepo().getTypeRepoSp()),
-          _load_types1(std::make_shared<documentapi::LoadTypeSet>()),
-          _load_types2(std::make_shared<documentapi::LoadTypeSet>()),
-          _provider(_repo1, _load_types1)
+          _provider(_repo1)
     {}
     ~MessageCodecProviderTest() override;
 };
@@ -32,15 +27,13 @@ MessageCodecProviderTest::~MessageCodecProviderTest() = default;
 TEST_F(MessageCodecProviderTest, initially_provides_constructed_repos) {
     auto wrapped = _provider.wrapped_codec();
     EXPECT_EQ(&wrapped->codec().type_repo(), _repo1.get());
-    EXPECT_EQ(&wrapped->codec().load_type_set(), _load_types1.get());
 }
 
 TEST_F(MessageCodecProviderTest, updated_repos_reflected_in_new_wrapped_codec) {
-    _provider.update_atomically(_repo2, _load_types2);
+    _provider.update_atomically(_repo2);
 
     auto wrapped = _provider.wrapped_codec();
     EXPECT_EQ(&wrapped->codec().type_repo(), _repo2.get());
-    EXPECT_EQ(&wrapped->codec().load_type_set(), _load_types2.get());
 }
 
 }
diff --git a/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp b/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp
index 7f2279e1f4e..630ad7685e4 100644
--- a/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp
+++ b/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp
@@ -3,7 +3,6 @@
 #include <vespa/document/base/testdocman.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/messagebus/testlib/slobrok.h>
@@ -103,7 +102,6 @@ class RpcNode {
 protected:
     vdstestlib::DirConfig                             _config;
     std::shared_ptr<const document::DocumentTypeRepo> _doc_type_repo;
-    std::shared_ptr<const documentapi::LoadTypeSet>   _load_type_set;
     LockingMockOperationDispatcher                    _messages;
     std::unique_ptr<MessageCodecProvider>             _codec_provider;
     std::unique_ptr<SharedRpcResources>               _shared_rpc_resources;
@@ -113,7 +111,6 @@ public:
     RpcNode(uint16_t node_index, bool is_distributor, const mbus::Slobrok& slobrok)
         : _config(getStandardConfig(true)),
           _doc_type_repo(document::TestDocRepo().getTypeRepoSp()),
-          _load_type_set(std::make_shared<documentapi::LoadTypeSet>()),
           _node_address(make_address(node_index, is_distributor)),
           _slobrok_id(to_slobrok_id(_node_address))
     {
@@ -124,7 +121,7 @@ public:
 
         _shared_rpc_resources = std::make_unique<SharedRpcResources>(_config.getConfigId(), 0, 1);
         // TODO make codec provider into interface so we can test decode-failures more easily?
-        _codec_provider = std::make_unique<MessageCodecProvider>(_doc_type_repo, _load_type_set);
+        _codec_provider = std::make_unique<MessageCodecProvider>(_doc_type_repo);
     }
     ~RpcNode();