Skip to content

Commit 4a533e6

Browse files
pyramationpyramation
authored
Merge pull request #152 from adairrr/adair/memoFix
Suffix fee, memo, and funds with underscores
2 parents 3b9b357 + c7805cf commit 4a533e6

File tree

88 files changed

+1787
-1786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1787
-1786
lines changed

‎__fixtures__/issues/98/out/98.client.ts

+18-18
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export interface 98Interface extends 98ReadOnlyInterface {
7373
}: {
7474
id: number;
7575
instantiateMsg: Binary;
76-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
76+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
7777
registerPlugin: ({
7878
checksum,
7979
codeId,
@@ -88,12 +88,12 @@ export interface 98Interface extends 98ReadOnlyInterface {
8888
ipfsHash: string;
8989
name: string;
9090
version: string;
91-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
91+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
9292
unregisterPlugin: ({
9393
id
9494
}: {
9595
id: number;
96-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
96+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
9797
updatePlugin: ({
9898
checksum,
9999
codeId,
@@ -110,17 +110,17 @@ export interface 98Interface extends 98ReadOnlyInterface {
110110
ipfsHash?: string;
111111
name?: string;
112112
version?: string;
113-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
113+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
114114
updateRegistryFee: ({
115115
newFee
116116
}: {
117117
newFee: Coin;
118-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
118+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
119119
updateDaoAddr: ({
120120
newAddr
121121
}: {
122122
newAddr: string;
123-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
123+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
124124
}
125125
export class 98Client extends 98QueryClient implements 98Interface {
126126
client: SigningCosmWasmClient;
@@ -144,13 +144,13 @@ export class 98Client extends 98QueryClient implements 98Interface {
144144
}: {
145145
id: number;
146146
instantiateMsg: Binary;
147-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
147+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
148148
return await this.client.execute(this.sender, this.contractAddress, {
149149
proxy_install_plugin: {
150150
id,
151151
instantiate_msg: instantiateMsg
152152
}
153-
}, fee, memo, _funds);
153+
}, fee_, memo_, funds_);
154154
};
155155
registerPlugin = async ({
156156
checksum,
@@ -166,7 +166,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
166166
ipfsHash: string;
167167
name: string;
168168
version: string;
169-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
169+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
170170
return await this.client.execute(this.sender, this.contractAddress, {
171171
register_plugin: {
172172
checksum,
@@ -176,18 +176,18 @@ export class 98Client extends 98QueryClient implements 98Interface {
176176
name,
177177
version
178178
}
179-
}, fee, memo, _funds);
179+
}, fee_, memo_, funds_);
180180
};
181181
unregisterPlugin = async ({
182182
id
183183
}: {
184184
id: number;
185-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
185+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
186186
return await this.client.execute(this.sender, this.contractAddress, {
187187
unregister_plugin: {
188188
id
189189
}
190-
}, fee, memo, _funds);
190+
}, fee_, memo_, funds_);
191191
};
192192
updatePlugin = async ({
193193
checksum,
@@ -205,7 +205,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
205205
ipfsHash?: string;
206206
name?: string;
207207
version?: string;
208-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
208+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
209209
return await this.client.execute(this.sender, this.contractAddress, {
210210
update_plugin: {
211211
checksum,
@@ -216,28 +216,28 @@ export class 98Client extends 98QueryClient implements 98Interface {
216216
name,
217217
version
218218
}
219-
}, fee, memo, _funds);
219+
}, fee_, memo_, funds_);
220220
};
221221
updateRegistryFee = async ({
222222
newFee
223223
}: {
224224
newFee: Coin;
225-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
225+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
226226
return await this.client.execute(this.sender, this.contractAddress, {
227227
update_registry_fee: {
228228
new_fee: newFee
229229
}
230-
}, fee, memo, _funds);
230+
}, fee_, memo_, funds_);
231231
};
232232
updateDaoAddr = async ({
233233
newAddr
234234
}: {
235235
newAddr: string;
236-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
236+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
237237
return await this.client.execute(this.sender, this.contractAddress, {
238238
update_dao_addr: {
239239
new_addr: newAddr
240240
}
241-
}, fee, memo, _funds);
241+
}, fee_, memo_, funds_);
242242
};
243243
}

‎__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export interface CwAdminFactoryInterface {
2929
codeId: number;
3030
instantiateMsg: Binary;
3131
label: string;
32-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
32+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
3333
}
3434
export class CwAdminFactoryClient implements CwAdminFactoryInterface {
3535
client: SigningCosmWasmClient;
@@ -49,13 +49,13 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
4949
codeId: number;
5050
instantiateMsg: Binary;
5151
label: string;
52-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
52+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
5353
return await this.client.execute(this.sender, this.contractAddress, {
5454
instantiate_contract_with_self_admin: {
5555
code_id: codeId,
5656
instantiate_msg: instantiateMsg,
5757
label
5858
}
59-
}, fee, memo, _funds);
59+
}, fee_, memo_, funds_);
6060
};
6161
}

‎__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
2020
codeId: number;
2121
instantiateMsg: Binary;
2222
label: string;
23-
}, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
23+
}, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
2424
}
2525
export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
2626
sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
3838
codeId: number;
3939
instantiateMsg: Binary;
4040
label: string;
41-
}, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
41+
}, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
4242
return {
4343
typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
4444
value: MsgExecuteContract.fromPartial({
@@ -51,7 +51,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
5151
label
5252
}
5353
})),
54-
funds: _funds
54+
funds: funds_
5555
})
5656
};
5757
};

‎__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface {
107107
amount: Uint128;
108108
msg: Binary;
109109
sender: string;
110-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
110+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
111111
register: ({
112112
chainId,
113113
checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface {
120120
codeId: number;
121121
name: string;
122122
version: string;
123-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
123+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
124124
setOwner: ({
125125
chainId,
126126
name,
@@ -129,21 +129,21 @@ export interface CwCodeIdRegistryInterface {
129129
chainId: string;
130130
name: string;
131131
owner?: string;
132-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
132+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
133133
unregister: ({
134134
chainId,
135135
codeId
136136
}: {
137137
chainId: string;
138138
codeId: number;
139-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
139+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
140140
updateConfig: ({
141141
admin,
142142
paymentInfo
143143
}: {
144144
admin?: string;
145145
paymentInfo?: PaymentInfo;
146-
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
146+
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
147147
}
148148
export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
149149
client: SigningCosmWasmClient;
@@ -167,14 +167,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
167167
amount: Uint128;
168168
msg: Binary;
169169
sender: string;
170-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
170+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
171171
return await this.client.execute(this.sender, this.contractAddress, {
172172
receive: {
173173
amount,
174174
msg,
175175
sender
176176
}
177-
}, fee, memo, _funds);
177+
}, fee_, memo_, funds_);
178178
};
179179
register = async ({
180180
chainId,
@@ -188,7 +188,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
188188
codeId: number;
189189
name: string;
190190
version: string;
191-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
191+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
192192
return await this.client.execute(this.sender, this.contractAddress, {
193193
register: {
194194
chain_id: chainId,
@@ -197,7 +197,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
197197
name,
198198
version
199199
}
200-
}, fee, memo, _funds);
200+
}, fee_, memo_, funds_);
201201
};
202202
setOwner = async ({
203203
chainId,
@@ -207,41 +207,41 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
207207
chainId: string;
208208
name: string;
209209
owner?: string;
210-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
210+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
211211
return await this.client.execute(this.sender, this.contractAddress, {
212212
set_owner: {
213213
chain_id: chainId,
214214
name,
215215
owner
216216
}
217-
}, fee, memo, _funds);
217+
}, fee_, memo_, funds_);
218218
};
219219
unregister = async ({
220220
chainId,
221221
codeId
222222
}: {
223223
chainId: string;
224224
codeId: number;
225-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
225+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
226226
return await this.client.execute(this.sender, this.contractAddress, {
227227
unregister: {
228228
chain_id: chainId,
229229
code_id: codeId
230230
}
231-
}, fee, memo, _funds);
231+
}, fee_, memo_, funds_);
232232
};
233233
updateConfig = async ({
234234
admin,
235235
paymentInfo
236236
}: {
237237
admin?: string;
238238
paymentInfo?: PaymentInfo;
239-
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
239+
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
240240
return await this.client.execute(this.sender, this.contractAddress, {
241241
update_config: {
242242
admin,
243243
payment_info: paymentInfo
244244
}
245-
}, fee, memo, _funds);
245+
}, fee_, memo_, funds_);
246246
};
247247
}

0 commit comments

Comments
 (0)