fluencelabs/aqua-ipfs
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua-ipfs synced 2025-03-15 13:10:49 +00:00
Code Issues Projects Releases Wiki Activity

chore: Remove set_external_swarm_multiaddr from effector (#45)

Browse Source 
* Delete set_external_swarm_multiaddr from effector

* Update
This commit is contained in:
Anatolios Laskaris 2022-11-17 16:46:20 +02:00 committed by GitHub
parent a566b90bdc
commit 84e92b8c00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 439 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

644
service/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

25
service/effector/src/effector.rs
View File

@ -24,8 +24,6 @@ use marine_rs_sdk::MountedBinaryResult;
use marine_rs_sdk::WasmLoggerBuilder; use marine_rs_sdk::WasmLoggerBuilder;
use eyre::{Result, WrapErr}; use eyre::{Result, WrapErr};
use multiaddr::Multiaddr;
use std::str::FromStr;
module_manifest!(); module_manifest!();
@ -141,29 +139,6 @@ pub fn get_peer_id(api_multiaddr: String, timeout_sec: u64) -> IpfsGetPeerIdResu
.into() .into()
} }
#[marine]
pub fn set_external_swarm_multiaddr(
swarm_multiaddr: String,
api_multiaddr: String,
timeout_sec: u64,
) -> IpfsResult {
let result: Result<()> = try {
let multiaddr = Multiaddr::from_str(&swarm_multiaddr)
.wrap_err(format!("invalid multiaddr {}", swarm_multiaddr))?;
let args = vec![
String::from("config"),
String::from("Addresses.Announce"),
format!(r#"["{}"]"#, multiaddr.to_string()),
String::from("--json"),
];
let cmd = make_cmd_args(args, api_multiaddr, timeout_sec);
unwrap_mounted_binary_result(ipfs(cmd)).map(|_| ())?
};
result.into()
}
#[marine] #[marine]
#[link(wasm_import_module = "host")] #[link(wasm_import_module = "host")]
extern "C" { extern "C" {

14
service/pure/src/pure.rs
View File

@ -308,13 +308,6 @@ pub fn set_external_swarm_multiaddr(multiaddr: String) -> IpfsResult {
} }
multiaddr.push(peer_id); multiaddr.push(peer_id);
let set_result =
ipfs_set_external_swarm_multiaddr(multiaddr.to_string(), local_maddr, config.timeout);
if !set_result.success {
return set_result;
}
config.external_swarm_multiaddr = Some(multiaddr); config.external_swarm_multiaddr = Some(multiaddr);
write_config(config) write_config(config)
}; };
@ -354,11 +347,4 @@ extern "C" {
#[link_name = "get_peer_id"] #[link_name = "get_peer_id"]
pub fn ipfs_get_peer_id(local_multiaddr: String, timeout_sec: u64) -> IpfsGetPeerIdResult; pub fn ipfs_get_peer_id(local_multiaddr: String, timeout_sec: u64) -> IpfsGetPeerIdResult;
#[link_name = "set_external_swarm_multiaddr"]
pub fn ipfs_set_external_swarm_multiaddr(
swarm_multiaddr: String,
api_multiaddr: String,
timeout_sec: u64,
) -> IpfsResult;
} }