From bddc87ccf2a5f4d0e2994f4ebe2ff86611f401eb Mon Sep 17 00:00:00 2001
From: paulavidas <paulavidas@google.com>
Date: Tue, 30 Jul 2019 06:58:08 -0700
Subject: [PATCH] Remove dummy catalogues in tests.
PiperOrigin-RevId: 260707041
---
cc/aead/BUILD.bazel | 1 -
cc/aead/CMakeLists.txt | 1 -
cc/aead/aead_config_test.cc | 12 ------------
cc/daead/BUILD.bazel | 1 -
cc/daead/CMakeLists.txt | 1 -
cc/daead/deterministic_aead_config_test.cc | 12 ------------
cc/hybrid/BUILD.bazel | 1 -
cc/hybrid/CMakeLists.txt | 1 -
cc/hybrid/hybrid_config_test.cc | 12 ------------
cc/mac/BUILD.bazel | 1 -
cc/mac/CMakeLists.txt | 1 -
cc/mac/mac_config_test.cc | 14 --------------
cc/signature/BUILD.bazel | 1 -
cc/signature/CMakeLists.txt | 1 -
cc/signature/signature_config_test.cc | 12 ------------
cc/streamingaead/BUILD.bazel | 1 -
cc/streamingaead/CMakeLists.txt | 1 -
cc/streamingaead/streaming_aead_config_test.cc | 14 --------------
18 files changed, 88 deletions(-)
diff --git a/cc/aead/BUILD.bazel b/cc/aead/BUILD.bazel
index 98d03ee9e..8aa7be990 100644
--- a/cc/aead/BUILD.bazel
+++ b/cc/aead/BUILD.bazel
@@ -301,7 +301,6 @@ cc_test(
":aead_config",
":aead_key_templates",
"//cc:aead",
- "//cc:catalogue",
"//cc:config",
"//cc:keyset_handle",
"//cc:registry",
diff --git a/cc/aead/CMakeLists.txt b/cc/aead/CMakeLists.txt
index 3e004e5e9..9cb38a9da 100644
--- a/cc/aead/CMakeLists.txt
+++ b/cc/aead/CMakeLists.txt
@@ -267,7 +267,6 @@ tink_cc_test(
tink::aead::aead_config
tink::aead::aead_key_templates
tink::core::aead
- tink::core::catalogue
tink::core::config
tink::core::keyset_handle
tink::core::registry
diff --git a/cc/aead/aead_config_test.cc b/cc/aead/aead_config_test.cc
index cd3beb5d1..20b0086ab 100644
--- a/cc/aead/aead_config_test.cc
+++ b/cc/aead/aead_config_test.cc
@@ -20,7 +20,6 @@
#include "gtest/gtest.h"
#include "tink/aead.h"
#include "tink/aead/aead_key_templates.h"
-#include "tink/catalogue.h"
#include "tink/config.h"
#include "tink/keyset_handle.h"
#include "tink/registry.h"
@@ -34,17 +33,6 @@ namespace {
using ::crypto::tink::test::DummyAead;
using ::testing::Eq;
-class DummyAeadCatalogue : public Catalogue<Aead> {
- public:
- DummyAeadCatalogue() {}
-
- crypto::tink::util::StatusOr<std::unique_ptr<KeyManager<Aead>>> GetKeyManager(
- const std::string& type_url, const std::string& primitive_name,
- uint32_t min_version) const override {
- return util::Status::UNKNOWN;
- }
-};
-
class AeadConfigTest : public ::testing::Test {
protected:
void SetUp() override { Registry::Reset(); }
diff --git a/cc/daead/BUILD.bazel b/cc/daead/BUILD.bazel
index 386d9dfb0..cb55c588d 100644
--- a/cc/daead/BUILD.bazel
+++ b/cc/daead/BUILD.bazel
@@ -141,7 +141,6 @@ cc_test(
deps = [
":deterministic_aead_config",
":deterministic_aead_key_templates",
- "//cc:catalogue",
"//cc:config",
"//cc:deterministic_aead",
"//cc:keyset_handle",
diff --git a/cc/daead/CMakeLists.txt b/cc/daead/CMakeLists.txt
index 1c520f46b..d5736172f 100644
--- a/cc/daead/CMakeLists.txt
+++ b/cc/daead/CMakeLists.txt
@@ -117,7 +117,6 @@ tink_cc_test(
DEPS
tink::daead::deterministic_aead_config
tink::daead::deterministic_aead_key_templates
- tink::core::catalogue
tink::core::config
tink::core::deterministic_aead
tink::core::keyset_handle
diff --git a/cc/daead/deterministic_aead_config_test.cc b/cc/daead/deterministic_aead_config_test.cc
index 423c4f527..def97af88 100644
--- a/cc/daead/deterministic_aead_config_test.cc
+++ b/cc/daead/deterministic_aead_config_test.cc
@@ -18,7 +18,6 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "tink/catalogue.h"
#include "tink/config.h"
#include "tink/daead/deterministic_aead_key_templates.h"
#include "tink/deterministic_aead.h"
@@ -34,17 +33,6 @@ namespace {
using ::crypto::tink::test::DummyDeterministicAead;
using ::testing::Eq;
-class DummyDaeadCatalogue : public Catalogue<DeterministicAead> {
- public:
- DummyDaeadCatalogue() {}
-
- crypto::tink::util::StatusOr<std::unique_ptr<KeyManager<DeterministicAead>>>
- GetKeyManager(const std::string& type_url, const std::string& primitive_name,
- uint32_t min_version) const override {
- return util::Status::UNKNOWN;
- }
-};
-
class DeterministicAeadConfigTest : public ::testing::Test {
protected:
void SetUp() override { Registry::Reset(); }
diff --git a/cc/hybrid/BUILD.bazel b/cc/hybrid/BUILD.bazel
index 65fb89f76..274bbecb4 100644
--- a/cc/hybrid/BUILD.bazel
+++ b/cc/hybrid/BUILD.bazel
@@ -246,7 +246,6 @@ cc_test(
deps = [
":hybrid_config",
":hybrid_key_templates",
- "//cc:catalogue",
"//cc:config",
"//cc:hybrid_decrypt",
"//cc:hybrid_encrypt",
diff --git a/cc/hybrid/CMakeLists.txt b/cc/hybrid/CMakeLists.txt
index 8f7795f71..70f357c9d 100644
--- a/cc/hybrid/CMakeLists.txt
+++ b/cc/hybrid/CMakeLists.txt
@@ -207,7 +207,6 @@ tink_cc_test(
DEPS
tink::hybrid::hybrid_config
tink::hybrid::hybrid_key_templates
- tink::core::catalogue
tink::core::config
tink::core::hybrid_decrypt
tink::core::hybrid_encrypt
diff --git a/cc/hybrid/hybrid_config_test.cc b/cc/hybrid/hybrid_config_test.cc
index 5cd12dd74..a7e4d7c60 100644
--- a/cc/hybrid/hybrid_config_test.cc
+++ b/cc/hybrid/hybrid_config_test.cc
@@ -18,7 +18,6 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "tink/catalogue.h"
#include "tink/config.h"
#include "tink/hybrid/hybrid_key_templates.h"
#include "tink/hybrid_decrypt.h"
@@ -35,17 +34,6 @@ namespace {
using ::crypto::tink::test::DummyHybridDecrypt;
using ::crypto::tink::test::DummyHybridEncrypt;
-class DummyHybridDecryptCatalogue : public Catalogue<HybridDecrypt> {
- public:
- DummyHybridDecryptCatalogue() {}
-
- crypto::tink::util::StatusOr<std::unique_ptr<KeyManager<HybridDecrypt>>>
- GetKeyManager(const std::string& type_url, const std::string& primitive_name,
- uint32_t min_version) const override {
- return util::Status::UNKNOWN;
- }
-};
-
class HybridConfigTest : public ::testing::Test {
protected:
void SetUp() override { Registry::Reset(); }
diff --git a/cc/mac/BUILD.bazel b/cc/mac/BUILD.bazel
index f0ddef3b4..a9d495fb8 100644
--- a/cc/mac/BUILD.bazel
+++ b/cc/mac/BUILD.bazel
@@ -148,7 +148,6 @@ cc_test(
deps = [
":mac_config",
":mac_key_templates",
- "//cc:catalogue",
"//cc:config",
"//cc:keyset_handle",
"//cc:mac",
diff --git a/cc/mac/CMakeLists.txt b/cc/mac/CMakeLists.txt
index e379a8ff6..93d10238c 100644
--- a/cc/mac/CMakeLists.txt
+++ b/cc/mac/CMakeLists.txt
@@ -126,7 +126,6 @@ tink_cc_test(
DEPS
tink::mac::mac_config
tink::mac::mac_key_templates
- tink::core::catalogue
tink::core::config
tink::core::keyset_handle
tink::core::mac
diff --git a/cc/mac/mac_config_test.cc b/cc/mac/mac_config_test.cc
index 1624089ed..5b32cebce 100644
--- a/cc/mac/mac_config_test.cc
+++ b/cc/mac/mac_config_test.cc
@@ -16,7 +16,6 @@
#include "tink/mac/mac_config.h"
-#include "tink/catalogue.h"
#include "tink/config.h"
#include "tink/keyset_handle.h"
#include "tink/mac.h"
@@ -32,19 +31,6 @@ namespace {
using ::crypto::tink::test::DummyMac;
-class DummyMacCatalogue : public Catalogue<Mac> {
- public:
- DummyMacCatalogue() {}
-
- crypto::tink::util::StatusOr<std::unique_ptr<KeyManager<Mac>>>
- GetKeyManager(const std::string& type_url,
- const std::string& primitive_name,
- uint32_t min_version) const override {
- return util::Status::UNKNOWN;
- }
-};
-
-
class MacConfigTest : public ::testing::Test {
protected:
void SetUp() override {
diff --git a/cc/signature/BUILD.bazel b/cc/signature/BUILD.bazel
index 628b0d5ad..fc27e3a63 100644
--- a/cc/signature/BUILD.bazel
+++ b/cc/signature/BUILD.bazel
@@ -623,7 +623,6 @@ cc_test(
deps = [
":signature_config",
":signature_key_templates",
- "//cc:catalogue",
"//cc:config",
"//cc:keyset_handle",
"//cc:public_key_sign",
diff --git a/cc/signature/CMakeLists.txt b/cc/signature/CMakeLists.txt
index 31e2cb48c..d92bcee69 100644
--- a/cc/signature/CMakeLists.txt
+++ b/cc/signature/CMakeLists.txt
@@ -539,7 +539,6 @@ tink_cc_test(
DEPS
tink::signature::signature_config
tink::signature::signature_key_templates
- tink::core::catalogue
tink::core::config
tink::core::keyset_handle
tink::core::public_key_sign
diff --git a/cc/signature/signature_config_test.cc b/cc/signature/signature_config_test.cc
index 6044d3abc..5335f6d2b 100644
--- a/cc/signature/signature_config_test.cc
+++ b/cc/signature/signature_config_test.cc
@@ -18,7 +18,6 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "tink/catalogue.h"
#include "tink/config.h"
#include "tink/keyset_handle.h"
#include "tink/public_key_sign.h"
@@ -36,17 +35,6 @@ namespace {
using ::crypto::tink::test::DummyPublicKeySign;
using ::crypto::tink::test::DummyPublicKeyVerify;
-class DummySignCatalogue : public Catalogue<PublicKeySign> {
- public:
- DummySignCatalogue() {}
-
- crypto::tink::util::StatusOr<std::unique_ptr<KeyManager<PublicKeySign>>>
- GetKeyManager(const std::string& type_url, const std::string& primitive_name,
- uint32_t min_version) const override {
- return util::Status::UNKNOWN;
- }
-};
-
class SignatureConfigTest : public ::testing::Test {
protected:
void SetUp() override { Registry::Reset(); }
diff --git a/cc/streamingaead/BUILD.bazel b/cc/streamingaead/BUILD.bazel
index f7ce05601..0ef9e6f3f 100644
--- a/cc/streamingaead/BUILD.bazel
+++ b/cc/streamingaead/BUILD.bazel
@@ -235,7 +235,6 @@ cc_test(
deps = [
":streaming_aead_config",
":streaming_aead_key_templates",
- "//cc:catalogue",
"//cc:config",
"//cc:keyset_handle",
"//cc:registry",
diff --git a/cc/streamingaead/CMakeLists.txt b/cc/streamingaead/CMakeLists.txt
index 1769066ba..1e915828d 100644
--- a/cc/streamingaead/CMakeLists.txt
+++ b/cc/streamingaead/CMakeLists.txt
@@ -202,7 +202,6 @@ tink_cc_test(
SRCS streaming_aead_config_test.cc
DEPS
absl::memory
- tink::core::catalogue
tink::core::config
tink::core::keyset_handle
tink::core::registry
diff --git a/cc/streamingaead/streaming_aead_config_test.cc b/cc/streamingaead/streaming_aead_config_test.cc
index 2ffdfc3a9..162ba8b29 100644
--- a/cc/streamingaead/streaming_aead_config_test.cc
+++ b/cc/streamingaead/streaming_aead_config_test.cc
@@ -22,7 +22,6 @@
#include "absl/memory/memory.h"
#include "tink/streaming_aead.h"
#include "tink/streamingaead/streaming_aead_key_templates.h"
-#include "tink/catalogue.h"
#include "tink/config.h"
#include "tink/keyset_handle.h"
#include "tink/registry.h"
@@ -38,19 +37,6 @@ namespace {
using ::crypto::tink::test::DummyStreamingAead;
using ::testing::Eq;
-class DummyStreamingAeadCatalogue : public Catalogue<StreamingAead> {
- public:
- DummyStreamingAeadCatalogue() {}
-
- crypto::tink::util::StatusOr<std::unique_ptr<KeyManager<StreamingAead>>>
- GetKeyManager(
- const std::string& type_url,
- const std::string& primitive_name,
- uint32_t min_version) const override {
- return util::Status::UNKNOWN;
- }
-};
-
class StreamingAeadConfigTest : public ::testing::Test {
protected:
void SetUp() override { Registry::Reset(); }
--
GitLab