fix: some New*Tx arguments were left over

aeternity · Nov 11, 2019 · 0d4c9b1 · 0d4c9b1
1 parent 5f06729
commit 0d4c9b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/transactions/tx_contracts.go b/transactions/tx_contracts.go
@@ -193,7 +193,7 @@ func (tx *ContractCreateTx) GetGasLimit() *big.Int {
 }
 
 // NewContractCreateTx is a constructor for a ContractCreateTx struct
-func NewContractCreateTx(ownerID string, accountNonce uint64, code string, vmVersion, abiVersion uint16, deposit, amount, gasLimit, gasPrice *big.Int, callData string, ttlnoncer TTLNoncer) (tx *ContractCreateTx, err error) {
+func NewContractCreateTx(ownerID string, bytecode string, vmVersion, abiVersion uint16, deposit, amount, gasLimit, gasPrice *big.Int, callData string, ttlnoncer TTLNoncer) (tx *ContractCreateTx, err error) {
 	ttl, accountNonce, err := ttlnoncer(ownerID, config.Client.TTL)
 	if err != nil {
 		return
@@ -202,7 +202,7 @@ func NewContractCreateTx(ownerID string, accountNonce uint64, code string, vmVer
 	tx = &ContractCreateTx{
 		OwnerID:      ownerID,
 		AccountNonce: accountNonce,
-		Code:         code,
+		Code:         bytecode,
 		VMVersion:    vmVersion,
 		AbiVersion:   abiVersion,
 		Deposit:      deposit,
@@ -361,7 +361,7 @@ func (tx *ContractCallTx) GetGasLimit() *big.Int {
 }
 
 // NewContractCallTx is a constructor for a ContractCallTx struct
-func NewContractCallTx(callerID string, accountNonce uint64, contractID string, amount, gasLimit, gasPrice *big.Int, abiVersion uint16, callData string, ttlnoncer TTLNoncer) (tx *ContractCallTx, err error) {
+func NewContractCallTx(callerID string, contractID string, amount, gasLimit, gasPrice *big.Int, abiVersion uint16, callData string, ttlnoncer TTLNoncer) (tx *ContractCallTx, err error) {
 	ttl, accountNonce, err := ttlnoncer(callerID, config.Client.TTL)
 	if err != nil {
 		return

diff --git a/transactions/tx_oracles.go b/transactions/tx_oracles.go
@@ -283,8 +283,8 @@ func (tx *OracleExtendTx) GetGasLimit() *big.Int {
 }
 
 // NewOracleExtendTx is a constructor for a OracleExtendTx struct
-func NewOracleExtendTx(oracleID string, accountNonce, oracleTTLType, oracleTTLValue uint64, ttlnoncer TTLNoncer) (tx *OracleExtendTx, err error) {
-	ttl, accountNonce, err := ttlnoncer(oracleID, config.Client.TTL)
+func NewOracleExtendTx(senderID, oracleID string, oracleTTLType, oracleTTLValue uint64, ttlnoncer TTLNoncer) (tx *OracleExtendTx, err error) {
+	ttl, accountNonce, err := ttlnoncer(senderID, config.Client.TTL)
 	if err != nil {
 		return
 	}
@@ -582,8 +582,8 @@ func (tx *OracleRespondTx) GetGasLimit() *big.Int {
 }
 
 // NewOracleRespondTx is a constructor for a OracleRespondTx struct
-func NewOracleRespondTx(oracleID string, queryID string, response string, responseTTLType uint64, responseTTLValue uint64, ttlnoncer TTLNoncer) (tx *OracleRespondTx, err error) {
-	ttl, accountNonce, err := ttlnoncer(oracleID, config.Client.TTL)
+func NewOracleRespondTx(senderID, oracleID string, queryID string, response string, responseTTLType uint64, responseTTLValue uint64, ttlnoncer TTLNoncer) (tx *OracleRespondTx, err error) {
+	ttl, accountNonce, err := ttlnoncer(senderID, config.Client.TTL)
 	if err != nil {
 		return
 	}