diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2025-11-14 07:37:57 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2025-11-14 21:31:13 +0000 |
| commit | d282251af19fc7d5d4200a9441999bd1a81b2ae8 (patch) | |
| tree | b95737c10671419aff3d091b03dedc4b4485041f | |
| parent | 9192eff46923f1f5b472abf64571d72f7a76c512 (diff) | |
chore: bump rust-nostr v0.44
fix breaking changes
| -rw-r--r-- | Cargo.lock | 58 | ||||
| -rw-r--r-- | Cargo.toml | 12 | ||||
| -rw-r--r-- | src/bin/git_remote_nostr/push.rs | 2 | ||||
| -rw-r--r-- | test_utils/Cargo.toml | 8 | ||||
| -rw-r--r-- | test_utils/src/lib.rs | 2 | ||||
| -rw-r--r-- | test_utils/src/relay.rs | 7 |
6 files changed, 62 insertions, 27 deletions
| @@ -641,6 +641,18 @@ dependencies = [ | |||
| 641 | ] | 641 | ] |
| 642 | 642 | ||
| 643 | [[package]] | 643 | [[package]] |
| 644 | name = "flume" | ||
| 645 | version = "0.11.1" | ||
| 646 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 647 | checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" | ||
| 648 | dependencies = [ | ||
| 649 | "futures-core", | ||
| 650 | "futures-sink", | ||
| 651 | "nanorand", | ||
| 652 | "spin", | ||
| 653 | ] | ||
| 654 | |||
| 655 | [[package]] | ||
| 644 | name = "fnv" | 656 | name = "fnv" |
| 645 | version = "1.0.7" | 657 | version = "1.0.7" |
| 646 | source = "registry+https://github.com/rust-lang/crates.io-index" | 658 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -905,6 +917,12 @@ dependencies = [ | |||
| 905 | ] | 917 | ] |
| 906 | 918 | ||
| 907 | [[package]] | 919 | [[package]] |
| 920 | name = "hex" | ||
| 921 | version = "0.4.3" | ||
| 922 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 923 | checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | ||
| 924 | |||
| 925 | [[package]] | ||
| 908 | name = "hex-conservative" | 926 | name = "hex-conservative" |
| 909 | version = "0.1.2" | 927 | version = "0.1.2" |
| 910 | source = "registry+https://github.com/rust-lang/crates.io-index" | 928 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -1492,9 +1510,9 @@ dependencies = [ | |||
| 1492 | 1510 | ||
| 1493 | [[package]] | 1511 | [[package]] |
| 1494 | name = "nostr" | 1512 | name = "nostr" |
| 1495 | version = "0.43.1" | 1513 | version = "0.44.1" |
| 1496 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1514 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1497 | checksum = "62a97d745f1bd8d5e05a978632bbb87b0614567d5142906fe7c86fb2440faac6" | 1515 | checksum = "d3595fecf0e0aaacb69a0dc0101a4453f3c76eda333d6bbc49f68f64390b3d85" |
| 1498 | dependencies = [ | 1516 | dependencies = [ |
| 1499 | "aes", | 1517 | "aes", |
| 1500 | "base64", | 1518 | "base64", |
| @@ -1505,6 +1523,7 @@ dependencies = [ | |||
| 1505 | "chacha20", | 1523 | "chacha20", |
| 1506 | "chacha20poly1305", | 1524 | "chacha20poly1305", |
| 1507 | "getrandom 0.2.16", | 1525 | "getrandom 0.2.16", |
| 1526 | "hex", | ||
| 1508 | "instant", | 1527 | "instant", |
| 1509 | "scrypt", | 1528 | "scrypt", |
| 1510 | "secp256k1", | 1529 | "secp256k1", |
| @@ -1516,9 +1535,9 @@ dependencies = [ | |||
| 1516 | 1535 | ||
| 1517 | [[package]] | 1536 | [[package]] |
| 1518 | name = "nostr-connect" | 1537 | name = "nostr-connect" |
| 1519 | version = "0.43.0" | 1538 | version = "0.44.0" |
| 1520 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1539 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1521 | checksum = "a3bcd44ea344d1cab3447615681cd3bb90134cafe4d157d3e714c23c31268cd8" | 1540 | checksum = "38d7366ee1dfa57b479cf56256e18301cb3088f7068ceba01d446db0332b4cb2" |
| 1522 | dependencies = [ | 1541 | dependencies = [ |
| 1523 | "async-utility", | 1542 | "async-utility", |
| 1524 | "nostr", | 1543 | "nostr", |
| @@ -1529,9 +1548,9 @@ dependencies = [ | |||
| 1529 | 1548 | ||
| 1530 | [[package]] | 1549 | [[package]] |
| 1531 | name = "nostr-database" | 1550 | name = "nostr-database" |
| 1532 | version = "0.43.0" | 1551 | version = "0.44.0" |
| 1533 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1552 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1534 | checksum = "b1c75a8c2175d2785ba73cfddef21d1e30da5fbbdf158569b6808ba44973a15b" | 1553 | checksum = "7462c9d8ae5ef6a28d66a192d399ad2530f1f2130b13186296dbb11bdef5b3d1" |
| 1535 | dependencies = [ | 1554 | dependencies = [ |
| 1536 | "flatbuffers", | 1555 | "flatbuffers", |
| 1537 | "lru", | 1556 | "lru", |
| @@ -1540,12 +1559,22 @@ dependencies = [ | |||
| 1540 | ] | 1559 | ] |
| 1541 | 1560 | ||
| 1542 | [[package]] | 1561 | [[package]] |
| 1562 | name = "nostr-gossip" | ||
| 1563 | version = "0.44.0" | ||
| 1564 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1565 | checksum = "ade30de16869618919c6b5efc8258f47b654a98b51541eb77f85e8ec5e3c83a6" | ||
| 1566 | dependencies = [ | ||
| 1567 | "nostr", | ||
| 1568 | ] | ||
| 1569 | |||
| 1570 | [[package]] | ||
| 1543 | name = "nostr-lmdb" | 1571 | name = "nostr-lmdb" |
| 1544 | version = "0.43.0" | 1572 | version = "0.44.0" |
| 1545 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1573 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1546 | checksum = "03e20688047b2114906ba84cce26c955e6cd079c10fc7328bc2618dc8031fb17" | 1574 | checksum = "1201bcf1f900c352f9f2cea5249960dc6b23049b65699a516e1327243becf6a2" |
| 1547 | dependencies = [ | 1575 | dependencies = [ |
| 1548 | "async-utility", | 1576 | "async-utility", |
| 1577 | "flume 0.11.1", | ||
| 1549 | "heed", | 1578 | "heed", |
| 1550 | "nostr", | 1579 | "nostr", |
| 1551 | "nostr-database", | 1580 | "nostr-database", |
| @@ -1555,13 +1584,14 @@ dependencies = [ | |||
| 1555 | 1584 | ||
| 1556 | [[package]] | 1585 | [[package]] |
| 1557 | name = "nostr-relay-pool" | 1586 | name = "nostr-relay-pool" |
| 1558 | version = "0.43.1" | 1587 | version = "0.44.0" |
| 1559 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1588 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1560 | checksum = "2b2f43b70d13dfc50508a13cd902e11f4625312b2ce0e4b7c4c2283fd04001bd" | 1589 | checksum = "4b1073ccfbaea5549fb914a9d52c68dab2aecda61535e5143dd73e95445a804b" |
| 1561 | dependencies = [ | 1590 | dependencies = [ |
| 1562 | "async-utility", | 1591 | "async-utility", |
| 1563 | "async-wsocket", | 1592 | "async-wsocket", |
| 1564 | "atomic-destructor", | 1593 | "atomic-destructor", |
| 1594 | "hex", | ||
| 1565 | "lru", | 1595 | "lru", |
| 1566 | "negentropy", | 1596 | "negentropy", |
| 1567 | "nostr", | 1597 | "nostr", |
| @@ -1572,15 +1602,17 @@ dependencies = [ | |||
| 1572 | 1602 | ||
| 1573 | [[package]] | 1603 | [[package]] |
| 1574 | name = "nostr-sdk" | 1604 | name = "nostr-sdk" |
| 1575 | version = "0.43.0" | 1605 | version = "0.44.1" |
| 1576 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1606 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1577 | checksum = "599f8963d6a1522a13b1a2b0ea6e168acfc367706606f1d33fa595e91fa22db0" | 1607 | checksum = "471732576710e779b64f04c55e3f8b5292f865fea228436daf19694f0bf70393" |
| 1578 | dependencies = [ | 1608 | dependencies = [ |
| 1579 | "async-utility", | 1609 | "async-utility", |
| 1580 | "nostr", | 1610 | "nostr", |
| 1581 | "nostr-database", | 1611 | "nostr-database", |
| 1612 | "nostr-gossip", | ||
| 1582 | "nostr-relay-pool", | 1613 | "nostr-relay-pool", |
| 1583 | "tokio", | 1614 | "tokio", |
| 1615 | "tracing", | ||
| 1584 | ] | 1616 | ] |
| 1585 | 1617 | ||
| 1586 | [[package]] | 1618 | [[package]] |
| @@ -2467,7 +2499,7 @@ name = "simple-websockets" | |||
| 2467 | version = "0.1.6" | 2499 | version = "0.1.6" |
| 2468 | source = "git+https://github.com/DanConwayDev/simple-websockets?branch=auto-release-port#f53d7662ddf10d926e46c34e7d4044c0ebc21bb0" | 2500 | source = "git+https://github.com/DanConwayDev/simple-websockets?branch=auto-release-port#f53d7662ddf10d926e46c34e7d4044c0ebc21bb0" |
| 2469 | dependencies = [ | 2501 | dependencies = [ |
| 2470 | "flume", | 2502 | "flume 0.10.14", |
| 2471 | "futures-util", | 2503 | "futures-util", |
| 2472 | "tokio", | 2504 | "tokio", |
| 2473 | "tokio-tungstenite 0.20.1", | 2505 | "tokio-tungstenite 0.20.1", |
| @@ -23,12 +23,12 @@ directories = "6.0.0" | |||
| 23 | futures = "0.3.31" | 23 | futures = "0.3.31" |
| 24 | git2 = "0.20.2" | 24 | git2 = "0.20.2" |
| 25 | indicatif = "0.18.0" | 25 | indicatif = "0.18.0" |
| 26 | nostr = { version = "0.43.0", features = ["nip49"] } | 26 | nostr = { version = "0.44.1", features = ["nip49"] } |
| 27 | nostr-connect = "0.43.0" | 27 | nostr-connect = "0.44.0" |
| 28 | nostr-database = "0.43.0" | 28 | nostr-database = "0.44.0" |
| 29 | nostr-lmdb = "0.43.0" | 29 | nostr-lmdb = "0.44.0" |
| 30 | nostr-relay-pool = "0.43.0" | 30 | nostr-relay-pool = "0.44.0" |
| 31 | nostr-sdk = "0.43.0" | 31 | nostr-sdk = "0.44.1" |
| 32 | passwords = "3.1.16" | 32 | passwords = "3.1.16" |
| 33 | qrcode = { version = "0.14.1", default-features = false } | 33 | qrcode = { version = "0.14.1", default-features = false } |
| 34 | reqwest = { version = "0.12.22", features = ["json"] } | 34 | reqwest = { version = "0.12.22", features = ["json"] } |
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index 9cf2c52..31c920a 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs | |||
| @@ -1296,7 +1296,7 @@ async fn get_proposal_and_revision_root_from_patch_or_pr_or_pr_update( | |||
| 1296 | ); | 1296 | ); |
| 1297 | } | 1297 | } |
| 1298 | } | 1298 | } |
| 1299 | return Ok((*id, None)); | 1299 | return Ok((id, None)); |
| 1300 | } | 1300 | } |
| 1301 | bail!( | 1301 | bail!( |
| 1302 | "pull request update {} root event is not a pull request event", | 1302 | "pull request update {} root event is not a pull request event", |
diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index 016cc19..e7f5e05 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml | |||
| @@ -10,10 +10,10 @@ dialoguer = "0.12.0" | |||
| 10 | directories = "6.0.0" | 10 | directories = "6.0.0" |
| 11 | futures = "0.3.31" | 11 | futures = "0.3.31" |
| 12 | git2 = "0.20.2" | 12 | git2 = "0.20.2" |
| 13 | nostr = "0.43.0" | 13 | nostr = "0.44.1" |
| 14 | nostr-database = "0.43.0" | 14 | nostr-database = "0.44.0" |
| 15 | nostr-lmdb = "0.43.0" | 15 | nostr-lmdb = "0.44.0" |
| 16 | nostr-sdk = "0.43.0" | 16 | nostr-sdk = "0.44.1" |
| 17 | once_cell = "1.21.3" | 17 | once_cell = "1.21.3" |
| 18 | rand = "0.9" | 18 | rand = "0.9" |
| 19 | rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" } | 19 | rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" } |
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs index 22bdf90..bdfc550 100644 --- a/test_utils/src/lib.rs +++ b/test_utils/src/lib.rs | |||
| @@ -135,7 +135,7 @@ pub fn make_event_old_or_change_user( | |||
| 135 | .build(keys.public_key()); | 135 | .build(keys.public_key()); |
| 136 | 136 | ||
| 137 | unsigned.created_at = | 137 | unsigned.created_at = |
| 138 | nostr::types::Timestamp::from(nostr::types::Timestamp::now().as_u64() - how_old_in_secs); | 138 | nostr::types::Timestamp::from(nostr::types::Timestamp::now().as_secs() - how_old_in_secs); |
| 139 | unsigned.id = Some(nostr::EventId::new( | 139 | unsigned.id = Some(nostr::EventId::new( |
| 140 | &keys.public_key(), | 140 | &keys.public_key(), |
| 141 | &unsigned.created_at, | 141 | &unsigned.created_at, |
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs index 313e824..9582bfd 100644 --- a/test_utils/src/relay.rs +++ b/test_utils/src/relay.rs | |||
| @@ -219,10 +219,13 @@ fn get_nreq( | |||
| 219 | let cm_result = ClientMessage::from_json(s); | 219 | let cm_result = ClientMessage::from_json(s); |
| 220 | if let Ok(ClientMessage::Req { | 220 | if let Ok(ClientMessage::Req { |
| 221 | subscription_id, | 221 | subscription_id, |
| 222 | filter, | 222 | filters, |
| 223 | }) = cm_result | 223 | }) = cm_result |
| 224 | { | 224 | { |
| 225 | return Ok((subscription_id.into_owned(), filter.into_owned())); | 225 | return Ok(( |
| 226 | subscription_id.into_owned(), | ||
| 227 | filters.into_iter().next().unwrap().into_owned(), | ||
| 228 | )); | ||
| 226 | } | 229 | } |
| 227 | } | 230 | } |
| 228 | bail!("not nostr event") | 231 | bail!("not nostr event") |