summaryrefslogtreecommitdiffstats
path: root/net/tests
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2021-01-15 09:35:04 +0100
committerJustus Winter <justus@sequoia-pgp.org>2021-01-15 11:34:49 +0100
commit59a59ac5bf9cc9be2698eb35376c3b58fd483252 (patch)
tree5eb5c8256c67b8397669c48fae905840c3302866 /net/tests
parentde5c18230ddcad3928ae5c4bd2c1badbe9ec2e92 (diff)
net: Decouple from core.
- Move core::NetworkPolicy to net::Policy, update all code accordingly.
Diffstat (limited to 'net/tests')
-rw-r--r--net/tests/hkp.rs18
1 files changed, 5 insertions, 13 deletions
diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs
index 8dafe9a6..f1984529 100644
--- a/net/tests/hkp.rs
+++ b/net/tests/hkp.rs
@@ -11,7 +11,7 @@ use sequoia_openpgp::KeyID;
use sequoia_openpgp::armor::Reader;
use sequoia_openpgp::Cert;
use sequoia_openpgp::parse::Parse;
-use sequoia_core::{Context, NetworkPolicy};
+use sequoia_net as net;
use sequoia_net::KeyServer;
const RESPONSE: &'static str = "-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -118,17 +118,14 @@ fn start_server() -> SocketAddr {
addr
}
+const P: net::Policy = net::Policy::Insecure;
+
#[tokio::test]
async fn get() -> anyhow::Result<()> {
- let ctx = Context::configure()
- .ephemeral()
- .network_policy(NetworkPolicy::Insecure)
- .build()?;
-
// Start server.
let addr = start_server();
- let mut keyserver = KeyServer::new(&ctx, &format!("hkp://{}", addr))?;
+ let mut keyserver = KeyServer::new(P, &format!("hkp://{}", addr))?;
let keyid: KeyID = ID.parse()?;
let key = keyserver.get(keyid).await?;
@@ -139,16 +136,11 @@ async fn get() -> anyhow::Result<()> {
#[tokio::test]
async fn send() -> anyhow::Result<()> {
- let ctx = Context::configure()
- .ephemeral()
- .network_policy(NetworkPolicy::Insecure)
- .build()?;
-
// Start server.
let addr = start_server();
eprintln!("{}", format!("hkp://{}", addr));
let mut keyserver =
- KeyServer::new(&ctx, &format!("hkp://{}", addr))?;
+ KeyServer::new(P, &format!("hkp://{}", addr))?;
let key = Cert::from_reader(Reader::new(Cursor::new(RESPONSE), None))?;
keyserver.send(&key).await?;