@@ -18,15 +18,15 @@ const MAX_LENGTH_HANDLE: usize = 100_000;
1818const MAX_LENGTH_MIGRATE : usize = 100_000 ;
1919const MAX_LENGTH_QUERY : usize = 100_000 ;
2020
21- pub fn call_init < S , A , Q , U > (
22- instance : & mut Instance < S , A , Q > ,
21+ pub fn call_init < A , S , Q , U > (
22+ instance : & mut Instance < A , S , Q > ,
2323 env : & Env ,
2424 info : & MessageInfo ,
2525 msg : & [ u8 ] ,
2626) -> VmResult < ContractResult < InitResponse < U > > >
2727where
28- S : Storage + ' static ,
2928 A : Api + ' static ,
29+ S : Storage + ' static ,
3030 Q : Querier + ' static ,
3131 U : DeserializeOwned + Clone + fmt:: Debug + JsonSchema + PartialEq ,
3232{
@@ -37,15 +37,15 @@ where
3737 Ok ( result)
3838}
3939
40- pub fn call_handle < S , A , Q , U > (
41- instance : & mut Instance < S , A , Q > ,
40+ pub fn call_handle < A , S , Q , U > (
41+ instance : & mut Instance < A , S , Q > ,
4242 env : & Env ,
4343 info : & MessageInfo ,
4444 msg : & [ u8 ] ,
4545) -> VmResult < ContractResult < HandleResponse < U > > >
4646where
47- S : Storage + ' static ,
4847 A : Api + ' static ,
48+ S : Storage + ' static ,
4949 Q : Querier + ' static ,
5050 U : DeserializeOwned + Clone + fmt:: Debug + JsonSchema + PartialEq ,
5151{
@@ -56,15 +56,15 @@ where
5656 Ok ( result)
5757}
5858
59- pub fn call_migrate < S , A , Q , U > (
60- instance : & mut Instance < S , A , Q > ,
59+ pub fn call_migrate < A , S , Q , U > (
60+ instance : & mut Instance < A , S , Q > ,
6161 env : & Env ,
6262 info : & MessageInfo ,
6363 msg : & [ u8 ] ,
6464) -> VmResult < ContractResult < MigrateResponse < U > > >
6565where
66- S : Storage + ' static ,
6766 A : Api + ' static ,
67+ S : Storage + ' static ,
6868 Q : Querier + ' static ,
6969 U : DeserializeOwned + Clone + fmt:: Debug + JsonSchema + PartialEq ,
7070{
@@ -75,11 +75,16 @@ where
7575 Ok ( result)
7676}
7777
78- pub fn call_query < S : Storage + ' static , A : Api + ' static , Q : Querier + ' static > (
79- instance : & mut Instance < S , A , Q > ,
78+ pub fn call_query < A , S , Q > (
79+ instance : & mut Instance < A , S , Q > ,
8080 env : & Env ,
8181 msg : & [ u8 ] ,
82- ) -> VmResult < ContractResult < QueryResponse > > {
82+ ) -> VmResult < ContractResult < QueryResponse > >
83+ where
84+ A : Api + ' static ,
85+ S : Storage + ' static ,
86+ Q : Querier + ' static ,
87+ {
8388 let env = to_vec ( env) ?;
8489 let data = call_query_raw ( instance, & env, msg) ?;
8590 let result: ContractResult < QueryResponse > = from_slice ( & data) ?;
@@ -96,57 +101,82 @@ pub fn call_query<S: Storage + 'static, A: Api + 'static, Q: Querier + 'static>(
96101
97102/// Calls Wasm export "init" and returns raw data from the contract.
98103/// The result is length limited to prevent abuse but otherwise unchecked.
99- pub fn call_init_raw < S : Storage + ' static , A : Api + ' static , Q : Querier + ' static > (
100- instance : & mut Instance < S , A , Q > ,
104+ pub fn call_init_raw < A , S , Q > (
105+ instance : & mut Instance < A , S , Q > ,
101106 env : & [ u8 ] ,
102107 info : & [ u8 ] ,
103108 msg : & [ u8 ] ,
104- ) -> VmResult < Vec < u8 > > {
109+ ) -> VmResult < Vec < u8 > >
110+ where
111+ A : Api + ' static ,
112+ S : Storage + ' static ,
113+ Q : Querier + ' static ,
114+ {
105115 instance. set_storage_readonly ( false ) ;
106116 call_raw ( instance, "init" , & [ env, info, msg] , MAX_LENGTH_INIT )
107117}
108118
109119/// Calls Wasm export "handle" and returns raw data from the contract.
110120/// The result is length limited to prevent abuse but otherwise unchecked.
111- pub fn call_handle_raw < S : Storage + ' static , A : Api + ' static , Q : Querier + ' static > (
112- instance : & mut Instance < S , A , Q > ,
121+ pub fn call_handle_raw < A , S , Q > (
122+ instance : & mut Instance < A , S , Q > ,
113123 env : & [ u8 ] ,
114124 info : & [ u8 ] ,
115125 msg : & [ u8 ] ,
116- ) -> VmResult < Vec < u8 > > {
126+ ) -> VmResult < Vec < u8 > >
127+ where
128+ A : Api + ' static ,
129+ S : Storage + ' static ,
130+ Q : Querier + ' static ,
131+ {
117132 instance. set_storage_readonly ( false ) ;
118133 call_raw ( instance, "handle" , & [ env, info, msg] , MAX_LENGTH_HANDLE )
119134}
120135
121136/// Calls Wasm export "migrate" and returns raw data from the contract.
122137/// The result is length limited to prevent abuse but otherwise unchecked.
123- pub fn call_migrate_raw < S : Storage + ' static , A : Api + ' static , Q : Querier + ' static > (
124- instance : & mut Instance < S , A , Q > ,
138+ pub fn call_migrate_raw < A , S , Q > (
139+ instance : & mut Instance < A , S , Q > ,
125140 env : & [ u8 ] ,
126141 info : & [ u8 ] ,
127142 msg : & [ u8 ] ,
128- ) -> VmResult < Vec < u8 > > {
143+ ) -> VmResult < Vec < u8 > >
144+ where
145+ A : Api + ' static ,
146+ S : Storage + ' static ,
147+ Q : Querier + ' static ,
148+ {
129149 instance. set_storage_readonly ( false ) ;
130150 call_raw ( instance, "migrate" , & [ env, info, msg] , MAX_LENGTH_MIGRATE )
131151}
132152
133153/// Calls Wasm export "query" and returns raw data from the contract.
134154/// The result is length limited to prevent abuse but otherwise unchecked.
135- pub fn call_query_raw < S : Storage + ' static , A : Api + ' static , Q : Querier + ' static > (
136- instance : & mut Instance < S , A , Q > ,
155+ pub fn call_query_raw < A , S , Q > (
156+ instance : & mut Instance < A , S , Q > ,
137157 env : & [ u8 ] ,
138158 msg : & [ u8 ] ,
139- ) -> VmResult < Vec < u8 > > {
159+ ) -> VmResult < Vec < u8 > >
160+ where
161+ A : Api + ' static ,
162+ S : Storage + ' static ,
163+ Q : Querier + ' static ,
164+ {
140165 instance. set_storage_readonly ( true ) ;
141166 call_raw ( instance, "query" , & [ env, msg] , MAX_LENGTH_QUERY )
142167}
143168
144- fn call_raw < S : Storage + ' static , A : Api + ' static , Q : Querier + ' static > (
145- instance : & mut Instance < S , A , Q > ,
169+ fn call_raw < A , S , Q > (
170+ instance : & mut Instance < A , S , Q > ,
146171 name : & str ,
147172 args : & [ & [ u8 ] ] ,
148173 result_max_length : usize ,
149- ) -> VmResult < Vec < u8 > > {
174+ ) -> VmResult < Vec < u8 > >
175+ where
176+ A : Api + ' static ,
177+ S : Storage + ' static ,
178+ Q : Querier + ' static ,
179+ {
150180 let mut arg_region_ptrs = Vec :: < Val > :: with_capacity ( args. len ( ) ) ;
151181 for arg in args {
152182 let region_ptr = instance. allocate ( arg. len ( ) ) ?;
0 commit comments