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

runtime/Cargo.toml

@@ -27,11 +27,9 @@ solana-logger = { path = "../logger", version = "0.15.1"   }
 solana-metrics = { path = "../metrics", version = "0.15.1"   }
 solana-sdk = { path = "../sdk", version = "0.15.1"   }
 solana-stake-api = { path = "../programs/stake_api", version = "0.15.1"   }
-solana-storage-api = { path = "../programs/storage_api", version = "0.15.1"   }
 solana-vote-api = { path = "../programs/vote_api", version = "0.15.1"   }
 solana-vote-program = { path = "../programs/vote_program", version = "0.15.1"   }
 solana-stake-program = { path = "../programs/stake_program", version = "0.15.1"   }
-solana-storage-program = { path = "../programs/storage_program", version = "0.15.1"   }
 solana-noop-program = { path = "../programs/noop_program", version = "0.15.1"   }
 
 [lib]

runtime/src/genesis_utils.rs

@@ -4,7 +4,6 @@ use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::system_program;
 use solana_stake_api::stake_state;
-use solana_storage_api::storage_contract;
 use solana_vote_api::vote_state;
 
 // The default stake placed with the bootstrap leader
@@ -14,7 +13,6 @@ pub struct GenesisBlockInfo {
     pub genesis_block: GenesisBlock,
     pub mint_keypair: Keypair,
     pub voting_keypair: Keypair,
-    pub storage_keypair: Keypair,
 }
 
 pub fn create_genesis_block_with_leader(
@@ -25,7 +23,6 @@ pub fn create_genesis_block_with_leader(
     let mint_keypair = Keypair::new();
     let voting_keypair = Keypair::new();
     let staking_keypair = Keypair::new();
-    let storage_keypair = Keypair::new();
 
     // TODO: de-duplicate the stake once passive staking
     //  is fully implemented
@@ -61,23 +58,13 @@ pub fn create_genesis_block_with_leader(
                     bootstrap_leader_stake_lamports,
                 ),
             ),
-            // storage account
-            (
-                storage_keypair.pubkey(),
-                storage_contract::create_validator_storage_account(1),
-            ),
-        ],
-        &[
-            solana_vote_program!(),
-            solana_stake_program!(),
-            solana_storage_program!(), // TODO: storage program is only needed by core/, move this line into core/src/genesis_utils.rs
         ],
+        &[solana_vote_program!(), solana_stake_program!()],
     );
 
     GenesisBlockInfo {
         genesis_block,
         mint_keypair,
         voting_keypair,
-        storage_keypair,
     }
 }

runtime/src/lib.rs

@@ -25,8 +25,5 @@ extern crate solana_vote_program;
 #[macro_use]
 extern crate solana_stake_program;
 
-#[macro_use]
-extern crate solana_storage_program;
-
 #[macro_use]
 extern crate serde_derive;

runtime/tests/noop.rs

@@ -0,0 +1,25 @@
+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();
+}