Rename new_funding_address to new_onchain_address

As we're using the `onchain` keyword everywhere in the API to discern
onchain-operations (e.g., `send_to_onchain_address`,
`spendable_onchain_balance`, etc.) we also align the funding API call here and
rename `new_funding_address` to `new_onchain_address`.

Author: tnull

README.md

@@ -27,7 +27,7 @@ fn main() {
 
 	node.start().unwrap();
 
-	let funding_address = node.new_funding_address();
+	let funding_address = node.new_onchain_address();
 
 	// .. fund address ..
 

bindings/kotlin/ldk-node-android/lib/src/androidTest/kotlin/org/lightningdevkit/ldknode/AndroidLibTest.kt

@@ -16,9 +16,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 @RunWith(AndroidJUnit4::class)
 class AndroidLibTest {
     @Test fun node_start_stop() {
-        val network: Network = "regtest"
-        assertEquals(network, "regtest")
+        val network = Network.REGTEST
 
+        val esplora_url = "http://127.0.0.1:3002"
         val tmpDir1 = createTempDirectory("ldk_node").toString()
         println("Random dir 1: $tmpDir1")
         val tmpDir2 = createTempDirectory("ldk_node").toString()
@@ -27,8 +27,8 @@ class AndroidLibTest {
         val listenAddress1 = "127.0.0.1:2323"
         val listenAddress2 = "127.0.0.1:2324"
 
-        val config1 = Config(tmpDir1, "http://127.0.0.1:3002", network, listenAddress1, 2048u)
-        val config2 = Config(tmpDir2, "http://127.0.0.1:3002", network, listenAddress2, 2048u)
+        val config1 = Config(tmpDir1, network, listenAddress1, 2048u)
+        val config2 = Config(tmpDir2, network, listenAddress2, 2048u)
 
         val builder1 = Builder.fromConfig(config1)
         val builder2 = Builder.fromConfig(config2)
@@ -45,10 +45,10 @@ class AndroidLibTest {
         val nodeId2 = node2.nodeId()
         println("Node Id 2: $nodeId2")
 
-        val address1 = node1.newFundingAddress()
+        val address1 = node1.newOnchainAddress()
         println("Funding address 1: $address1")
 
-        val address2 = node2.newFundingAddress()
+        val address2 = node2.newOnchainAddress()
         println("Funding address 2: $address2")
 
         node1.stop()

bindings/kotlin/ldk-node-jvm/lib/src/test/kotlin/org/lightningdevkit/ldknode/LibraryTest.kt

@@ -91,10 +91,10 @@ class LibraryTest {
         val nodeId2 = node2.nodeId()
         println("Node Id 2: $nodeId2")
 
-        val address1 = node1.newFundingAddress()
+        val address1 = node1.newOnchainAddress()
         println("Funding address 1: $address1")
 
-        val address2 = node2.newFundingAddress()
+        val address2 = node2.newOnchainAddress()
         println("Funding address 2: $address2")
 
         val txid1 = sendToAddress(address1, 100000u)

bindings/ldk_node.udl

@@ -41,7 +41,7 @@ interface LDKNode {
 	PublicKey node_id();
 	NetAddress? listening_address();
 	[Throws=NodeError]
-	Address new_funding_address();
+	Address new_onchain_address();
 	[Throws=NodeError]
 	Txid send_to_onchain_address([ByRef]Address address, u64 amount_msat);
 	[Throws=NodeError]

src/lib.rs

@@ -42,7 +42,7 @@
 //!
 //! 	node.start().unwrap();
 //!
-//! 	let funding_address = node.new_funding_address();
+//! 	let funding_address = node.new_onchain_address();
 //!
 //! 	// .. fund address ..
 //!
@@ -730,7 +730,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 	}
 
 	/// Retrieve a new on-chain/funding address.
-	pub fn new_funding_address(&self) -> Result<Address, Error> {
+	pub fn new_onchain_address(&self) -> Result<Address, Error> {
 		let funding_address = self.wallet.get_new_address()?;
 		log_info!(self.logger, "Generated new funding address: {}", funding_address);
 		Ok(funding_address)

src/test/functional_tests.rs

@@ -56,8 +56,8 @@ fn channel_full_cycle_0conf() {
 fn do_channel_full_cycle<K: KVStore + Sync + Send>(
 	node_a: Node<K>, node_b: Node<K>, bitcoind: &BitcoinD, electrsd: &ElectrsD, allow_0conf: bool,
 ) {
-	let addr_a = node_a.new_funding_address().unwrap();
-	let addr_b = node_b.new_funding_address().unwrap();
+	let addr_a = node_a.new_onchain_address().unwrap();
+	let addr_b = node_b.new_onchain_address().unwrap();
 
 	let premine_amount_sat = 100_000;
 
@@ -278,15 +278,15 @@ fn channel_open_fails_when_funds_insufficient() {
 	builder_a.set_esplora_server(esplora_url.clone());
 	let node_a = builder_a.build();
 	node_a.start().unwrap();
-	let addr_a = node_a.new_funding_address().unwrap();
+	let addr_a = node_a.new_onchain_address().unwrap();
 
 	println!("\n== Node B ==");
 	let config_b = random_config();
 	let mut builder_b = NodeBuilder::from_config(config_b);
 	builder_b.set_esplora_server(esplora_url);
 	let node_b = builder_b.build();
 	node_b.start().unwrap();
-	let addr_b = node_b.new_funding_address().unwrap();
+	let addr_b = node_b.new_onchain_address().unwrap();
 
 	let premine_amount_sat = 100_000;
 
@@ -337,7 +337,7 @@ fn start_stop_reinit() {
 	let node = builder.build();
 	let expected_node_id = node.node_id();
 
-	let funding_address = node.new_funding_address().unwrap();
+	let funding_address = node.new_onchain_address().unwrap();
 	let expected_amount = Amount::from_sat(100000);
 
 	premine_and_distribute_funds(&bitcoind, &electrsd, vec![funding_address], expected_amount);
@@ -393,7 +393,7 @@ fn start_stop_reinit_fs_store() {
 	let node = builder.build_with_fs_store();
 	let expected_node_id = node.node_id();
 
-	let funding_address = node.new_funding_address().unwrap();
+	let funding_address = node.new_onchain_address().unwrap();
 	let expected_amount = Amount::from_sat(100000);
 
 	premine_and_distribute_funds(&bitcoind, &electrsd, vec![funding_address], expected_amount);
@@ -446,14 +446,14 @@ fn onchain_spend_receive() {
 	builder_a.set_esplora_server(esplora_url.clone());
 	let node_a = builder_a.build();
 	node_a.start().unwrap();
-	let addr_a = node_a.new_funding_address().unwrap();
+	let addr_a = node_a.new_onchain_address().unwrap();
 
 	let config_b = random_config();
 	let mut builder_b = NodeBuilder::from_config(config_b);
 	builder_b.set_esplora_server(esplora_url);
 	let node_b = builder_b.build();
 	node_b.start().unwrap();
-	let addr_b = node_b.new_funding_address().unwrap();
+	let addr_b = node_b.new_onchain_address().unwrap();
 
 	premine_and_distribute_funds(
 		&bitcoind,
@@ -479,7 +479,7 @@ fn onchain_spend_receive() {
 	assert!(node_b.spendable_onchain_balance_sats().unwrap() > 98000);
 	assert!(node_b.spendable_onchain_balance_sats().unwrap() < 100000);
 
-	let addr_b = node_b.new_funding_address().unwrap();
+	let addr_b = node_b.new_onchain_address().unwrap();
 	let txid = node_a.send_all_to_onchain_address(&addr_b).unwrap();
 	generate_blocks_and_wait(&bitcoind, &electrsd, 6);
 	wait_for_tx(&electrsd, txid);