Trie fixes (long time coming).

exp/main.cpp

@@ -26,6 +26,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/RLP.h>
+#include <libdevcrypto/TrieDB.h>
 #include <libdevcore/CommonIO.h>
 #include <libp2p/All.h>
 #include <libethereum/DownloadMan.h>
@@ -33,11 +34,13 @@
 #include <liblll/All.h>
 #include <libwhisper/WhisperPeer.h>
 #include <libwhisper/WhisperHost.h>
+#include <test/JsonSpiritHeaders.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
 using namespace dev::p2p;
 using namespace dev::shh;
+namespace js = json_spirit;
 
 #if 0
 int main()
@@ -98,8 +101,7 @@ int main()
 #else
 int main()
 {
-	cnote << KeyPair(Secret("0000000000000000000000000000000000000000000000000000000000000000")).address();
-	cnote << KeyPair(Secret("1111111111111111111111111111111111111111111111111111111111111111")).address();
+	return 0;
 }
 #endif
 

libdevcrypto/TrieDB.h

@@ -161,7 +161,7 @@ public:
 	std::string at(bytesConstRef _key) const;
 	void insert(bytesConstRef _key, bytesConstRef _value);
 	void remove(bytesConstRef _key);
-	void contains(bytesConstRef _key) { return !at(_key).empty(); }
+	bool contains(bytesConstRef _key) { return !at(_key).empty(); }
 
 	class iterator
 	{
@@ -809,7 +809,10 @@ template <class DB> bytes GenericTrieDB<DB>::deleteAt(RLP const& _orig, NibbleSl
 
 		// exactly our node - return null.
 		if (k == _k && isLeaf(_orig))
+		{
+			killNode(_orig);
 			return RLPNull;
+		}
 
 		// partial key is our key - move down.
 		if (_k.contains(k))
@@ -917,7 +920,6 @@ template <class DB> bytes GenericTrieDB<DB>::place(RLP const& _orig, NibbleSlice
 	tdebug << "place " << _orig << _k;
 #endif
 
-
 	killNode(_orig);
 	if (_orig.isEmpty())
 		return (RLPStream(2) << hexPrefixEncode(_k, true) << _s).out();