Skip to content

Commit 3a0d13a

Browse files
jcaijcai
committed
优化包结构
1 parent ce96d8e commit 3a0d13a

28 files changed

+106
-97
lines changed

‎xcoin-blockchain/src/main/proto/xcoin/CryptoData.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
syntax = "proto3";
22
package crypto;
33

4-
option java_package = "xcoin.blockchain.proto";
4+
option java_package = "xcoin.blockchain.crypto.proto";
55

66

77
message CryptoData {

‎xcoin-blockchain/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
xcoin.blockchain.TronNodeClientAutoConfiguration
1+
xcoin.blockchain.tron.TronNodeClientAutoConfiguration

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/services/PrivateKeyTool.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/crypto/services/PrivateKeyTool.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package xcoin.blockchain.services
1+
package xcoin.blockchain.crypto.services
22

33
import com.google.protobuf.ByteString
44
import org.bouncycastle.util.encoders.Hex
55
import org.springframework.util.StreamUtils
66
import org.tron.trident.core.key.KeyPair
7-
import xcoin.blockchain.proto.CryptoDataOuterClass.CryptoData
7+
import xcoin.blockchain.crypto.proto.CryptoDataOuterClass.CryptoData
88

99
import java.io.{ByteArrayInputStream, InputStream}
1010
import javax.crypto.spec.{IvParameterSpec, SecretKeySpec}

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/TronNodeClientAutoConfiguration.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/tron/TronNodeClientAutoConfiguration.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xcoin.blockchain
1+
package xcoin.blockchain.tron
22

33
import org.springframework.boot.autoconfigure.AutoConfiguration
44
import org.springframework.boot.autoconfigure.condition.{ConditionalOnClass, ConditionalOnMissingBean}
@@ -8,10 +8,10 @@ import org.springframework.context.annotation.{Bean, Configuration, Import, Lazy
88
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
99
import org.tron.trident.api.ReactorWalletGrpc.ReactorWalletStub
1010
import org.tron.trident.api.ReactorWalletSolidityGrpc.ReactorWalletSolidityStub
11-
import xcoin.blockchain.internal.tron.TronNodeClient
12-
import xcoin.blockchain.internal.tron.TronNodeClient.DefaultTronNodeClientBuilder
13-
import xcoin.blockchain.services.TronApi.{TronNodeClientBuilder, TronNodeClientCustomizer}
14-
import xcoin.blockchain.services.TronApi
11+
import xcoin.blockchain.tron.internal.TronNodeClient
12+
import xcoin.blockchain.tron.internal.TronNodeClient.DefaultTronNodeClientBuilder
13+
import xcoin.blockchain.tron.services.TronApi.{TronNodeClientBuilder, TronNodeClientCustomizer}
14+
import xcoin.blockchain.tron.services.TronApi
1515

1616
import java.util
1717
import java.util.List

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/internal/tron/TNCAccountSupport.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/tron/internal/DefaultAccountSupport.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xcoin.blockchain.internal.tron
1+
package xcoin.blockchain.tron.internal
22

33
import org.bouncycastle.util.encoders.Hex
44
import org.tron.trident.api.GrpcAPI.AccountAddressMessage
@@ -10,12 +10,13 @@ import org.tron.trident.proto.Common.AccountType
1010
import org.tron.trident.proto.Contract.TransferContract
1111
import org.tron.trident.utils.Base58Check
1212
import reactor.core.publisher.Mono
13-
import xcoin.blockchain.services.TronPermissionHelper.TronPermission
14-
import xcoin.blockchain.services.TronApi.{AccountSupport, TronPermission, TronPermissionKey, TronPermissionType}
15-
import xcoin.blockchain.services.TronModel.TronAccount
13+
import xcoin.blockchain.tron.services.TronPermissionHelper.TronPermission
14+
import xcoin.blockchain.tron.services.TronApi.{AccountSupport, TronPermission, TronPermissionKey, TronPermissionType}
15+
import xcoin.blockchain.tron.services.TronModel.TronAccount
16+
import xcoin.blockchain.tron.services.TronModel.TronAccount
1617
import xcoin.core.services.XCoinException.XInvalidParameterException
1718

18-
trait TNCAccountSupport extends AccountSupport{
19+
trait DefaultAccountSupport extends AccountSupport{
1920
self:TronNodeClient =>
2021
override def accountBalanceOfUSDT(owner:String):Mono[Long]={
2122
usdtBalanceOf(owner)

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/internal/tron/TNCBlockSupport.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/tron/internal/DefaultBlockSupport.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xcoin.blockchain.internal.tron
1+
package xcoin.blockchain.tron.internal
22

33
import com.typesafe.scalalogging.Logger
44
import org.bouncycastle.util.encoders.Hex
@@ -11,10 +11,10 @@ import org.tron.trident.proto.Contract._
1111
import org.tron.trident.proto.{Chain, Common, Contract, Response}
1212
import org.tron.trident.utils.Base58Check.bytesToBase58
1313
import reactor.core.publisher.{Flux, Mono}
14-
import xcoin.blockchain.internal.tron.USDTSupport._
15-
import xcoin.blockchain.services.TronApi.{BlockSupport, TronNodeClientNetwork}
16-
import xcoin.blockchain.services.TronBridge.CoinType
17-
import xcoin.blockchain.services.TronModel._
14+
import USDTSupport._
15+
import xcoin.blockchain.tron.services.TronApi.{BlockSupport, TronNodeClientNetwork}
16+
import xcoin.blockchain.tron.services.TronBridge.CoinType
17+
import xcoin.blockchain.tron.services.TronModel._
1818
import xcoin.core.services.XCoinException.{XInvalidReturnException, XInvalidStateException}
1919

2020
import java.time.Duration

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/internal/tron/TNCContractSupport.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/tron/internal/DefaultContractSupport.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xcoin.blockchain.internal.tron
1+
package xcoin.blockchain.tron.internal
22

33
import com.google.protobuf.{ByteString, Message}
44
import org.bouncycastle.util.encoders.Hex
@@ -12,11 +12,11 @@ import org.tron.trident.proto.Chain.Transaction.Contract.ContractType
1212
import org.tron.trident.proto.Contract.TriggerSmartContract
1313
import org.tron.trident.proto.{Chain, Response}
1414
import reactor.core.publisher.Mono
15-
import xcoin.blockchain.services.TronApi.{ContractSupport, SimpleTronPermission, TransactionSigned}
15+
import xcoin.blockchain.tron.services.TronApi.{ContractSupport, SimpleTronPermission, TransactionSigned}
1616
import xcoin.core.services.XCoinException
1717
import xcoin.core.services.XCoinException.XInvalidReturnException
1818

19-
trait TNCContractSupport extends ContractSupport {
19+
trait DefaultContractSupport extends ContractSupport {
2020
self: TronNodeClient =>
2121
override def contractTriggerConstant(owner: String, contractAddress: String, function: datatypes.Function, valueOpt: Option[Long]): Mono[Response.TransactionExtention] = {
2222
val rawFrom = parseAddress(owner)

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/internal/tron/TNCResourceSupport.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/tron/internal/DefaultResourceSupport.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package xcoin.blockchain.internal.tron
1+
package xcoin.blockchain.tron.internal
22

33
import org.tron.trident.api.GrpcAPI.AccountAddressMessage
44
import org.tron.trident.core.ApiWrapper.parseAddress
55
import org.tron.trident.proto.Chain.Transaction
66
import org.tron.trident.proto.Chain.Transaction.Contract.ContractType
77
import org.tron.trident.proto.Contract.{DelegateResourceContract, UnDelegateResourceContract}
88
import reactor.core.publisher.Mono
9-
import xcoin.blockchain.services.TronApi.{ResourceRate, ResourceSupport}
10-
import xcoin.blockchain.services.TronBridge.ResourceType
11-
import xcoin.blockchain.services.TronModel.ResourceTypWrapper
9+
import xcoin.blockchain.tron.services.TronApi.{ResourceRate, ResourceSupport}
10+
import xcoin.blockchain.tron.services.TronBridge.ResourceType
11+
import xcoin.blockchain.tron.services.TronModel.ResourceTypWrapper
1212

1313
import java.time.Duration
1414

15-
trait TNCResourceSupport extends ResourceSupport {
15+
trait DefaultResourceSupport extends ResourceSupport {
1616
self: TronNodeClient =>
1717
private val DEFAULT_DETECTOR_ADDRESS = "TUfAMQM81RLMdquBSaFytsXxEet7AKKKKK"
1818

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/internal/tron/TNCTransactionSupport.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/tron/internal/DefaultTransactionSupport.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package xcoin.blockchain.internal.tron
1+
package xcoin.blockchain.tron.internal
22

33
import org.bouncycastle.util.encoders.Hex
44
import org.springframework.util.{Assert, StringUtils}
55
import org.tron.trident.api.GrpcAPI.BytesMessage
66
import org.tron.trident.core.ApiWrapper.{parseAddress, parseHex}
77
import org.tron.trident.proto.Response.TransactionInfo
88
import reactor.core.publisher.Mono
9-
import xcoin.blockchain.services.TronApi.TransactionSupport
9+
import xcoin.blockchain.tron.services.TronApi.TransactionSupport
1010
import xcoin.core.services.XCoinException
1111
import xcoin.core.services.XCoinException.{XFailRequestException, XResourceNotFoundException}
1212

1313
import scala.util.{Failure, Success}
1414

15-
trait TNCTransactionSupport extends TransactionSupport {
15+
trait DefaultTransactionSupport extends TransactionSupport {
1616
self:TronNodeClient=>
1717
override def transactionByHash(txnId: String): Mono[TransactionInfoPayload] = {
1818
val bsTxid = parseAddress(txnId)

‎xcoin-blockchain/src/main/scala/xcoin/blockchain/internal/tron/TNCUSDTSupport.scala renamed to ‎xcoin-blockchain/src/main/scala/xcoin/blockchain/tron/internal/DefaultUSDTSupport.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package xcoin.blockchain.internal.tron
1+
package xcoin.blockchain.tron.internal
22

33
import org.bouncycastle.util.encoders.Hex
44
import org.tron.trident.abi.{FunctionReturnDecoder, TypeReference}
55
import org.tron.trident.abi.datatypes.Address
66
import org.tron.trident.abi.datatypes.generated.Uint256
77
import reactor.core.publisher.Mono
8-
import xcoin.blockchain.internal.tron.USDTSupport.{MAIN_USDT_CONTRACT_ADDRESS, NILE_USDT_CONTRACT_ADDRESS, SHASTA_USDT_CONTRACT_ADDRESS}
9-
import xcoin.blockchain.services.TronApi.{TronNodeClientNetwork, USDTSupport}
8+
import USDTSupport.{MAIN_USDT_CONTRACT_ADDRESS, NILE_USDT_CONTRACT_ADDRESS, SHASTA_USDT_CONTRACT_ADDRESS}
9+
import xcoin.blockchain.tron.services.TronApi.{TronNodeClientNetwork, USDTSupport}
1010

1111
import java.math.BigInteger
1212

0 commit comments

Comments
 (0)