bugfix:fix snapshot integrity test

boscore · May 3, 2019 · ad8ee81 · ad8ee81
1 parent e7c66db
commit ad8ee81
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -353,8 +353,6 @@ struct controller_impl {
 
    void init(std::function<bool()> shutdown, const snapshot_reader_ptr& snapshot) {
 
-      //do upgrade migration if necessary;
-      migrate_upgrade();
 
       bool report_integrity_hash = !!snapshot;
       if (snapshot) {
@@ -363,6 +361,9 @@ struct controller_impl {
 
          read_from_snapshot( snapshot );
 
+          //do upgrade migration if necessary;
+          migrate_upgrade(); //compatiable for snapshot integrity test
+
          auto end = blog.read_head();
          if( !end ) {
             blog.reset( conf.genesis, signed_block_ptr(), head->block_num + 1 );
@@ -373,6 +374,8 @@ struct controller_impl {
                         "Block log is provided with snapshot but does not contain the head block from the snapshot" );
          }
       } else {
+          //do upgrade migration if necessary;
+          migrate_upgrade();  //compatiable for snapshot integrity test
          if( !head ) {
             initialize_fork_db(); // set head to genesis state
          }