Refactor: implement CPubKey::data()

random-zebra · random-zebra · commit 79b1e5025250 · 2021-07-25T20:53:08.000+02:00
diff --git a/src/pubkey.h b/src/pubkey.h
@@ -106,6 +106,7 @@ class CPubKey
 
     //! Simple read-only vector-like interface to the pubkey data.
     unsigned int size() const { return GetLen(vch[0]); }
+    const unsigned char* data() const { return vch; }
     const unsigned char* begin() const { return vch; }
     const unsigned char* end() const { return vch + size(); }
     const unsigned char& operator[](unsigned int pos) const { return vch[pos]; }
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
@@ -39,7 +39,7 @@ class CSignatureCache
     void
     ComputeEntry(uint256& entry, const uint256 &hash, const std::vector<unsigned char>& vchSig, const CPubKey& pubkey)
     {
-        CSHA256().Write(nonce.begin(), 32).Write(hash.begin(), 32).Write(&pubkey[0], pubkey.size()).Write(vchSig.data(), vchSig.size()).Finalize(entry.begin());
+        CSHA256().Write(nonce.begin(), 32).Write(hash.begin(), 32).Write(pubkey.data(), pubkey.size()).Write(vchSig.data(), vchSig.size()).Finalize(entry.begin());
     }
 
     bool

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class CSignatureCache`
`39`	`39`	`void`
`40`	`40`	`ComputeEntry(uint256& entry, const uint256 &hash, const std::vector<unsigned char>& vchSig, const CPubKey& pubkey)`
`41`	`41`	`{`
`42`		`- CSHA256().Write(nonce.begin(), 32).Write(hash.begin(), 32).Write(&pubkey[0], pubkey.size()).Write(vchSig.data(), vchSig.size()).Finalize(entry.begin());`
	`42`	`+ CSHA256().Write(nonce.begin(), 32).Write(hash.begin(), 32).Write(pubkey.data(), pubkey.size()).Write(vchSig.data(), vchSig.size()).Finalize(entry.begin());`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`bool`