[Monotone-commits-diffs] Revision cfd236edbef20bc1d5a4d121d740cb830da2b030

[monotone]

-----------------------------------------------------------------
Revision: cfd236edbef20bc1d5a4d121d740cb830da2b030
Ancestor: cd433c065f09f8782c9ecc29b011b89a628bd58b
Author: address@hidden
Date: 2007-03-20T04:19:19
Branch: net.venge.monotone.experiment.dbapi

Modified files:
        app_state.cc cmd_merging.cc cmd_packet.cc cmd_ws_commit.cc
        key_store.cc key_store.hh netsync.cc packet.cc packet.hh

ChangeLog: 

* key_store.cc: Include database.hh.
(struct keyreader): Add consume_old_private_key method.
(key_store::read_key_dir): Adjust call to read_packets.
(key_store::ensure_in_database, key_store::maybe_ensure_in_db): Take
the database as a second parameter.
(key_store::key_store): Takes no arguments. Don't initialize app.
* key_store.hh: Don't include platform.hh.  Forward-declare class
database, not class app_state.
(class key_store): Remove app_state data member. Adjust prototypes.

* packet.cc (packet_db_writer::consume_old_private_key)
(packet_writer::consume_old_private_key): New functions.
(feed_packet_consumer): Put in anonymous namespace.  Remove app_state
data member; adjust constructor accordingly.  Use consume_old_private_key.
(extract_packets, read_packets): Remove all references to app_state.
(UNIT_TEST(packet, roundabout): Don't need an app_state.
* packet.hh: Don't include <memory>, ui.hh, or app_state.hh.
Forward-declare app_state and cert.
(packet_consumer, packet_writer, packet_db_writer): Add
consume_old_private_key member function.
(read_packets): Adjust prototype.

* netsync.cc (session::process_auth_cmd, session::rebuild_merkle_trees):
Adjust calls to key_store functions.
* cmd_packet.cc: Adjust calls to read_packets.
* app_state.cc: Update call to key_store constructor.
* cmd_merging.cc, cmd_ws_commit.cc: Include ui.hh.

txth6xRgHl1Q4.txt
Description: Diff [cd433c065f09f8782c9ecc29b011b89a628bd58b] -> [cfd236edbef20bc1d5a4d121d740cb830da2b030]