diff options
Diffstat (limited to 'src/bin/git_remote_nostr')
| -rw-r--r-- | src/bin/git_remote_nostr/push.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index db86c04..c57e21f 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs | |||
| @@ -29,9 +29,8 @@ use ngit::{ | |||
| 29 | }; | 29 | }; |
| 30 | use nostr::nips::nip10::Marker; | 30 | use nostr::nips::nip10::Marker; |
| 31 | use nostr_sdk::{ | 31 | use nostr_sdk::{ |
| 32 | hashes::sha1::Hash as Sha1Hash, Event, EventBuilder, EventId, Kind, PublicKey, Tag, | 32 | hashes::sha1::Hash as Sha1Hash, Event, EventBuilder, EventId, Kind, NostrSigner, PublicKey, Tag, |
| 33 | }; | 33 | }; |
| 34 | use nostr_signer::NostrSigner; | ||
| 35 | use repo_ref::RepoRef; | 34 | use repo_ref::RepoRef; |
| 36 | use repo_state::RepoState; | 35 | use repo_state::RepoState; |
| 37 | 36 | ||
| @@ -868,7 +867,7 @@ async fn get_merged_status_events( | |||
| 868 | repo_ref: &RepoRef, | 867 | repo_ref: &RepoRef, |
| 869 | git_repo: &Repo, | 868 | git_repo: &Repo, |
| 870 | remote_nostr_url: &str, | 869 | remote_nostr_url: &str, |
| 871 | signer: &NostrSigner, | 870 | signer: &Arc<dyn NostrSigner>, |
| 872 | refspecs_to_git_server: &Vec<String>, | 871 | refspecs_to_git_server: &Vec<String>, |
| 873 | ) -> Result<Vec<Event>> { | 872 | ) -> Result<Vec<Event>> { |
| 874 | let mut events = vec![]; | 873 | let mut events = vec![]; |
| @@ -944,7 +943,7 @@ async fn get_merged_status_events( | |||
| 944 | } | 943 | } |
| 945 | 944 | ||
| 946 | async fn create_merge_status( | 945 | async fn create_merge_status( |
| 947 | signer: &NostrSigner, | 946 | signer: &Arc<dyn NostrSigner>, |
| 948 | repo_ref: &RepoRef, | 947 | repo_ref: &RepoRef, |
| 949 | proposal: &Event, | 948 | proposal: &Event, |
| 950 | revision: &Option<Event>, | 949 | revision: &Option<Event>, |
| @@ -1186,14 +1185,14 @@ trait BuildRepoState { | |||
| 1186 | async fn build( | 1185 | async fn build( |
| 1187 | identifier: String, | 1186 | identifier: String, |
| 1188 | state: HashMap<String, String>, | 1187 | state: HashMap<String, String>, |
| 1189 | signer: &NostrSigner, | 1188 | signer: &Arc<dyn NostrSigner>, |
| 1190 | ) -> Result<RepoState>; | 1189 | ) -> Result<RepoState>; |
| 1191 | } | 1190 | } |
| 1192 | impl BuildRepoState for RepoState { | 1191 | impl BuildRepoState for RepoState { |
| 1193 | async fn build( | 1192 | async fn build( |
| 1194 | identifier: String, | 1193 | identifier: String, |
| 1195 | state: HashMap<String, String>, | 1194 | state: HashMap<String, String>, |
| 1196 | signer: &NostrSigner, | 1195 | signer: &Arc<dyn NostrSigner>, |
| 1197 | ) -> Result<RepoState> { | 1196 | ) -> Result<RepoState> { |
| 1198 | let mut tags = vec![Tag::identifier(identifier.clone())]; | 1197 | let mut tags = vec![Tag::identifier(identifier.clone())]; |
| 1199 | for (name, value) in &state { | 1198 | for (name, value) in &state { |