[Monotone-commits-diffs] Revision 8f59becf4a9446463c2475a7399e6642aa453484

[monotone]

-----------------------------------------------------------------
Revision: 8f59becf4a9446463c2475a7399e6642aa453484
Ancestor: 9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2
Author: address@hidden
Date: 2008-02-04T20:34:47
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        Makefile.am cmd_packet.cc key_store.cc key_store.hh keys.cc
        keys.hh lua-testsuite.lua packet.cc packet.hh
        schema_migration.cc
        tests/read_and_convert_old_privkey_packet/__driver__.lua

ChangeLog: 

* packet.hh: Don't forward-declare key_store.  
  (read_packets): No longer takes a key_store argument.
  (packet_consumer): Add consume_old_private_key virtual method.
  (packet_writer): Update declaration.
* packet.cc: No need for app_state.hh, keys.hh, or key_store.hh.
  (packet_writer): Implement consume_old_private_key.
  (feed_packet_consumer): Put in anonymous namespace.  Doesn't need a
  key_store reference.  Use consume_old_private_key.
  (extract_packets): Adjust construction of feed_packet_consumer object.
  Remove key_store argument.
  (read_packets): Adjust call to extract_packets.  Remove key_store argument.
  (packet:validators unit test): No need for an app_state object.  Adjust
  construction of feed_packet_consumer object.
  (packet:roundabout unit test): Similarly.  Add roundabout testing for
  privkey packets.

* keys.cc (do_arc4, migrate_private_key, key:arc4 unit test): Delete.
* keys.hh: Update.
* key_store.cc (key_store::migrate_old_private_key): New function containing
  logic that was in migrate_private_key.
  (key_store_state): Inline constructor.
  (keyreader): Implement consume_old_private_key; requires changing
  constructor and data members to hold on to both the keystore and the
  key_store_state.
  (read_key_dir): Adjust calls to keyreader constructor and read_packets.
* key_store.hh: Update.
* cmd_packet.cc (packet_db_writer): Implement consume_old_private_key.
  (read): Adjust calls to read_packets.
* schema_migration.cc (migrate_to_external_privkeys):
  Use keys.migrate_old_key_pair.
* Makefile.am (UNIT_TEST_SOURCES): Remove keys.cc.
  (UNIT_TEST_SRC_SUPPORT): Remove lua_hooks.cc.
  (UNIT_TEST_OBJ_SUPPORT): Add mtn-lua_hooks.$(OBJEXT).

* lua-testsuite.lua (nokey_mtn): New function.
* tests/read_and_convert_old_privkey_packet: Make test more thorough.
  Also test auto-conversion of privkey packets found in the keydir.

txt4OiaHCnmyK.txt
Description: Diff [9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2] -> [8f59becf4a9446463c2475a7399e6642aa453484]