Rename payjoin_ffi namespace to payjoin

Downstream bindings consumers should be able to just "import payjoin",
it's cleaner than "import payjoin_ffi". Furthermore, the "bitcoin"
namespace is not suffixed with `_ffi` so it's also more consistent
internally.

Author: spacebear21

payjoin-ffi/build.rs

@@ -1,5 +1,5 @@
 fn main() {
-    uniffi::generate_scaffolding("src/payjoin_ffi.udl").unwrap();
+    uniffi::generate_scaffolding("src/payjoin.udl").unwrap();
     #[cfg(feature = "dart")]
-    uniffi_dart::generate_scaffolding("src/payjoin_ffi.udl".into()).unwrap();
+    uniffi_dart::generate_scaffolding("src/payjoin.udl".into()).unwrap();
 }

payjoin-ffi/dart/.gitignore

@@ -11,5 +11,5 @@ doc/api/
 *.dll
 
 # Auto-generated bindings
-lib/payjoin_ffi.dart
+lib/payjoin.dart
 lib/bitcoin.dart

payjoin-ffi/dart/test/test_payjoin_integration_test.dart

@@ -5,7 +5,7 @@ import "package:http/http.dart" as http;
 import 'package:test/test.dart';
 import "package:convert/convert.dart";
 
-import "package:payjoin/payjoin_ffi.dart" as payjoin;
+import "package:payjoin/payjoin.dart" as payjoin;
 import "package:payjoin/bitcoin.dart" as bitcoin;
 
 late payjoin.BitcoindEnv env;

payjoin-ffi/dart/test/test_payjoin_unit_test.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:convert/convert.dart';
 import 'package:test/test.dart';
-import "package:payjoin/payjoin_ffi.dart" as payjoin;
+import "package:payjoin/payjoin.dart" as payjoin;
 import "package:payjoin/bitcoin.dart" as bitcoin;
 
 class InMemoryReceiverPersister

payjoin-ffi/javascript/scripts/fix-imports.js

@@ -1,9 +1,9 @@
 // This script is a dirty hack for Node.JS ESM imports.
 // TypeScript compiles imports without a `.js` extension, which results in ERR_MODULE_NOT_FOUND when running in Node.JS.
 // This fixes it by adding the `.js` file extension to the import in the generated files (thankfully there is currently only one such instance).
-const fs = require('fs');
+const fs = require("fs");
 
-const file = 'dist/generated/payjoin_ffi.js';
-let content = fs.readFileSync(file, 'utf8');
+const file = "dist/generated/payjoin.js";
+let content = fs.readFileSync(file, "utf8");
 content = content.replace('from "./bitcoin"', 'from "./bitcoin.js"');
 fs.writeFileSync(file, content);

payjoin-ffi/javascript/src/index.ts

@@ -1,12 +1,12 @@
 // Export the generated bindings to the app.
-export * as payjoin from "./generated/payjoin_ffi.js";
+export * as payjoin from "./generated/payjoin.js";
 export * as bitcoin from "./generated/bitcoin.js";
 
 // Now import the bindings so we can:
 // - initialize them
 // - export them as namespaced objects as the default export.
 import * as bitcoin from "./generated/bitcoin.js";
-import * as payjoin from "./generated/payjoin_ffi.js";
+import * as payjoin from "./generated/payjoin.js";
 
 let initialized = false;
 

payjoin-ffi/python/.gitignore

@@ -16,5 +16,5 @@ build/
 *.dll
 
 # Auto-generated bindings python file
-src/payjoin/payjoin_ffi.py
+src/payjoin/payjoin.py
 src/payjoin/bitcoin.py

payjoin-ffi/python/src/payjoin/__init__.py

@@ -1 +1 @@
-from payjoin.payjoin_ffi import *
+from payjoin.payjoin import *

payjoin-ffi/python/test/test_payjoin_unit_test.py

@@ -1,6 +1,6 @@
 import unittest
-import payjoin as payjoin
-import payjoin.bitcoin
+import payjoin
+import payjoin.bitcoin 
 
 class TestURIs(unittest.TestCase):
     def test_todo_url_encoded(self):
@@ -31,7 +31,7 @@ def test_valid_uris(self):
                 except Exception as e:
                     self.fail(f"Failed to create a valid Uri for {uri}. Error: {e}")
 
-class InMemoryReceiverPersister(payjoin.payjoin_ffi.JsonReceiverSessionPersister):
+class InMemoryReceiverPersister(payjoin.JsonReceiverSessionPersister):
     def __init__(self, id):
         self.id = id
         self.events = []
@@ -50,15 +50,15 @@ class TestReceiverPersistence(unittest.TestCase):
     def test_receiver_persistence(self):
         persister = InMemoryReceiverPersister(1)
         address = payjoin.bitcoin.Address("tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4", payjoin.bitcoin.Network.SIGNET)
-        payjoin.payjoin_ffi.ReceiverBuilder(
+        payjoin.ReceiverBuilder(
             address, 
             "https://example.com", 
             payjoin.OhttpKeys.decode(bytes.fromhex("01001604ba48c49c3d4a92a3ad00ecc63a024da10ced02180c73ec12d8a7ad2cc91bb483824fe2bee8d28bfe2eb2fc6453bc4d31cd851e8a6540e86c5382af588d370957000400010003")),
             ).build().save(persister)
-        result = payjoin.payjoin_ffi.replay_receiver_event_log(persister)
+        result = payjoin.replay_receiver_event_log(persister)
         self.assertTrue(result.state().is_INITIALIZED())
 
-class InMemorySenderPersister(payjoin.payjoin_ffi.JsonSenderSessionPersister):
+class InMemorySenderPersister(payjoin.JsonSenderSessionPersister):
     def __init__(self, id):
         self.id = id
         self.events = []
@@ -78,7 +78,7 @@ def test_sender_persistence(self):
         # Create a receiver to just get the pj uri
         persister = InMemoryReceiverPersister(1)
         address = payjoin.bitcoin.Address("2MuyMrZHkbHbfjudmKUy45dU4P17pjG2szK", payjoin.bitcoin.Network.TESTNET)
-        receiver = payjoin.payjoin_ffi.ReceiverBuilder(
+        receiver = payjoin.ReceiverBuilder(
             address, 
             "https://example.com", 
             payjoin.OhttpKeys.decode(bytes.fromhex("01001604ba48c49c3d4a92a3ad00ecc63a024da10ced02180c73ec12d8a7ad2cc91bb483824fe2bee8d28bfe2eb2fc6453bc4d31cd851e8a6540e86c5382af588d370957000400010003")),

payjoin-ffi/src/lib.rs

@@ -24,4 +24,4 @@ pub use crate::send::*;
 #[cfg(feature = "_test-utils")]
 pub use crate::test_utils::*;
 pub use crate::uri::{PjUri, Uri, Url};
-uniffi::setup_scaffolding!();
+uniffi::setup_scaffolding!("payjoin");