Remove some code that was not used, nor correct.

Fix the code that was used, but was incorrect.

3 files changed, 2 insertions, 13 deletions

diff --git a/config/src/vespa/config/frt/frtconfigrequest.h b/config/src/vespa/config/frt/frtconfigrequest.h
index f34c35ed255..061151d5f39 100644
--- a/config/src/vespa/config/frt/frtconfigrequest.h
+++ b/config/src/vespa/config/frt/frtconfigrequest.h
@@ -22,7 +22,6 @@ public:
     typedef std::unique_ptr<FRTConfigRequest> UP;
     FRTConfigRequest(Connection * connection, const ConfigKey & key);
     ~FRTConfigRequest();
-    virtual bool verifyKey(const ConfigKey & key) const = 0;
 
     bool abort() override;
     bool isAborted() const override;
diff --git a/config/src/vespa/config/frt/slimeconfigrequest.cpp b/config/src/vespa/config/frt/slimeconfigrequest.cpp
index 12dbbab2eb7..27ac39ae56a 100644
--- a/config/src/vespa/config/frt/slimeconfigrequest.cpp
+++ b/config/src/vespa/config/frt/slimeconfigrequest.cpp
@@ -40,19 +40,10 @@ SlimeConfigRequest::SlimeConfigRequest(Connection * connection,
 }
 
 bool
-SlimeConfigRequest::verifyKey(const ConfigKey & key) const
-{
-    return (key.getDefName().compare(_parameters[0]._string._str) == 0 &&
-            key.getDefNamespace().compare(_parameters[7]._string._str) == 0 &&
-            key.getConfigId().compare(_parameters[3]._string._str) == 0 &&
-            key.getDefMd5().compare(_parameters[2]._string._str) == 0);
-}
-
-bool
 SlimeConfigRequest::verifyState(const ConfigState & state) const
 {
-    return (state.md5.compare(_parameters[4]._string._str) == 0 &&
-            state.generation == static_cast<int64_t>(_parameters[5]._intval64));
+    return (state.md5.compare(_data[REQUEST_CONFIG_MD5].asString().make_stringref()) == 0 &&
+            state.generation == _data[REQUEST_CURRENT_GENERATION].asLong());
 }
 
 void
diff --git a/config/src/vespa/config/frt/slimeconfigrequest.h b/config/src/vespa/config/frt/slimeconfigrequest.h
index d616876780e..625d70c094b 100644
--- a/config/src/vespa/config/frt/slimeconfigrequest.h
+++ b/config/src/vespa/config/frt/slimeconfigrequest.h
@@ -30,7 +30,6 @@ public:
                        const CompressionType & compressionType,
                        const vespalib::string & methodName);
     ~SlimeConfigRequest() {}
-    bool verifyKey(const ConfigKey & key) const override;
     bool verifyState(const ConfigState & state) const override;
     virtual ConfigResponse::UP createResponse(FRT_RPCRequest * request) const override = 0;
 private: