Remove unnecessarily hardcoded contract IDs (stellar#135)

brson · Oct 6, 2022 · a431df5 · a431df5
1 parent bd2a5f3
commit a431df5
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 41 deletions.
diff --git a/auth/src/test.rs b/auth/src/test.rs
@@ -2,13 +2,12 @@
 
 use super::*;
 
-use soroban_sdk::{testutils::Accounts, Address, BytesN, Env};
+use soroban_sdk::{testutils::Accounts, Address, Env};
 
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = BytesN::from_array(&env, &[0; 32]);
-    env.register_contract(&contract_id, ExampleContract);
+    let contract_id = env.register_contract(None, ExampleContract);
     let client = ExampleContractClient::new(&env, contract_id);
 
     // Initialize contract by setting the admin.

diff --git a/cross_contract/contract_b/src/test.rs b/cross_contract/contract_b/src/test.rs
@@ -1,21 +1,17 @@
 #![cfg(test)]
 
 use crate::{contract_a, ContractB, ContractBClient};
-use soroban_sdk::{BytesN, Env};
+use soroban_sdk::Env;
 
 #[test]
 fn test() {
     let env = Env::default();
 
-    // Define IDs for contract A and B.
-    let contract_a_id = BytesN::from_array(&env, &[0; 32]);
-    let contract_b_id = BytesN::from_array(&env, &[1; 32]);
-
     // Register contract A using the imported WASM.
-    env.register_contract_wasm(&contract_a_id, contract_a::WASM);
+    let contract_a_id = env.register_contract_wasm(None, contract_a::WASM);
 
     // Register contract B defined in this crate.
-    env.register_contract(&contract_b_id, ContractB);
+    let contract_b_id = env.register_contract(None, ContractB);
 
     // Create a client for calling contract B.
     let client = ContractBClient::new(&env, &contract_b_id);

diff --git a/custom_types/src/test.rs b/custom_types/src/test.rs
@@ -1,13 +1,12 @@
 #![cfg(test)]
 
 use super::*;
-use soroban_sdk::{BytesN, Env};
+use soroban_sdk::Env;
 
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = BytesN::from_array(&env, &[0; 32]);
-    env.register_contract(&contract_id, CustomTypesContract);
+    let contract_id = env.register_contract(None, CustomTypesContract);
     let client = CustomTypesContractClient::new(&env, &contract_id);
 
     assert_eq!(client.retrieve(), Name::None);

diff --git a/events/src/test.rs b/events/src/test.rs
@@ -1,13 +1,12 @@
 #![cfg(test)]
 
 use super::*;
-use soroban_sdk::{symbol, BytesN, Env};
+use soroban_sdk::{symbol, Env};
 
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = BytesN::from_array(&env, &[0; 32]);
-    env.register_contract(&contract_id, EventsContract);
+    let contract_id = env.register_contract(None, EventsContract);
     let client = EventsContractClient::new(&env, &contract_id);
 
     client.hello(&symbol!("Dev"));

diff --git a/hello_world/src/test.rs b/hello_world/src/test.rs
@@ -1,13 +1,12 @@
 #![cfg(test)]
 
 use super::*;
-use soroban_sdk::{symbol, vec, BytesN, Env};
+use soroban_sdk::{symbol, vec, Env};
 
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = BytesN::from_array(&env, &[0; 32]);
-    env.register_contract(&contract_id, HelloContract);
+    let contract_id = env.register_contract(None, HelloContract);
     let client = HelloContractClient::new(&env, &contract_id);
 
     let words = client.hello(&symbol!("Dev"));

diff --git a/increment/src/test.rs b/increment/src/test.rs
@@ -1,13 +1,12 @@
 #![cfg(test)]
 
 use super::{IncrementContract, IncrementContractClient};
-use soroban_sdk::{BytesN, Env};
+use soroban_sdk::Env;
 
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = BytesN::from_array(&env, &[0; 32]);
-    env.register_contract(&contract_id, IncrementContract);
+    let contract_id = env.register_contract(None, IncrementContract);
     let client = IncrementContractClient::new(&env, &contract_id);
 
     assert_eq!(client.increment(), 1);

diff --git a/logging/src/test.rs b/logging/src/test.rs
@@ -1,15 +1,14 @@
 #![cfg(test)]
 
 use super::*;
-use soroban_sdk::{symbol, testutils::Logger, BytesN, Env};
+use soroban_sdk::{symbol, testutils::Logger, Env};
 
 extern crate std;
 
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = BytesN::from_array(&env, &[0; 32]);
-    env.register_contract(&contract_id, Contract);
+    let contract_id = env.register_contract(None, Contract);
     let client = ContractClient::new(&env, &contract_id);
 
     client.hello(&symbol!("Dev"));

diff --git a/single_offer/src/test.rs b/single_offer/src/test.rs
@@ -13,9 +13,7 @@ fn generate_contract_id() -> [u8; 32] {
 }
 
 fn create_token_contract(e: &Env, admin: &AccountId) -> ([u8; 32], token::Client) {
-    let id = generate_contract_id();
-    let contract_id = BytesN::from_array(e, &id);
-    e.register_contract_token(&contract_id);
+    let id = e.register_contract_token(None);
     let token = token::Client::new(e, &id);
     // decimals, name, symbol don't matter in tests
     token.init(
@@ -26,7 +24,7 @@ fn create_token_contract(e: &Env, admin: &AccountId) -> ([u8; 32], token::Client
             decimals: 7,
         },
     );
-    (id, token)
+    (id.into(), token)
 }
 
 fn create_single_offer_contract(

diff --git a/single_offer_router/src/test.rs b/single_offer_router/src/test.rs
@@ -13,9 +13,7 @@ fn generate_contract_id() -> [u8; 32] {
 }
 
 fn create_token_contract(e: &Env, admin: &AccountId) -> ([u8; 32], token::Client) {
-    let id = generate_contract_id();
-    let contract_id = BytesN::from_array(e, &id);
-    e.register_contract_token(&contract_id);
+    let id = e.register_contract_token(None);
     let token = token::Client::new(e, &id);
     // decimals, name, symbol don't matter in tests
     token.init(
@@ -26,7 +24,7 @@ fn create_token_contract(e: &Env, admin: &AccountId) -> ([u8; 32], token::Client
             decimals: 7,
         },
     );
-    (id, token)
+    (id.into(), token)
 }
 
 fn create_single_offer_router_contract(

diff --git a/single_offer_xfer_from/src/test.rs b/single_offer_xfer_from/src/test.rs
@@ -13,9 +13,7 @@ fn generate_contract_id() -> [u8; 32] {
 }
 
 fn create_token_contract(e: &Env, admin: &AccountId) -> ([u8; 32], token::Client) {
-    let id = generate_contract_id();
-    let contract_id = BytesN::from_array(e, &id);
-    e.register_contract_token(&contract_id);
+    let id = e.register_contract_token(None);
     let token = token::Client::new(e, &id);
     // decimals, name, symbol don't matter in tests
     token.init(
@@ -26,7 +24,7 @@ fn create_token_contract(e: &Env, admin: &AccountId) -> ([u8; 32], token::Client
             decimals: 7,
         },
     );
-    (id, token)
+    (id.into(), token)
 }
 
 fn create_single_offer_contract(

diff --git a/timelock/src/test.rs b/timelock/src/test.rs
@@ -14,9 +14,7 @@ fn generate_contract_id() -> [u8; 32] {
 }
 
 fn create_token_contract(e: &Env, admin: &AccountId) -> (BytesN<32>, TokenClient) {
-    let id = generate_contract_id();
-    let contract_id = BytesN::from_array(e, &id);
-    e.register_contract_token(&contract_id);
+    let id = e.register_contract_token(None);
     let token = TokenClient::new(e, &id);
     // decimals, name, symbol don't matter in tests
     token.init(
@@ -27,7 +25,7 @@ fn create_token_contract(e: &Env, admin: &AccountId) -> (BytesN<32>, TokenClient
             decimals: 7,
         },
     );
-    (BytesN::from_array(&e, &id), token)
+    (id, token)
 }
 
 fn create_claimable_balance_contract(e: &Env) -> ClaimableBalanceContractClient {