Skip to content
This repository was archived by the owner on Apr 13, 2022. It is now read-only.

Isolate dependency on scorex.crypto to a single file #261

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Isolate dependency on scorex.crypto to a single file #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f9da5c
Isolate dependency on crypto to a single file
ceilican Jun 17, 2018
9353436
Merge branch 'master' into isolate-crypto
kushti Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/src/main/scala/examples/commons/PublicKey25519NoncedBox.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import io.circe.syntax._
import scorex.core.serialization.Serializer
import scorex.core.transaction.account.PublicKeyNoncedBox
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.utils.{ScorexEncoding, ScorexLogging}
import scorex.crypto.encode.Base16
import scorex.crypto.hash.Blake2b256
import scorex.crypto.signatures.{Curve25519, PublicKey}
import scorex.core.utils.ScorexEncoding
import scorex.core.crypto.encode.Base16
import scorex.core.crypto.hash.Blake2b256
import scorex.core.crypto.signatures.{Curve25519, PublicKey}

import scala.util.Try

Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/commons/SimpleBoxTransaction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.proof.{Proof, Signature25519}
import scorex.core.transaction.state.{PrivateKey25519, PrivateKey25519Companion}
import scorex.core.utils.ScorexEncoding
import scorex.crypto.hash.Blake2b256
import scorex.crypto.signatures.{Curve25519, PublicKey, Signature}
import scorex.core.crypto.hash.Blake2b256
import scorex.core.crypto.signatures.{Curve25519, PublicKey, Signature}

import scala.util.Try

Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/hybrid/HybridNodeViewHolder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.PrivateKey25519Companion
import scorex.core.utils.{NetworkTimeProvider, ScorexEncoding, ScorexLogging}
import scorex.core.{ModifierTypeId, NodeViewHolder, NodeViewModifier}
import scorex.crypto.encode.Base58
import scorex.crypto.signatures.PublicKey
import scorex.core.crypto.encode.Base58
import scorex.core.crypto.signatures.PublicKey


class HybridNodeViewHolder(settings: ScorexSettings,
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/hybrid/api/http/WalletApiRoute.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import scorex.core.api.http.{ApiError, ApiResponse, ApiRouteWithFullView}
import scorex.core.settings.RESTApiSettings
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.utils.ScorexEncoding
import scorex.crypto.signatures.PublicKey
import scorex.core.crypto.signatures.PublicKey

import scala.util.{Failure, Success, Try}

Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/hybrid/blocks/PosBlock.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import scorex.core.transaction.proof.Signature25519
import scorex.core.transaction.state.PrivateKey25519
import scorex.core.utils.{ScorexEncoding, ScorexLogging}
import scorex.core.{ModifierId, ModifierTypeId, TransactionsCarryingPersistentNodeViewModifier}
import scorex.crypto.hash.Blake2b256
import scorex.crypto.signatures.{Curve25519, Signature}
import scorex.core.crypto.hash.Blake2b256
import scorex.core.crypto.signatures.{Curve25519, Signature}

import scala.util.Try

Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/hybrid/blocks/PowBlock.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import scorex.core.serialization.Serializer
import scorex.core.transaction.box.proposition.{PublicKey25519Proposition, PublicKey25519PropositionSerializer}
import scorex.core.utils.ScorexEncoding
import scorex.core.{ModifierId, _}
import scorex.crypto.hash.Blake2b256
import scorex.crypto.signatures.{Curve25519, PublicKey}
import scorex.core.crypto.hash.Blake2b256
import scorex.core.crypto.signatures.{Curve25519, PublicKey}

import scala.util.Try

Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/hybrid/history/HistoryStorage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import scorex.core.ModifierId
import scorex.core.consensus.ModifierSemanticValidity
import scorex.core.consensus.ModifierSemanticValidity.{Absent, Unknown}
import scorex.core.utils.ScorexLogging
import scorex.crypto.hash.Sha256
import scorex.core.crypto.hash.Sha256

import scala.util.{Failure, Random, Try}

Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/hybrid/history/HybridHistory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.utils.{NetworkTimeProvider, ScorexEncoding, ScorexLogging}
import scorex.core.validation.RecoverableModifierError
import scorex.core.{ModifierId, ModifierTypeId, NodeViewModifier}
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256

import scala.annotation.tailrec
import scala.util.{Failure, Success, Try}
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/hybrid/mining/PosForger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import examples.hybrid.wallet.HBoxWallet
import scorex.core.NodeViewHolder.CurrentView
import scorex.core.transaction.state.PrivateKey25519
import scorex.core.utils.ScorexLogging
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256
import scorex.utils.Random


Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/hybrid/mining/PowMiner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import scorex.core.NodeViewHolder.CurrentView
import scorex.core.block.Block.BlockId
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.utils.{ScorexEncoding, ScorexLogging}
import scorex.crypto.encode.Base58
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.encode.Base58
import scorex.core.crypto.hash.Blake2b256

import scala.concurrent._
import scala.concurrent.duration._
Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/hybrid/simulations/PrivateChain.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import examples.hybrid.wallet.HBoxWallet
import scorex.core.block.Block.BlockId
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.utils.{NetworkTimeProvider, ScorexEncoding, ScorexLogging}
import scorex.crypto.encode.Base58
import scorex.crypto.signatures.PublicKey
import scorex.core.crypto.encode.Base58
import scorex.core.crypto.signatures.PublicKey

import scala.annotation.tailrec
import scala.concurrent.ExecutionContext.Implicits.global
Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/hybrid/state/HBoxStoredState.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import scorex.core.settings.ScorexSettings
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.{BoxStateChangeOperation, BoxStateChanges, Insertion, Removal}
import scorex.core.utils.{ScorexEncoding, ScorexLogging}
import scorex.crypto.authds._
import scorex.crypto.encode.Base58
import scorex.core.crypto.authds._
import scorex.core.crypto.encode.Base58
import scorex.mid.state.BoxMinimalState

import scala.util.{Failure, Success, Try}
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/hybrid/validation/SemanticBlockValidator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package examples.hybrid.validation

import examples.hybrid.blocks.{HybridBlock, PosBlock, PowBlock}
import scorex.core.block.BlockValidator
import scorex.crypto.hash.{CryptographicHash, Digest}
import scorex.core.crypto.hash.{CryptographicHash, Digest}

import scala.util.Try

Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/hybrid/wallet/HBoxWallet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.{PrivateKey25519, PrivateKey25519Companion, PrivateKey25519Serializer}
import scorex.core.transaction.wallet.{BoxWallet, BoxWalletTransaction, WalletBox, WalletBoxSerializer}
import scorex.core.utils.{ByteStr, ScorexEncoding, ScorexLogging}
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256

import scala.util.Try

Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/spv/Constants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package examples.spv

import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256

object Constants {
val hashfn: Blake2b256.type = Blake2b256
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/spv/simulation/SPVSimulator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package examples.spv.simulation
import examples.spv.{Header, KMZProofSerializer, SpvAlgos}
import scorex.core.transaction.state.PrivateKey25519Companion
import scorex.core.utils.ScorexLogging
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256

object SPVSimulator extends App with ScorexLogging with SimulatorFuctions {

Expand Down
10 changes: 5 additions & 5 deletions examples/src/main/scala/examples/trimchain/core/Algos.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import io.iohk.iodb.LSMStore
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.{BoxStateChanges, Insertion}
import scorex.core.{ModifierId, VersionTag}
import scorex.crypto.authds.avltree.batch.{BatchAVLVerifier, Lookup}
import scorex.crypto.authds.{ADDigest, ADKey}
import scorex.crypto.hash.{Blake2b256, Digest32}
import scorex.crypto.signatures.{Curve25519, PublicKey}
import scorex.core.crypto.authds.avltree.batch.{BatchAVLVerifier, Lookup}
import scorex.core.crypto.authds.{ADDigest, ADKey}
import scorex.core.crypto.hash.{Blake2b256, Digest32}
import scorex.core.crypto.signatures.{Curve25519, PublicKey}

import scala.util.{Failure, Random, Success, Try}

Expand Down Expand Up @@ -90,7 +90,7 @@ object Algos extends App {
val ids = (0 until NElementsInProof) map (elementIndex => hashfn(seed ++ minerKey ++
Ints.toByteArray(stateIndex) ++ Ints.toByteArray(elementIndex)))

val v = new BatchAVLVerifier[Digest32, Blake2b256.type](ADDigest @@ sroot, pp, keyLength = BoxKeyLength,
val v = new BatchAVLVerifier[Digest32, scorex.crypto.hash.Blake2b256.type](ADDigest @@ sroot, pp, keyLength = BoxKeyLength,
valueLengthOpt = Some(BoxLength))

ids.foreach(id => v.performOneOperation(Lookup(ADKey @@ id)).get)
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/examples/trimchain/core/Constants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package examples.trimchain.core

import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256


object Constants {
Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/trimchain/core/Ticket.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.circe.Encoder
import io.circe.syntax._
import scorex.core.serialization.Serializer
import scorex.core.utils.ScorexEncoding
import scorex.crypto.authds.SerializedAdProof
import scorex.crypto.signatures.Curve25519
import scorex.core.crypto.authds.SerializedAdProof
import scorex.core.crypto.signatures.Curve25519

import scala.annotation.tailrec
import scala.util.Try
Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/scala/examples/trimchain/simulation/InMemoryAuthenticatedUtxo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import scorex.core.VersionTag
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.{BoxStateChanges, Insertion, Removal}
import scorex.core.utils.ScorexLogging
import scorex.crypto.authds.avltree.batch.{Insert, Remove}
import scorex.crypto.authds.{ADKey, ADValue}
import scorex.core.crypto.authds.avltree.batch.{Insert, Remove}
import scorex.core.crypto.authds.{ADKey, ADValue}
import scorex.mid.state.BoxMinimalState

import scala.util.Try
Expand Down
10 changes: 5 additions & 5 deletions examples/src/main/scala/examples/trimchain/utxo/PersistentAuthenticatedUtxo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import scorex.core.settings.ScorexSettings
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.{BoxStateChangeOperation, BoxStateChanges, Insertion, Removal}
import scorex.core.utils.{ScorexEncoding, ScorexLogging}
import scorex.crypto.authds.avltree.batch.{BatchAVLProver, Insert, Lookup, Remove}
import scorex.crypto.authds.{ADKey, ADValue, SerializedAdProof}
import scorex.crypto.encode.Base58
import scorex.crypto.hash.{Blake2b256, Digest32}
import scorex.core.crypto.authds.avltree.batch.{BatchAVLProver, Insert, Lookup, Remove}
import scorex.core.crypto.authds.{ADKey, ADValue, SerializedAdProof}
import scorex.core.crypto.encode.Base58
import scorex.core.crypto.hash.{Blake2b256, Digest32}
import scorex.mid.state.BoxMinimalState

import scala.util.{Random, Success, Try}
Expand Down Expand Up @@ -162,7 +162,7 @@ case class PersistentAuthenticatedUtxo(store: LSMStore,

object PersistentAuthenticatedUtxo {

type ProverType = BatchAVLProver[Digest32, Blake2b256.type]
type ProverType = BatchAVLProver[Digest32, scorex.crypto.hash.Blake2b256.type]

def semanticValidity(tx: SimpleBoxTransaction): Try[Unit] = Try {
require(tx.from.size == tx.signatures.size)
Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/scala/hybrid/HistoryGenerators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import examples.hybrid.mining.HybridSettings
import org.scalacheck.Gen
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.utils.NetworkTimeProvider
import scorex.crypto.signatures.PublicKey
import scorex.core.crypto.signatures.PublicKey

import scala.concurrent.ExecutionContext.Implicits.global

Expand Down
4 changes: 2 additions & 2 deletions examples/src/test/scala/hybrid/HybridGenerators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import scorex.core.transaction.proof.Signature25519
import scorex.core.transaction.state._
import scorex.core.transaction.wallet.WalletBox
import scorex.core.{ModifierId, NodeViewModifier}
import scorex.crypto.hash.Blake2b256
import scorex.crypto.signatures.Signature
import scorex.core.crypto.hash.Blake2b256
import scorex.core.crypto.signatures.Signature
import scorex.testkit.utils.{FileUtils, NoShrink}

import scala.collection.concurrent.TrieMap
Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/scala/hybrid/ModifierGenerators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.scalacheck.Gen
import scorex.core.ModifierId
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.PrivateKey25519
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256
import scorex.testkit.generators.{CoreGenerators, ModifierProducerTemplateItem, SynInvalid, Valid}

import scala.collection.mutable
Expand Down
6 changes: 3 additions & 3 deletions examples/src/test/scala/hybrid/state/SimpleBoxTransactionSpecification.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import org.scalatest.{Matchers, PropSpec}
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.proof.Signature25519
import scorex.core.transaction.state.PrivateKey25519Companion
import scorex.crypto.encode.Base58
import scorex.crypto.hash.Sha256
import scorex.crypto.signatures.{PublicKey, Signature}
import scorex.core.crypto.encode.Base58
import scorex.core.crypto.hash.Sha256
import scorex.core.crypto.signatures.{PublicKey, Signature}

@SuppressWarnings(Array("org.wartremover.warts.TraversableOps"))
class SimpleBoxTransactionSpecification extends PropSpec
Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/scala/hybrid/validation/SemanticBlockValidatorSpecification.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import examples.hybrid.validation.SemanticBlockValidator
import hybrid.HybridGenerators
import org.scalatest.prop.{GeneratorDrivenPropertyChecks, PropertyChecks}
import org.scalatest.{Matchers, PropSpec}
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256


class SemanticBlockValidatorSpecification extends PropSpec
Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/scala/hybrid/wallet/HWalletSpecification.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.proof.Signature25519
import scorex.core.transaction.state.PrivateKey25519
import scorex.core.utils.ByteStr
import scorex.crypto.signatures.Signature
import scorex.core.crypto.signatures.Signature

import scala.annotation.tailrec
import scala.util.Random
Expand Down
4 changes: 2 additions & 2 deletions examples/src/test/scala/spv/ChainTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import org.scalatest.prop.{GeneratorDrivenPropertyChecks, PropertyChecks}
import org.scalatest.{Matchers, PropSpec}
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.{PrivateKey25519, PrivateKey25519Companion}
import scorex.crypto.hash
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash
import scorex.core.crypto.hash.Blake2b256

import scala.util.{Failure, Try}

Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/scala/trimchain/TrimchainGenerators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import examples.trimchain.core._
import examples.trimchain.modifiers.{BlockHeader, TBlock}
import org.scalacheck.{Arbitrary, Gen}
import scorex.core.ModifierId
import scorex.crypto.authds.SerializedAdProof
import scorex.core.crypto.authds.SerializedAdProof

trait TrimchainGenerators extends ExamplesCommonGenerators {

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scorex/ObjectGenerators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import scorex.core.network.message.BasicMsgDataTypes._
import scorex.core.transaction.box.proposition.PublicKey25519Proposition
import scorex.core.transaction.state.{PrivateKey25519, PrivateKey25519Companion}
import scorex.core.{ModifierId, ModifierTypeId, NodeViewModifier}
import scorex.crypto.signatures.Curve25519
import scorex.core.crypto.signatures.Curve25519

trait ObjectGenerators {

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scorex/core/api/http/ApiDirectives.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package scorex.core.api.http
import akka.http.scaladsl.model.headers.RawHeader
import akka.http.scaladsl.server.{AuthorizationFailedRejection, Directive0, Directives}
import scorex.core.settings.RESTApiSettings
import scorex.crypto.hash.{Blake2b256, Digest}
import scorex.core.crypto.hash.{Blake2b256, Digest}

trait ApiDirectives extends Directives {
val settings: RESTApiSettings
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scorex/core/api/http/UtilsApiRoute.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import akka.http.scaladsl.server.Route
import io.circe.Json
import scorex.core.settings.RESTApiSettings
import scorex.core.utils.ScorexEncoding
import scorex.crypto.hash.Blake2b256
import scorex.core.crypto.hash.Blake2b256


case class UtilsApiRoute(override val settings: RESTApiSettings)(implicit val context: ActorRefFactory)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scorex/core/consensus/History.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package scorex.core.consensus

import scorex.core._
import scorex.core.consensus.History.ProgressInfo
import scorex.crypto.encode.BytesEncoder
import scorex.core.crypto.encode.BytesEncoder

import scala.util.Try

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scorex/core/core.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package scorex

import scorex.core.network.message.BasicMsgDataTypes.InvData
import scorex.crypto.encode.BytesEncoder
import scorex.core.crypto.encode.BytesEncoder
import supertagged.TaggedType

package object core {
Expand Down
Loading