Take document::Bucket instead of document::BucketId as constructor

argument to storage commands that inherit from BucketCommand.

1 files changed, 3 insertions, 1 deletions

diff --git a/storage/src/tests/distributor/mergeoperationtest.cpp b/storage/src/tests/distributor/mergeoperationtest.cpp
index 7e7ca52635e..d33ee64a883 100644
--- a/storage/src/tests/distributor/mergeoperationtest.cpp
+++ b/storage/src/tests/distributor/mergeoperationtest.cpp
@@ -8,10 +8,12 @@
 #include <vespa/storage/distributor/operations/idealstate/mergeoperation.h>
 #include <vespa/storage/distributor/bucketdbupdater.h>
 #include <tests/distributor/distributortestutil.h>
+#include <tests/common/make_document_bucket.h>
 #include <vespa/storage/distributor/distributor.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 
 using std::shared_ptr;
+using storage::test::makeDocumentBucket;
 
 namespace storage {
 namespace distributor {
@@ -320,7 +322,7 @@ MergeOperationTest::doNotRemoveCopiesWithPendingMessages() {
     // Removes are blocked by all and any operation types, so can just choose
     // at will.
     api::StorageMessage::SP msg(
-            new api::SetBucketStateCommand(bucket, api::SetBucketStateCommand::ACTIVE));
+            new api::SetBucketStateCommand(makeDocumentBucket(bucket), api::SetBucketStateCommand::ACTIVE));
     msg->setAddress(api::StorageMessageAddress("storage", lib::NodeType::STORAGE, 1));
     _pendingTracker->insert(msg);