one_two_three.steps.rb in vault-tree-0.6.0

- old
+ new
@@ -1,57 +1,51 @@
 Given(/^Alice has the blank contract$/) do
-  contract_path = VaultTree::PathHelpers.core_contracts('one_two_three.0.7.0.json')
-  @contract_json = File.read(contract_path)
 end
 
 # Change this to just attributes vice public attributes
 When(/^she locks all of her attributes$/) do
-  @contract = VaultTree::Contract.new(@contract_json, master_passphrase: 'ALICE_SECURE_PASS', external_data: {})
-  @contract = @contract.close_vault('alice_decryption_key')
-  @contract = @contract.close_vault('alice_public_encryption_key')
+  @alice_contract_secret_key = "#{VaultTree::LockSmith.new(message: 'ALICE_SECURE_PASS').secure_hash}"
+  @contract = VaultTree::Contract.new(@contract).close_vault('alice_decryption_key', acs_key: @alice_contract_secret_key)
+  @contract = VaultTree::Contract.new(@contract).close_vault('alice_public_encryption_key', acs_key: @alice_contract_secret_key)
 end
 
 When(/^she sends the contract to Bob$/) do
-  @contract_json = @contract.as_json 
-  @bobs_external_data = {"congratulations_message" => "CONGRATS! YOU OPENED THE THIRD VAULT."}
-  @contract = VaultTree::Contract.new(@contract_json, master_passphrase: 'BOB_SECURE_PASS', external_data: @bobs_external_data)
+  @bob_contract_secret_key = "#{VaultTree::LockSmith.new(message: 'BOB_SECURE_PASS').secure_hash}"
+  @congratulations_message = "CONGRATS! YOU OPENED THE THIRD VAULT."
 end
 
 Then(/^Bob can access all of her public attributes$/) do
-  @contents = @contract.retrieve_contents('alice_public_encryption_key')
+  @contents = VaultTree::Contract.new(@contract).open_vault('alice_public_encryption_key')
 end
 
 When(/^Bob locks his attributes$/) do
-
-  @contract = @contract.close_vault('bob_decryption_key')
+  @contract = VaultTree::Contract.new(@contract).close_vault('bob_decryption_key', bcs_key: @bob_contract_secret_key)
   # Verify can reopen
-  @contract.retrieve_contents('bob_decryption_key')
+  VaultTree::Contract.new(@contract).open_vault('bob_decryption_key', bcs_key: @bob_contract_secret_key)
 
-  @contract = @contract.close_vault('congratulations_message')
+  @contract = VaultTree::Contract.new(@contract).close_vault('congratulations_message', bcs_key: @bob_contract_secret_key, msg: @congratulations_message)
   # Verify can reopen
-  @contract.retrieve_contents('congratulations_message')
+  VaultTree::Contract.new(@contract).open_vault('congratulations_message', bcs_key: @bob_contract_secret_key)
 
-  @contract = @contract.close_vault('vault_two_key')
+  @contract = VaultTree::Contract.new(@contract).close_vault('vault_two_key', bcs_key: @bob_contract_secret_key)
   # Verify they can reopen
-  @contract.retrieve_contents('vault_two_key')
+  VaultTree::Contract.new(@contract).open_vault('vault_two_key', bcs_key: @bob_contract_secret_key)
 
-  @contract = @contract.close_vault('vault_three_key')
+  @contract = VaultTree::Contract.new(@contract).close_vault('vault_three_key', bcs_key: @bob_contract_secret_key)
   # Verify they can reopen
-  @contract.retrieve_contents('vault_three_key')
+  VaultTree::Contract.new(@contract).open_vault('vault_three_key', bcs_key: @bob_contract_secret_key)
 
-  @contract = @contract.close_vault('bob_public_encryption_key')
+  @contract = VaultTree::Contract.new(@contract).close_vault('bob_public_encryption_key', bcs_key: @bob_contract_secret_key)
   # Verify they can reopen
-  @contract.retrieve_contents('bob_public_encryption_key')
+  VaultTree::Contract.new(@contract).open_vault('bob_public_encryption_key', bcs_key: @bob_contract_secret_key)
 end
 
 When(/^He fills and locks each of the three main vaults$/) do
-  @contract = @contract.close_vault('first')
-  @contract = @contract.close_vault('second')
-  @contract = @contract.close_vault('third')
+  @contract = VaultTree::Contract.new(@contract).close_vault('first', bcs_key: @bob_contract_secret_key)
+  @contract = VaultTree::Contract.new(@contract).close_vault('second', bcs_key: @bob_contract_secret_key)
+  @contract = VaultTree::Contract.new(@contract).close_vault('third', bcs_key: @bob_contract_secret_key)
 end
 
 Then(/^Alice can execute the contract to recover the final message$/) do
-  @contract_json = @contract.as_json 
-  @contract = VaultTree::Contract.new(@contract_json, master_passphrase: 'ALICE_SECURE_PASS', external_data: {})
-  puts @contract.retrieve_contents('third')
-  @contract.retrieve_contents('third').should == @bobs_external_data['congratulations_message']
+  puts VaultTree::Contract.new(@contract).open_vault('third', acs_key: @alice_contract_secret_key)
+  VaultTree::Contract.new(@contract).open_vault('third', acs_key: @alice_contract_secret_key).should == @congratulations_message
 end