Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit83284ba

Browse files
committed
Minor models fixes
1 parent97197ad commit83284ba

File tree

8 files changed

+9
-65
lines changed

8 files changed

+9
-65
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.github.goodforgod</groupId>
77
<artifactId>java-etherscan-api</artifactId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
<packaging>jar</packaging>
1010

1111
<name>${project.groupId}:${project.artifactId}</name>

‎src/main/java/io/api/etherscan/model/BaseTx.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,31 +79,16 @@ public boolean equals(Object o) {
7979

8080
if (blockNumber !=baseTx.blockNumber)returnfalse;
8181
if (timeStamp !=null ? !timeStamp.equals(baseTx.timeStamp) :baseTx.timeStamp !=null)returnfalse;
82-
if (_timeStamp !=null ? !_timeStamp.equals(baseTx._timeStamp) :baseTx._timeStamp !=null)returnfalse;
8382
if (hash !=null ? !hash.equals(baseTx.hash) :baseTx.hash !=null)returnfalse;
84-
if (from !=null ? !from.equals(baseTx.from) :baseTx.from !=null)returnfalse;
85-
if (to !=null ? !to.equals(baseTx.to) :baseTx.to !=null)returnfalse;
86-
if (value !=null ? !value.equals(baseTx.value) :baseTx.value !=null)returnfalse;
87-
if (contractAddress !=null ? !contractAddress.equals(baseTx.contractAddress) :baseTx.contractAddress !=null)
88-
returnfalse;
89-
if (input !=null ? !input.equals(baseTx.input) :baseTx.input !=null)returnfalse;
90-
if (gas !=null ? !gas.equals(baseTx.gas) :baseTx.gas !=null)returnfalse;
91-
returngasUsed !=null ?gasUsed.equals(baseTx.gasUsed) :baseTx.gasUsed ==null;
83+
returnvalue !=null ?value.equals(baseTx.value) :baseTx.value ==null;
9284
}
9385

9486
@Override
9587
publicinthashCode() {
9688
intresult = (int) (blockNumber ^ (blockNumber >>>32));
9789
result =31 *result + (timeStamp !=null ?timeStamp.hashCode() :0);
98-
result =31 *result + (_timeStamp !=null ?_timeStamp.hashCode() :0);
9990
result =31 *result + (hash !=null ?hash.hashCode() :0);
100-
result =31 *result + (from !=null ?from.hashCode() :0);
101-
result =31 *result + (to !=null ?to.hashCode() :0);
10291
result =31 *result + (value !=null ?value.hashCode() :0);
103-
result =31 *result + (contractAddress !=null ?contractAddress.hashCode() :0);
104-
result =31 *result + (input !=null ?input.hashCode() :0);
105-
result =31 *result + (gas !=null ?gas.hashCode() :0);
106-
result =31 *result + (gasUsed !=null ?gasUsed.hashCode() :0);
10792
returnresult;
10893
}
10994

@@ -112,7 +97,6 @@ public String toString() {
11297
return"BaseTx{" +
11398
"blockNumber=" +blockNumber +
11499
", timeStamp='" +timeStamp +'\'' +
115-
", _timeStamp=" +_timeStamp +
116100
", hash='" +hash +'\'' +
117101
", from='" +from +'\'' +
118102
", to='" +to +'\'' +

‎src/main/java/io/api/etherscan/model/Log.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -106,44 +106,20 @@ public boolean equals(Object o) {
106106
Loglog = (Log)o;
107107

108108
if (blockNumber !=null ? !blockNumber.equals(log.blockNumber) :log.blockNumber !=null)returnfalse;
109-
if (_blockNumber !=null ? !_blockNumber.equals(log._blockNumber) :log._blockNumber !=null)returnfalse;
110109
if (address !=null ? !address.equals(log.address) :log.address !=null)returnfalse;
111110
if (transactionHash !=null ? !transactionHash.equals(log.transactionHash) :log.transactionHash !=null)
112111
returnfalse;
113-
if (transactionIndex !=null ? !transactionIndex.equals(log.transactionIndex) :log.transactionIndex !=null)
114-
returnfalse;
115-
if (_transactionIndex !=null ? !_transactionIndex.equals(log._transactionIndex) :log._transactionIndex !=null)
116-
returnfalse;
117112
if (timeStamp !=null ? !timeStamp.equals(log.timeStamp) :log.timeStamp !=null)returnfalse;
118-
if (_timeStamp !=null ? !_timeStamp.equals(log._timeStamp) :log._timeStamp !=null)returnfalse;
119-
if (data !=null ? !data.equals(log.data) :log.data !=null)returnfalse;
120-
if (gasPrice !=null ? !gasPrice.equals(log.gasPrice) :log.gasPrice !=null)returnfalse;
121-
if (_gasPrice !=null ? !_gasPrice.equals(log._gasPrice) :log._gasPrice !=null)returnfalse;
122-
if (gasUsed !=null ? !gasUsed.equals(log.gasUsed) :log.gasUsed !=null)returnfalse;
123-
if (_gasUsed !=null ? !_gasUsed.equals(log._gasUsed) :log._gasUsed !=null)returnfalse;
124-
if (topics !=null ? !topics.equals(log.topics) :log.topics !=null)returnfalse;
125-
if (logIndex !=null ? !logIndex.equals(log.logIndex) :log.logIndex !=null)returnfalse;
126-
return_logIndex !=null ?_logIndex.equals(log._logIndex) :log._logIndex ==null;
113+
returnlogIndex !=null ?logIndex.equals(log.logIndex) :log.logIndex ==null;
127114
}
128115

129116
@Override
130117
publicinthashCode() {
131118
intresult =blockNumber !=null ?blockNumber.hashCode() :0;
132-
result =31 *result + (_blockNumber !=null ?_blockNumber.hashCode() :0);
133119
result =31 *result + (address !=null ?address.hashCode() :0);
134120
result =31 *result + (transactionHash !=null ?transactionHash.hashCode() :0);
135-
result =31 *result + (transactionIndex !=null ?transactionIndex.hashCode() :0);
136-
result =31 *result + (_transactionIndex !=null ?_transactionIndex.hashCode() :0);
137121
result =31 *result + (timeStamp !=null ?timeStamp.hashCode() :0);
138-
result =31 *result + (_timeStamp !=null ?_timeStamp.hashCode() :0);
139-
result =31 *result + (data !=null ?data.hashCode() :0);
140-
result =31 *result + (gasPrice !=null ?gasPrice.hashCode() :0);
141-
result =31 *result + (_gasPrice !=null ?_gasPrice.hashCode() :0);
142-
result =31 *result + (gasUsed !=null ?gasUsed.hashCode() :0);
143-
result =31 *result + (_gasUsed !=null ?_gasUsed.hashCode() :0);
144-
result =31 *result + (topics !=null ?topics.hashCode() :0);
145122
result =31 *result + (logIndex !=null ?logIndex.hashCode() :0);
146-
result =31 *result + (_logIndex !=null ?_logIndex.hashCode() :0);
147123
returnresult;
148124
}
149125

‎src/main/java/io/api/etherscan/model/Price.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ public boolean equals(Object o) {
4949
if (Double.compare(price.ethbtc,ethbtc) !=0)returnfalse;
5050
if (ethusd_timestamp !=null ? !ethusd_timestamp.equals(price.ethusd_timestamp) :price.ethusd_timestamp !=null)
5151
returnfalse;
52-
if (ethbtc_timestamp !=null ? !ethbtc_timestamp.equals(price.ethbtc_timestamp) :price.ethbtc_timestamp !=null)
53-
returnfalse;
54-
if (_ethusd_timestamp !=null ? !_ethusd_timestamp.equals(price._ethusd_timestamp) :price._ethusd_timestamp !=null)
55-
returnfalse;
56-
return_ethbtc_timestamp !=null ?_ethbtc_timestamp.equals(price._ethbtc_timestamp) :price._ethbtc_timestamp ==null;
52+
return (ethbtc_timestamp !=null ? !ethbtc_timestamp.equals(price.ethbtc_timestamp) :price.ethbtc_timestamp !=null);
5753
}
5854

5955
@Override
@@ -66,8 +62,6 @@ public int hashCode() {
6662
result =31 *result + (int) (temp ^ (temp >>>32));
6763
result =31 *result + (ethusd_timestamp !=null ?ethusd_timestamp.hashCode() :0);
6864
result =31 *result + (ethbtc_timestamp !=null ?ethbtc_timestamp.hashCode() :0);
69-
result =31 *result + (_ethusd_timestamp !=null ?_ethusd_timestamp.hashCode() :0);
70-
result =31 *result + (_ethbtc_timestamp !=null ?_ethbtc_timestamp.hashCode() :0);
7165
returnresult;
7266
}
7367

@@ -78,8 +72,6 @@ public String toString() {
7872
", ethbtc=" +ethbtc +
7973
", ethusd_timestamp='" +ethusd_timestamp +'\'' +
8074
", ethbtc_timestamp='" +ethbtc_timestamp +'\'' +
81-
", _ethusd_timestamp=" +_ethusd_timestamp +
82-
", _ethbtc_timestamp=" +_ethbtc_timestamp +
8375
'}';
8476
}
8577
}

‎src/main/java/io/api/etherscan/model/Tx.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,8 @@ public boolean equals(Object o) {
6565

6666
if (nonce !=tx.nonce)returnfalse;
6767
if (transactionIndex !=tx.transactionIndex)returnfalse;
68-
if (confirmations !=tx.confirmations)returnfalse;
6968
if (blockHash !=null ? !blockHash.equals(tx.blockHash) :tx.blockHash !=null)returnfalse;
70-
if (gasPrice !=null ? !gasPrice.equals(tx.gasPrice) :tx.gasPrice !=null)returnfalse;
71-
if (cumulativeGasUsed !=null ? !cumulativeGasUsed.equals(tx.cumulativeGasUsed) :tx.cumulativeGasUsed !=null)
72-
returnfalse;
73-
if (isError !=null ? !isError.equals(tx.isError) :tx.isError !=null)returnfalse;
74-
returntxreceipt_status !=null ?txreceipt_status.equals(tx.txreceipt_status) :tx.txreceipt_status ==null;
69+
returnisError !=null ?isError.equals(tx.isError) :tx.isError ==null;
7570
}
7671

7772
@Override
@@ -80,11 +75,7 @@ public int hashCode() {
8075
result =31 *result + (int) (nonce ^ (nonce >>>32));
8176
result =31 *result + (blockHash !=null ?blockHash.hashCode() :0);
8277
result =31 *result +transactionIndex;
83-
result =31 *result + (gasPrice !=null ?gasPrice.hashCode() :0);
84-
result =31 *result + (cumulativeGasUsed !=null ?cumulativeGasUsed.hashCode() :0);
85-
result =31 *result + (int) (confirmations ^ (confirmations >>>32));
8678
result =31 *result + (isError !=null ?isError.hashCode() :0);
87-
result =31 *result + (txreceipt_status !=null ?txreceipt_status.hashCode() :0);
8879
returnresult;
8980
}
9081

@@ -99,6 +90,6 @@ public String toString() {
9990
", confirmations=" +confirmations +
10091
", isError='" +isError +'\'' +
10192
", txreceipt_status='" +txreceipt_status +'\'' +
102-
'}';
93+
"} " +super.toString();
10394
}
10495
}

‎src/main/java/io/api/etherscan/model/TxInternal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ public String toString() {
6262
", traceId=" +traceId +
6363
", isError=" +isError +
6464
", errCode='" +errCode +'\'' +
65-
'}';
65+
"} " +super.toString();
6666
}
6767
}

‎src/main/java/io/api/etherscan/model/TxToken.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,6 @@ public String toString() {
102102
", gasPrice=" +gasPrice +
103103
", cumulativeGasUsed=" +cumulativeGasUsed +
104104
", confirmations=" +confirmations +
105-
'}';
105+
"} " +super.toString();
106106
}
107107
}

‎src/test/java/io/api/etherscan/block/BlockApiTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public void correct() {
2828
assertFalse(uncle.get().getUncles().isEmpty());
2929
assertNotNull(uncle.get().getUncles().get(0).getBlockreward());
3030
assertNotNull(uncle.get().getUncles().get(0).getMiner());
31+
assertNotEquals(-1,uncle.get().getUncles().get(0).getUnclePosition());
3132
assertNotNull(uncle.get().toString());
3233

3334
UncleBlockempty =newUncleBlock();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp