v0.15: cherrypick crates.io-related fixes from master (#4486)

* Remove runtime dependency on storage (#4480)

* Break noop_program -> runtime dependency (#4481)

* Clean up crates.io publishing (#4478)

* Clean up crates.io publishing

* Cargo.lock

programs/noop_program/Cargo.toml

@@ -13,9 +13,6 @@ solana-sdk = { path = "../../sdk", version = "0.15.1"   }
 solana-logger = { path = "../../logger", version = "0.15.1"   }
 log = "0.4.2"
 
-[dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "0.15.1"   }
-
 [lib]
 name = "solana_noop_program"
 crate-type = ["cdylib"]

programs/noop_program/tests/noop.rs

@@ -1,25 +0,0 @@
-use solana_runtime::bank::Bank;
-use solana_runtime::bank_client::BankClient;
-use solana_runtime::loader_utils::{create_invoke_instruction, load_program};
-use solana_sdk::client::SyncClient;
-use solana_sdk::genesis_block::create_genesis_block;
-use solana_sdk::native_loader;
-use solana_sdk::signature::KeypairUtil;
-
-#[test]
-fn test_program_native_noop() {
-    solana_logger::setup();
-
-    let (genesis_block, alice_keypair) = create_genesis_block(50);
-    let bank = Bank::new(&genesis_block);
-    let bank_client = BankClient::new(bank);
-
-    let program = "solana_noop_program".as_bytes().to_vec();
-    let program_id = load_program(&bank_client, &alice_keypair, &native_loader::id(), program);
-
-    // Call user program
-    let instruction = create_invoke_instruction(alice_keypair.pubkey(), program_id, &1u8);
-    bank_client
-        .send_instruction(&alice_keypair, instruction)
-        .unwrap();
-}

programs/storage_program/src/genesis_block_util.rs

@@ -0,0 +1,19 @@
+use crate::solana_storage_program;
+use solana_sdk::genesis_block::GenesisBlock;
+use solana_sdk::pubkey::Pubkey;
+use solana_storage_api::storage_contract;
+
+pub trait GenesisBlockUtil {
+    fn add_storage_program(&mut self, validator_storage_pubkey: &Pubkey);
+}
+
+impl GenesisBlockUtil for GenesisBlock {
+    fn add_storage_program(&mut self, validator_storage_pubkey: &Pubkey) {
+        self.accounts.push((
+            *validator_storage_pubkey,
+            storage_contract::create_validator_storage_account(1),
+        ));
+        self.native_instruction_processors
+            .push(solana_storage_program!());
+    }
+}

programs/storage_program/src/lib.rs

@@ -1,3 +1,5 @@
+pub mod genesis_block_util;
+
 #[macro_export]
 macro_rules! solana_storage_program {
     () => {