Merge branch 'devshares' into bitshares

bitshares · Feb 7, 2015 · 40e3d0b · 40e3d0b
2 parents e52e03f + 2236af3
commit 40e3d0b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/libraries/blockchain/chain_database.cpp b/libraries/blockchain/chain_database.cpp
@@ -125,7 +125,7 @@ namespace bts { namespace blockchain {
 
           _property_db.open( data_dir / "index/property_db" );
           const optional<variant> version = self->get_property( database_version );
-          if( !version.valid() || version->as_int64() < BTS_BLOCKCHAIN_DATABASE_VERSION )
+          if( !version.valid() || version->as_int64() != BTS_BLOCKCHAIN_DATABASE_VERSION )
           {
               if( !rebuild_index )
               {
@@ -138,10 +138,6 @@ namespace bts { namespace blockchain {
               }
               self->set_property( database_version, BTS_BLOCKCHAIN_DATABASE_VERSION );
           }
-          else if( version.valid() && version->as_int64() > BTS_BLOCKCHAIN_DATABASE_VERSION )
-          {
-             FC_CAPTURE_AND_THROW( new_database_version, (version)(BTS_BLOCKCHAIN_DATABASE_VERSION) );
-          }
 
           _fork_number_db.open( data_dir / "index/fork_number_db" );
           _fork_db.open( data_dir / "index/fork_db" );
@@ -1318,6 +1314,7 @@ namespace bts { namespace blockchain {
           bool replay_blockchain = must_rebuild_index || last_block_num == uint32_t( -1 );
           if( replay_blockchain )
           {
+             std::cout << "Erasing all state\n";
              close();
              fc::remove_all( data_dir / "index" );
              fc::create_directories( data_dir / "index");

diff --git a/libraries/blockchain/include/bts/blockchain/config.hpp b/libraries/blockchain/include/bts/blockchain/config.hpp
@@ -11,7 +11,7 @@
  *  @brief Defines global constants that determine blockchain behavior
  */
 #define BTS_BLOCKCHAIN_VERSION                              109
-#define BTS_BLOCKCHAIN_DATABASE_VERSION                     190
+#define BTS_BLOCKCHAIN_DATABASE_VERSION                     uint64_t( 191 )
 
 /**
  *  The address prepended to string representation of

diff --git a/libraries/client/client.cpp b/libraries/client/client.cpp
@@ -402,7 +402,6 @@ void load_and_configure_chain_database( const fc::path& datadir,
       }
       else if (option_variables.count("rebuild-index"))
       {
-         std::cout << "Erasing all state\n";
          try
          {
             fc::remove_all(datadir / "chain/index");

diff --git a/libraries/db/include/bts/db/cached_level_map.hpp b/libraries/db/include/bts/db/cached_level_map.hpp
@@ -20,7 +20,7 @@ namespace bts { namespace db {
 
         void close()
         { try {
-            flush();
+            if( _db.is_open() ) flush();
             _db.close();
             _cache.clear();
             _dirty_store.clear();