Remove move feature (#6605) (#6612)

automerge
This commit is contained in:
mergify[bot]
2019-10-29 20:50:32 -07:00
committed by Grimes
parent 23b4df0fef
commit b054f5f12d
21 changed files with 11522 additions and 55 deletions

4155
programs/librapay_api/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -34,7 +34,7 @@ pub fn create_genesis<T: Client>(from_key: &Keypair, client: &T, amount: u64) ->
1,
bincode::serialized_size(&LibraAccountState::create_genesis(amount).unwrap()).unwrap()
as u64,
&solana_move_loader_api::id(),
&solana_sdk::move_loader::id(),
);
client.send_instruction(&from_key, instruction).unwrap();
@@ -52,7 +52,12 @@ pub fn upload_move_program<T: Client>(from: &Keypair, client: &T, code: &str) ->
let account_state = LibraAccountState::create_program(&address, code, vec![]);
let program_bytes = bincode::serialize(&account_state).unwrap();
load_program(client, &from, &solana_move_loader_api::id(), program_bytes)
load_program(
client,
&from,
&solana_sdk::move_loader::id(),
program_bytes,
)
}
pub fn upload_mint_program<T: Client>(from: &Keypair, client: &T) -> Pubkey {

View File

@@ -13,7 +13,7 @@ pub fn genesis(genesis_pubkey: &Pubkey, microlibras: u64) -> Instruction {
let accounts = vec![AccountMeta::new(*genesis_pubkey, true)];
Instruction::new(solana_move_loader_api::id(), &ix_data, accounts)
Instruction::new(solana_sdk::move_loader::id(), &ix_data, accounts)
}
pub fn mint(
@@ -41,7 +41,7 @@ pub fn mint(
AccountMeta::new(*to_pubkey, false),
];
Instruction::new(solana_move_loader_api::id(), &ix_data, accounts)
Instruction::new(solana_sdk::move_loader::id(), &ix_data, accounts)
}
pub fn transfer(
@@ -71,7 +71,7 @@ pub fn transfer(
AccountMeta::new(*to_pubkey, false),
];
Instruction::new(solana_move_loader_api::id(), &ix_data, accounts)
Instruction::new(solana_sdk::move_loader::id(), &ix_data, accounts)
}
#[cfg(test)]

View File

@@ -75,7 +75,7 @@ pub fn create_accounts(
to,
lamports,
400,
&solana_move_loader_api::id(),
&solana_sdk::move_loader::id(),
)
})
.collect();
@@ -148,7 +148,7 @@ mod tests {
let (genesis_block, mint_keypair) = create_genesis_block(lamports);
let mut bank = Bank::new(&genesis_block);
bank.add_instruction_processor(
solana_move_loader_api::id(),
solana_sdk::move_loader::id(),
solana_move_loader_api::processor::process_instruction,
);
let shared_bank = Arc::new(bank);