Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2e22b79
dont use String for creating connections
krzysztofziobro Dec 27, 2022
20aafa6
do not wrap client
krzysztofziobro Dec 27, 2022
1f10b03
wip
krzysztofziobro Dec 28, 2022
2f5cda9
should work as old one
krzysztofziobro Dec 28, 2022
f5b769f
hide connection
krzysztofziobro Dec 28, 2022
44a4e9a
hide the rest
krzysztofziobro Dec 28, 2022
1472fd7
Don not hide clone
krzysztofziobro Dec 28, 2022
40225ca
Merge branch 'main' into A0-1613-improve-connection
krzysztofziobro Dec 29, 2022
168ce19
bump
krzysztofziobro Dec 29, 2022
0247e81
wip
krzysztofziobro Dec 30, 2022
4c1a6eb
wrap client
krzysztofziobro Dec 30, 2022
e41d124
rename client
krzysztofziobro Dec 30, 2022
7968aea
add Clone
krzysztofziobro Dec 30, 2022
9a979f6
Merge branch 'main' into A0-1613-improve-connection
krzysztofziobro Dec 30, 2022
50d7071
more general adder
krzysztofziobro Dec 30, 2022
dba9561
Add AsSigned
krzysztofziobro Dec 30, 2022
d700129
add impls for references
krzysztofziobro Dec 30, 2022
e45f361
wip
krzysztofziobro Jan 2, 2023
e6839b8
change TreasurySudoApi
krzysztofziobro Jan 2, 2023
8ec4625
Merge branch 'main' into A0-1613-improve-connection
krzysztofziobro Jan 2, 2023
3bf05d5
add methods to SignedConnectionApi
krzysztofziobro Jan 2, 2023
6b259b2
Merge branch 'A0-1613-improve-connection' of github.com:Cardinal-Cryp…
krzysztofziobro Jan 2, 2023
23d5a58
remove unnecessary casts
krzysztofziobro Jan 2, 2023
5600e11
Merge branch 'main' into A0-1613-improve-connection
krzysztofziobro Jan 2, 2023
b7ad771
review part 1
krzysztofziobro Jan 2, 2023
d156320
Merge branch 'A0-1613-improve-connection' of github.com:Cardinal-Cryp…
krzysztofziobro Jan 2, 2023
ef5625d
review part 2
krzysztofziobro Jan 2, 2023
af4d737
Make AsConnection visible only in crate
krzysztofziobro Jan 3, 2023
d15be1b
Merge branch 'main' into A0-1613-improve-connection
krzysztofziobro Jan 3, 2023
70db49a
Remove unnecessary dependencies on ConnectionApi
krzysztofziobro Jan 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review part 1
  • Loading branch information
krzysztofziobro committed Jan 2, 2023
commit b7ad7715c31f61d302833594d65325b25b59d2c5
31 changes: 6 additions & 25 deletions aleph-client/src/connections.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ pub struct RootConnection {
connection: SignedConnection,
}

pub trait AsConnection: Sync {
pub trait AsConnection {
fn as_connection(&self) -> &Connection;
}

pub trait AsSigned: Sync {
pub trait AsSigned {
fn as_signed(&self) -> &SignedConnection;
}

#[async_trait::async_trait]
pub trait ConnectionApi: AsConnection {
pub trait ConnectionApi: AsConnection + Sync {
async fn get_storage_entry<T: DecodeWithMetadata + Sync, Defaultable: Sync, Iterable: Sync>(
&self,
addrs: &StaticStorageAddress<T, Yes, Defaultable, Iterable>,
Expand All @@ -61,7 +61,7 @@ pub trait ConnectionApi: AsConnection {
}

#[async_trait::async_trait]
pub trait SignedConnectionApi: AsSigned {
pub trait SignedConnectionApi: AsSigned + Sync {
async fn send_tx<Call: TxPayload + Send + Sync>(
&self,
tx: Call,
Expand Down Expand Up @@ -124,12 +124,6 @@ impl AsConnection for Connection {
}
}

impl AsConnection for &Connection {
fn as_connection(&self) -> &Connection {
self
}
}

impl<S: AsSigned> AsConnection for S {
fn as_connection(&self) -> &Connection {
&self.as_signed().connection
Expand All @@ -142,26 +136,14 @@ impl AsSigned for SignedConnection {
}
}

impl AsSigned for &SignedConnection {
fn as_signed(&self) -> &SignedConnection {
self
}
}

impl AsSigned for RootConnection {
fn as_signed(&self) -> &SignedConnection {
&self.connection
}
}

impl AsSigned for &RootConnection {
fn as_signed(&self) -> &SignedConnection {
&self.connection
}
}

#[async_trait::async_trait]
impl<C: AsConnection> ConnectionApi for C {
impl<C: AsConnection + Sync> ConnectionApi for C {
async fn get_storage_entry<T: DecodeWithMetadata + Sync, Defaultable: Sync, Iterable: Sync>(
&self,
addrs: &StaticStorageAddress<T, Yes, Defaultable, Iterable>,
Expand Down Expand Up @@ -204,7 +186,7 @@ impl<C: AsConnection> ConnectionApi for C {
}

#[async_trait::async_trait]
impl<S: AsSigned> SignedConnectionApi for S {
impl<S: AsSigned + Sync> SignedConnectionApi for S {
async fn send_tx<Call: TxPayload + Send + Sync>(
&self,
tx: Call,
Expand Down Expand Up @@ -306,7 +288,6 @@ impl RootConnection {
let root_address = api::storage().sudo().key();

let root = match connection
.as_connection()
.as_client()
.storage()
.fetch(&root_address, None)
Expand Down