Skip to content

Commit eb67ef4

Browse files
authored
Merge pull request #90 from EbenezerGH/slight-refactoring
Slight refactoring
2 parents 0e3f0a1 + 3f8cc00 commit eb67ef4

36 files changed

+210
-191
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package jfyg.data
22

3-
data class Balance(var account: String? = null,
3+
data class Balance(val account: String? = null,
44

5-
var balance: String? = null)
5+
val balance: String? = null)
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jfyg.data
22

3-
data class BlockAccount(var blockNumber: String? = null,
3+
data class BlockAccount(val blockNumber: String? = null,
44

5-
var timeStamp: String? = null,
5+
val timeStamp: String? = null,
66

7-
var blockReward: String? = null)
7+
val blockReward: String? = null)
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package jfyg.data
22

3-
data class BlockMined(var blockNumber: String? = null,
3+
data class BlockMined(val blockNumber: String? = null,
44

5-
var timeStamp: String? = null,
5+
val timeStamp: String? = null,
66

7-
var blockMiner: String? = null,
7+
val blockMiner: String? = null,
88

9-
var blockReward: String? = null,
9+
val blockReward: String? = null,
1010

11-
var uncles: List<Uncle> = emptyList())
11+
val uncles: List<Uncle> = emptyList())

etherscanapi/src/main/java/jfyg/data/ERC20Token.kt

+19-19
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@ package jfyg.data
22

33
import com.google.gson.annotations.SerializedName
44

5-
data class ERC20Token(var blockNumber: String? = null,
5+
data class ERC20Token(val blockNumber: String? = null,
66

7-
var timeStamp: String? = null,
7+
val timeStamp: String? = null,
88

9-
var hash: String? = null,
9+
val hash: String? = null,
1010

11-
var nonce: String? = null,
11+
val nonce: String? = null,
1212

13-
var blockHash: String? = null,
13+
val blockHash: String? = null,
1414

1515
@SerializedName("from")
16-
var transactionFrom: String? = null,
16+
val transactionFrom: String? = null,
1717

18-
var contractAddress: String? = null,
18+
val contractAddress: String? = null,
1919

2020
@SerializedName("to")
21-
var transactionTo: String? = null,
21+
val transactionTo: String? = null,
2222

23-
var value: String? = null,
23+
val value: String? = null,
2424

25-
var tokenName: String? = null,
25+
val tokenName: String? = null,
2626

27-
var tokenSymbol: String? = null,
27+
val tokenSymbol: String? = null,
2828

29-
var tokenDecimal: String? = null,
29+
val tokenDecimal: String? = null,
3030

31-
var transactionIndex: String? = null,
31+
val transactionIndex: String? = null,
3232

33-
var gas: String? = null,
33+
val gas: String? = null,
3434

35-
var gasPrice: String? = null,
35+
val gasPrice: String? = null,
3636

37-
var gasUsed: String? = null,
37+
val gasUsed: String? = null,
3838

39-
var cumulativeGasUsed: String? = null,
39+
val cumulativeGasUsed: String? = null,
4040

41-
var input: String? = null,
41+
val input: String? = null,
4242

43-
var confirmations: String? = null)
43+
val confirmations: String? = null)

etherscanapi/src/main/java/jfyg/data/StatPrice.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package jfyg.data
33
import com.google.gson.annotations.SerializedName
44

55
data class StatPrice(@SerializedName("ethbtc")
6-
var ethBtc: String? = null,
6+
val ethBtc: String? = null,
77

88
@SerializedName("ethbtc_timestamp")
9-
var ethBtcTimestamp: String? = null,
9+
val ethBtcTimestamp: String? = null,
1010

1111
@SerializedName("ethusd")
12-
var ethUsd: String? = null,
12+
val ethUsd: String? = null,
1313

1414
@SerializedName("ethusd_timestamp")
15-
var ethUsdTimestamp: String? = null
15+
val ethUsdTimestamp: String? = null
1616
)

etherscanapi/src/main/java/jfyg/data/Tx.kt

+18-18
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,41 @@ package jfyg.data
22

33
import com.google.gson.annotations.SerializedName
44

5-
data class Tx(var blockNumber: String? = null,
5+
data class Tx(val blockNumber: String? = null,
66

7-
var timeStamp: String? = null,
7+
val timeStamp: String? = null,
88

9-
var hash: String? = null,
9+
val hash: String? = null,
1010

11-
var nonce: String? = null,
11+
val nonce: String? = null,
1212

13-
var blockHash: String? = null,
13+
val blockHash: String? = null,
1414

15-
var transactionIndex: String? = null,
15+
val transactionIndex: String? = null,
1616

1717
@SerializedName("from")
18-
var transactionFrom: String? = null,
18+
val transactionFrom: String? = null,
1919

2020
@SerializedName("to")
21-
var transactionTo: String? = null,
21+
val transactionTo: String? = null,
2222

23-
var value: String? = null,
23+
val value: String? = null,
2424

25-
var gas: String? = null,
25+
val gas: String? = null,
2626

27-
var gasPrice: String? = null,
27+
val gasPrice: String? = null,
2828

29-
var isError: String? = null,
29+
val isError: String? = null,
3030

3131
@SerializedName("txreceipt_status")
32-
var receiptStatus: String? = null,
32+
val receiptStatus: String? = null,
3333

34-
var input: String? = null,
34+
val input: String? = null,
3535

36-
var contractAddress: String? = null,
36+
val contractAddress: String? = null,
3737

38-
var cumulativeGasUsed: String? = null,
38+
val cumulativeGasUsed: String? = null,
3939

40-
var gasUsed: String? = null,
40+
val gasUsed: String? = null,
4141

42-
var confirmations: String? = null)
42+
val confirmations: String? = null)
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package jfyg.data
22

3-
data class TxExecutionStatus(var isError: String? = null,
3+
data class TxExecutionStatus(val isError: String? = null,
44

5-
var errDescription: String? = null)
5+
val errDescription: String? = null)
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package jfyg.data
22

3-
data class TxReceiptStatus(var status: String? = null)
3+
data class TxReceiptStatus(val status: String? = null)

etherscanapi/src/main/java/jfyg/data/TxsInternal.kt

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@ package jfyg.data
22

33
import com.google.gson.annotations.SerializedName
44

5-
data class TxsInternal(var blockNumber: String? = null,
5+
data class TxsInternal(val blockNumber: String? = null,
66

7-
var timeStamp: String? = null,
7+
val timeStamp: String? = null,
88

9-
var hash: String? = null,
9+
val hash: String? = null,
1010

1111
@SerializedName("from")
12-
var transactionFrom: String? = null,
12+
val transactionFrom: String? = null,
1313

1414
@SerializedName("to")
15-
var transactionTo: String? = null,
15+
val transactionTo: String? = null,
1616

17-
var value: String? = null,
17+
val value: String? = null,
1818

19-
var contactAddress: String? = null,
19+
val contactAddress: String? = null,
2020

21-
var input: String? = null,
21+
val input: String? = null,
2222

23-
var type: String? = null,
23+
val type: String? = null,
2424

25-
var gas: String? = null,
25+
val gas: String? = null,
2626

27-
var gasUsed: String? = null,
27+
val gasUsed: String? = null,
2828

29-
var traceId: String? = null,
29+
val traceId: String? = null,
3030

31-
var isError: String? = null,
31+
val isError: String? = null,
3232

33-
var errCode: String? = null)
33+
val errCode: String? = null)

etherscanapi/src/main/java/jfyg/data/Uncle.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package jfyg.data
22

33
import com.google.gson.annotations.SerializedName
44

5-
data class Uncle(var miner: String? = null,
5+
data class Uncle(val miner: String? = null,
66

7-
var unclePosition: String? = null,
7+
val unclePosition: String? = null,
88

99
@SerializedName("blockreward")
10-
var blockReward: String? = null)
10+
val blockReward: String? = null)

0 commit comments

Comments
 (0)