Merge branch 'develop' into 'master'

Use full type name of Address in SolCodeGen - fix naming collisions with solidity code See merge request company-projects/Meadow!23
MeadowSuite · Sep 28, 2018 · 1344126 · 1344126
2 parents 0ec1aa7 + 59db066
commit 1344126
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Meadow.SolCodeGen/CodeGenerators/ContractGenerator.cs b/src/Meadow.SolCodeGen/CodeGenerators/ContractGenerator.cs
@@ -100,7 +100,7 @@ public class {_contractName} : {typeof(BaseContract).FullName}
                     protected override string ContractBytecodeHash => CONTRACT_BYTECODE_HASH;
                     protected override string ContractBytecodeDeployedHash => CONTRACT_BYTECODE_DEPLOYED_HASH;
 
-                    private {_contractName}({JsonRpcClientType} rpcClient, Address address, Address defaultFromAccount)
+                    private {_contractName}({JsonRpcClientType} rpcClient, {typeof(Address).FullName} address, {typeof(Address).FullName} defaultFromAccount)
                         : base(rpcClient, address, defaultFromAccount)
                     {{ 
                         {typeof(EventLogUtil).FullName}.{nameof(EventLogUtil.RegisterDeployedContractEventTypes)}(
@@ -110,7 +110,7 @@ public class {_contractName} : {typeof(BaseContract).FullName}
 
                     }}
 
-                    public static async Task<{_contractName}> At({JsonRpcClientType} rpcClient, Address address, Address? defaultFromAccount = null)
+                    public static async Task<{_contractName}> At({JsonRpcClientType} rpcClient, {typeof(Address).FullName} address, {typeof(Address).FullName}? defaultFromAccount = null)
                     {{
                         defaultFromAccount = defaultFromAccount ?? (await rpcClient.Accounts())[0];
                         return new {_contractName}(rpcClient, address, defaultFromAccount.Value);
@@ -237,10 +237,10 @@ string GenerateConstructor(Abi constructorAbi)
                     public static async Task<{_contractName}> Deploy(
                             {inputConstructorArg}
                             {JsonRpcClientType} rpcClient,
-                            TransactionParams transactionParams = null,
-                        Address? defaultFromAccount = null)
+                            {typeof(TransactionParams).FullName} transactionParams = null,
+                            {typeof(Address).FullName}? defaultFromAccount = null)
                     {{
-                        transactionParams = transactionParams ?? new TransactionParams();
+                        transactionParams = transactionParams ?? new {typeof(TransactionParams).FullName}();
                         defaultFromAccount = defaultFromAccount ?? transactionParams.From ?? (await rpcClient.Accounts())[0];
                         transactionParams.From = transactionParams.From ?? defaultFromAccount;
                     
@@ -255,8 +255,8 @@ string GenerateConstructor(Abi constructorAbi)
                     public static ContractDeployer<{_contractName}> New(
                             {inputConstructorArg}
                             {JsonRpcClientType} rpcClient,
-                            TransactionParams transactionParams = null,
-                        Address? defaultFromAccount = null)
+                            {typeof(TransactionParams).FullName} transactionParams = null,
+                            {typeof(Address).FullName}? defaultFromAccount = null)
                     {{
                         {encodedParamsLine}