send: tweaked step2 name

src/monero_transfer_utils.cpp

@@ -369,7 +369,7 @@ void monero_transfer_utils::send_step1__prepare_params_for_get_decoys(
 //		// TODO?
 //	}
 }
-void monero_transfer_utils::send_step2__reenterable_try_create_transaction(
+void monero_transfer_utils::send_step2__try_create_transaction(
 	Send_Step2_RetVals &retVals,
 	//
 	string from_address_string,

src/monero_transfer_utils.hpp

@@ -161,7 +161,7 @@ namespace monero_transfer_utils
 	// Send_Step* functions procedure for integrators:
 	//	1. call GetUnspentOuts endpoint
 	//	2. call step1__prepare_params_for_get_decoys to get params for calling RandomOuts; call GetRandomOuts
-	//	3. call step2__reenterable_… with retVals from Step1 (incl using_outs, RandomOuts)
+	//	3. call step2__try_… with retVals from Step1 (incl using_outs, RandomOuts)
 	//		3a. While tx must be reconstructed, re-call step1 passing step2 fee_actually_needed as passedIn_attemptAt_fee, then re-request RandomOuts again, and call step2 again
 	//		3b. If good tx constructed, proceed to submit/save the tx
 	// Note: This separation of steps fully encodes SendFunds_ProcessStep
@@ -208,7 +208,7 @@ namespace monero_transfer_utils
 		optional<string> tx_hash_string;
 		optional<string> tx_key_string; // this includes additional_tx_keys
 	};
-	void send_step2__reenterable_try_create_transaction(
+	void send_step2__try_create_transaction(
 		Send_Step2_RetVals &retVals,
 		//
 		string from_address_string,

src/serial_bridge_index.cpp

@@ -534,7 +534,7 @@ string serial_bridge::send_step1__prepare_params_for_get_decoys(const string &ar
 	}
 	return ret_json_from_root(root);
 }
-string serial_bridge::send_step2__reenterable_try_create_transaction(const string &args_string)
+string serial_bridge::send_step2__try_create_transaction(const string &args_string)
 {
 	boost::property_tree::ptree json_root;
 	if (!parsed_json_root(args_string, json_root)) {
@@ -579,7 +579,7 @@ string serial_bridge::send_step2__reenterable_try_create_transaction(const strin
 		optl__passedIn_attemptAt_fee = stoull(*optl__passedIn_attemptAt_fee_string);
 	}
 	Send_Step2_RetVals retVals;
-	monero_transfer_utils::send_step2__reenterable_try_create_transaction(
+	monero_transfer_utils::send_step2__try_create_transaction(
 		retVals,
 		//
 		json_root.get<string>("from_address_string"),

src/serial_bridge_index.hpp

@@ -43,7 +43,7 @@ namespace serial_bridge
 	//
 	// Bridging Functions - these take and return JSON strings
 	string send_step1__prepare_params_for_get_decoys(const string &args_string);
-	string send_step2__reenterable_try_create_transaction(const string &args_string);
+	string send_step2__try_create_transaction(const string &args_string);
 	//
 	string decode_address(const string &args_string);
 	string is_subaddress(const string &args_string);

test/test_all.cpp

@@ -260,7 +260,7 @@ BOOST_AUTO_TEST_CASE(bridge__transfers__send__sweepDust)
 			root.add_child("mix_outs", mix_outs);
 			//
 			boost::property_tree::ptree ret_tree;
-			auto ret_string = serial_bridge::send_step2__reenterable_try_create_transaction(args_string_from_root(root));
+			auto ret_string = serial_bridge::send_step2__try_create_transaction(args_string_from_root(root));
 			stringstream ret_stream;
 			ret_stream << ret_string;
 			boost::property_tree::read_json(ret_stream, ret_tree);
@@ -464,7 +464,7 @@ BOOST_AUTO_TEST_CASE(bridge__transfers__send__amount)
 			root.add_child("mix_outs", mix_outs);
 			//
 			boost::property_tree::ptree ret_tree;
-			auto ret_string = serial_bridge::send_step2__reenterable_try_create_transaction(args_string_from_root(root));
+			auto ret_string = serial_bridge::send_step2__try_create_transaction(args_string_from_root(root));
 			stringstream ret_stream;
 			ret_stream << ret_string;
 			boost::property_tree::read_json(ret_stream, ret_tree);