Fix broken build after merge conflicts..

solana-labs · Sep 7, 2020 · f9b58ac · f9b58ac
1 parent d4d1831
commit f9b58ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/accounts-bench/src/main.rs b/accounts-bench/src/main.rs
@@ -5,7 +5,7 @@ use solana_runtime::{
     accounts::{create_test_accounts, update_accounts, Accounts},
     accounts_index::Ancestors,
 };
-use solana_sdk::pubkey::Pubkey;
+use solana_sdk::{genesis_config::OperatingMode, pubkey::Pubkey};
 use std::env;
 use std::fs;
 use std::path::PathBuf;

diff --git a/runtime/benches/accounts.rs b/runtime/benches/accounts.rs
@@ -6,7 +6,11 @@ use solana_runtime::{
     accounts::{create_test_accounts, Accounts},
     bank::*,
 };
-use solana_sdk::{account::Account, genesis_config::create_genesis_config, pubkey::Pubkey};
+use solana_sdk::{
+    account::Account,
+    genesis_config::{create_genesis_config, OperatingMode},
+    pubkey::Pubkey,
+};
 use std::{path::PathBuf, sync::Arc};
 use test::Bencher;
 

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
@@ -3774,7 +3774,7 @@ pub mod tests {
     fn test_verify_bank_capitalization() {
         use BankHashVerificationError::*;
         solana_logger::setup();
-        let db = AccountsDB::new(Vec::new());
+        let db = AccountsDB::new(Vec::new(), &OperatingMode::Development);
 
         let key = Pubkey::new_rand();
         let some_data_len = 0;