[bisq-network/bisq] split the pb.java file into multiple files (#3005)

Christoph Sturm notifications at github.com
Thu Jul 25 12:13:09 UTC 2019


the pb.java file was making idea crazy.

since we have many protobuf classes that have the same name as our own classes I changed the protobuf package to "protobuf" to have a short way to reference it via its whole package in case of a naming collision. 
You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/3005

-- Commit Summary --

  * split pb.java file into separate files.
  * move protobuf to proto package
  * remove step that is not needed anymore now

-- File Changes --

    M common/src/main/java/bisq/common/crypto/PubKeyRing.java (8)
    M common/src/main/java/bisq/common/crypto/SealedAndSigned.java (8)
    M common/src/main/java/bisq/common/proto/ProtoResolver.java (5)
    M common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java (8)
    M common/src/main/java/bisq/common/proto/network/NetworkProtoResolver.java (7)
    M common/src/main/java/bisq/common/proto/persistable/NavigationPath.java (7)
    M common/src/main/java/bisq/common/proto/persistable/PersistenceProtoResolver.java (3)
    M common/src/main/java/bisq/common/storage/FileManager.java (8)
    M common/src/main/proto/pb.proto (4)
    M core/src/main/java/bisq/core/alert/Alert.java (10)
    M core/src/main/java/bisq/core/alert/PrivateNotificationMessage.java (8)
    M core/src/main/java/bisq/core/alert/PrivateNotificationPayload.java (8)
    M core/src/main/java/bisq/core/arbitration/Arbitrator.java (10)
    M core/src/main/java/bisq/core/arbitration/Attachment.java (8)
    M core/src/main/java/bisq/core/arbitration/Dispute.java (8)
    M core/src/main/java/bisq/core/arbitration/DisputeList.java (6)
    M core/src/main/java/bisq/core/arbitration/DisputeResult.java (10)
    M core/src/main/java/bisq/core/arbitration/Mediator.java (10)
    M core/src/main/java/bisq/core/arbitration/messages/DisputeCommunicationMessage.java (10)
    M core/src/main/java/bisq/core/arbitration/messages/DisputeResultMessage.java (8)
    M core/src/main/java/bisq/core/arbitration/messages/OpenNewDisputeMessage.java (8)
    M core/src/main/java/bisq/core/arbitration/messages/PeerOpenedDisputeMessage.java (8)
    M core/src/main/java/bisq/core/arbitration/messages/PeerPublishedDisputePayoutTxMessage.java (8)
    M core/src/main/java/bisq/core/btc/model/AddressEntry.java (10)
    M core/src/main/java/bisq/core/btc/model/AddressEntryList.java (10)
    M core/src/main/java/bisq/core/btc/model/RawTransactionInput.java (8)
    M core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java (10)
    M core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteList.java (8)
    M core/src/main/java/bisq/core/dao/governance/blindvote/VoteWithProposalTxId.java (12)
    M core/src/main/java/bisq/core/dao/governance/blindvote/VoteWithProposalTxIdList.java (12)
    M core/src/main/java/bisq/core/dao/governance/blindvote/network/messages/RepublishGovernanceDataRequest.java (8)
    M core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVotePayload.java (16)
    M core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVoteStore.java (12)
    M core/src/main/java/bisq/core/dao/governance/bond/reputation/MyReputation.java (8)
    M core/src/main/java/bisq/core/dao/governance/bond/reputation/MyReputationList.java (12)
    M core/src/main/java/bisq/core/dao/governance/myvote/MyVote.java (8)
    M core/src/main/java/bisq/core/dao/governance/myvote/MyVoteList.java (8)
    M core/src/main/java/bisq/core/dao/governance/param/Param.java (4)
    M core/src/main/java/bisq/core/dao/governance/proofofburn/MyProofOfBurn.java (8)
    M core/src/main/java/bisq/core/dao/governance/proofofburn/MyProofOfBurnList.java (12)
    M core/src/main/java/bisq/core/dao/governance/proposal/MyProposalList.java (12)
    M core/src/main/java/bisq/core/dao/governance/proposal/storage/appendonly/ProposalPayload.java (14)
    M core/src/main/java/bisq/core/dao/governance/proposal/storage/appendonly/ProposalStore.java (12)
    M core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java (12)
    M core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalStore.java (12)
    M core/src/main/java/bisq/core/dao/monitoring/model/BlindVoteStateHash.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/model/DaoStateHash.java (7)
    M core/src/main/java/bisq/core/dao/monitoring/model/ProposalStateHash.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/GetBlindVoteStateHashesRequest.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/GetBlindVoteStateHashesResponse.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/GetDaoStateHashesRequest.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/GetDaoStateHashesResponse.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/GetProposalStateHashesRequest.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/GetProposalStateHashesResponse.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/NewBlindVoteStateHashMessage.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/NewDaoStateHashMessage.java (8)
    M core/src/main/java/bisq/core/dao/monitoring/network/messages/NewProposalStateHashMessage.java (8)
    M core/src/main/java/bisq/core/dao/node/full/RawBlock.java (10)
    M core/src/main/java/bisq/core/dao/node/full/RawTx.java (10)
    M core/src/main/java/bisq/core/dao/node/full/RawTxOutput.java (8)
    M core/src/main/java/bisq/core/dao/node/messages/GetBlocksRequest.java (10)
    M core/src/main/java/bisq/core/dao/node/messages/GetBlocksResponse.java (8)
    M core/src/main/java/bisq/core/dao/node/messages/NewBlockBroadcastMessage.java (8)
    M core/src/main/java/bisq/core/dao/state/DaoStateStore.java (8)
    M core/src/main/java/bisq/core/dao/state/model/DaoState.java (10)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/BaseBlock.java (6)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/BaseTx.java (6)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/BaseTxOutput.java (6)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/Block.java (10)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/PubKeyScript.java (8)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/ScriptType.java (8)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/SpentInfo.java (8)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/Tx.java (10)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/TxInput.java (8)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/TxOutput.java (10)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/TxOutputType.java (8)
    M core/src/main/java/bisq/core/dao/state/model/blockchain/TxType.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/Ballot.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/BallotList.java (12)
    M core/src/main/java/bisq/core/dao/state/model/governance/ChangeParamProposal.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/ConfiscateBondProposal.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/Cycle.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/DaoPhase.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/DecryptedBallotsWithMerits.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/EvaluatedProposal.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/GenericProposal.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/Issuance.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/Merit.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/MeritList.java (12)
    M core/src/main/java/bisq/core/dao/state/model/governance/ParamChange.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/Proposal.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/ProposalVoteResult.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/RemoveAssetProposal.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/Role.java (8)
    M core/src/main/java/bisq/core/dao/state/model/governance/RoleProposal.java (10)
    M core/src/main/java/bisq/core/dao/state/model/governance/Vote.java (6)
    M core/src/main/java/bisq/core/dao/state/unconfirmed/UnconfirmedBsqChangeOutputList.java (8)
    M core/src/main/java/bisq/core/dao/state/unconfirmed/UnconfirmedTxOutput.java (8)
    M core/src/main/java/bisq/core/filter/Filter.java (12)
    M core/src/main/java/bisq/core/filter/FilterManager.java (4)
    M core/src/main/java/bisq/core/filter/PaymentAccountFilter.java (8)
    M core/src/main/java/bisq/core/locale/Country.java (8)
    M core/src/main/java/bisq/core/locale/CryptoCurrency.java (5)
    M core/src/main/java/bisq/core/locale/FiatCurrency.java (7)
    M core/src/main/java/bisq/core/locale/Region.java (6)
    M core/src/main/java/bisq/core/locale/TradeCurrency.java (8)
    M core/src/main/java/bisq/core/notifications/alerts/market/MarketAlertFilter.java (8)
    M core/src/main/java/bisq/core/notifications/alerts/price/PriceAlertFilter.java (8)
    M core/src/main/java/bisq/core/offer/Offer.java (8)
    M core/src/main/java/bisq/core/offer/OfferPayload.java (16)
    M core/src/main/java/bisq/core/offer/OpenOffer.java (12)
    M core/src/main/java/bisq/core/offer/messages/OfferAvailabilityRequest.java (8)
    M core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java (10)
    M core/src/main/java/bisq/core/payment/AccountAgeWitness.java (12)
    M core/src/main/java/bisq/core/payment/AccountAgeWitnessStore.java (12)
    M core/src/main/java/bisq/core/payment/PaymentAccount.java (14)
    M core/src/main/java/bisq/core/payment/PaymentAccountList.java (8)
    M core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java (10)
    M core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java (14)
    M core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/CountryBasedPaymentAccountPayload.java (5)
    M core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java (5)
    M core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java (12)
    M core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java (5)
    M core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java (10)
    M core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java (14)
    M core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/PaymentMethod.java (8)
    M core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java (14)
    M core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java (14)
    M core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java (14)
    M core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java (16)
    M core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java (6)
    M core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java (14)
    M core/src/main/java/bisq/core/proto/CoreProtoResolver.java (12)
    M core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java (10)
    M core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java (4)
    M core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java (14)
    M core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java (14)
    M core/src/main/java/bisq/core/trade/Contract.java (12)
    M core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java (14)
    M core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java (14)
    M core/src/main/java/bisq/core/trade/TradableList.java (8)
    M core/src/main/java/bisq/core/trade/Trade.java (36)
    M core/src/main/java/bisq/core/trade/messages/CounterCurrencyTransferStartedMessage.java (8)
    M core/src/main/java/bisq/core/trade/messages/DepositTxPublishedMessage.java (8)
    M core/src/main/java/bisq/core/trade/messages/PayDepositRequest.java (10)
    M core/src/main/java/bisq/core/trade/messages/PayoutTxPublishedMessage.java (8)
    M core/src/main/java/bisq/core/trade/messages/PublishDepositTxRequest.java (10)
    M core/src/main/java/bisq/core/trade/protocol/ProcessModel.java (10)
    M core/src/main/java/bisq/core/trade/protocol/TradingPeer.java (8)
    M core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java (12)
    M core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java (12)
    M core/src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java (12)
    M core/src/main/java/bisq/core/user/BlockChainExplorer.java (6)
    M core/src/main/java/bisq/core/user/PreferencesPayload.java (24)
    M core/src/main/java/bisq/core/user/UserPayload.java (14)
    M core/src/test/java/bisq/core/message/MarshallerTest.java (15)
    M core/src/test/java/bisq/core/trade/TradableListTest.java (8)
    M core/src/test/java/bisq/core/util/ProtoUtilTest.java (11)
    M docs/idea-import.md (1)
    M p2p/src/main/java/bisq/network/crypto/EncryptionService.java (4)
    M p2p/src/main/java/bisq/network/p2p/AckMessage.java (12)
    M p2p/src/main/java/bisq/network/p2p/BundleOfEnvelopes.java (8)
    M p2p/src/main/java/bisq/network/p2p/CloseConnectionMessage.java (8)
    M p2p/src/main/java/bisq/network/p2p/NodeAddress.java (8)
    M p2p/src/main/java/bisq/network/p2p/PrefixedSealedAndSignedMessage.java (10)
    M p2p/src/main/java/bisq/network/p2p/network/Connection.java (6)
    M p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java (4)
    M p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java (16)
    M p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java (8)
    M p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java (8)
    M p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Ping.java (8)
    M p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Pong.java (8)
    M p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java (8)
    M p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerList.java (8)
    M p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java (8)
    M p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java (8)
    M p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java (18)
    M p2p/src/main/java/bisq/network/p2p/storage/messages/AddDataMessage.java (14)
    M p2p/src/main/java/bisq/network/p2p/storage/messages/AddPersistableNetworkPayloadMessage.java (8)
    M p2p/src/main/java/bisq/network/p2p/storage/messages/RefreshOfferMessage.java (8)
    M p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveDataMessage.java (10)
    M p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveMailboxDataMessage.java (8)
    M p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java (10)
    M p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableNetworkPayload.java (5)
    M p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableProtectedPayload.java (3)
    M p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java (10)
    M p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStorageEntry.java (12)
    M p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStoragePayload.java (4)
    M p2p/src/main/java/bisq/network/p2p/storage/persistence/PersistableNetworkPayloadList.java (10)
    M p2p/src/main/java/bisq/network/p2p/storage/persistence/SequenceNumberMap.java (12)
    M p2p/src/test/java/bisq/network/crypto/EncryptionServiceTests.java (6)
    M p2p/src/test/java/bisq/network/p2p/TestUtils.java (18)
    M p2p/src/test/java/bisq/network/p2p/mocks/MockMailboxPayload.java (4)
    M p2p/src/test/java/bisq/network/p2p/mocks/MockPayload.java (4)
    M p2p/src/test/java/bisq/network/p2p/storage/messages/AddDataMessageTest.java (4)
    M p2p/src/test/java/bisq/network/p2p/storage/mocks/MockData.java (4)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/3005.patch
https://github.com/bisq-network/bisq/pull/3005.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/3005
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20190725/e3051c86/attachment-0001.html>


More information about the bisq-github mailing list