-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2111 from ergoplatform/v5.0.21
Candidate for 5.0.21 release
- Loading branch information
Showing
230 changed files
with
34,389 additions
and
3,130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,6 +57,49 @@ jobs: | |
| SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} | ||
| SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} | ||
|
|
||
| test_core: | ||
| name: Run ergo-core tests and publish a ergo-core snapshot | ||
| env: | ||
| HAS_SECRETS: ${{ secrets.SONATYPE_PASSWORD != '' }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [2.13.12, 2.12.18, 2.11.12] | ||
| java: [[email protected]] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v10 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
| - name: Cache sbt | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: | | ||
| ~/.sbt | ||
| ~/.ivy2/cache | ||
| ~/.coursier/cache/v1 | ||
| ~/.cache/coursier/v1 | ||
| ~/AppData/Local/Coursier/Cache/v1 | ||
| ~/Library/Caches/Coursier/v1 | ||
| key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} | ||
|
|
||
| - name: Runs ergo-core tests | ||
| run: sbt ++${{ matrix.scala }} ergoCore/test | ||
|
|
||
| - name: Publish a wallet snapshot ${{ github.ref }} | ||
| if: env.HAS_SECRETS == 'true' | ||
| run: sbt ++${{ matrix.scala }} ergoCore/publish | ||
| env: | ||
| SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} | ||
| SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} | ||
|
|
||
| test_node: | ||
| name: Run node tests | ||
| strategy: | ||
|
|
@@ -91,3 +134,40 @@ jobs: | |
| - name: Runs node tests | ||
| run: sbt -Denv=test clean ++${{ matrix.scala }} test | ||
|
|
||
| test_it: | ||
| name: Run it node tests | ||
| strategy: | ||
| matrix: | ||
| os: [ ubuntu-latest ] | ||
| scala: [ 2.12.18 ] | ||
| java: [ [email protected] ] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| path: it | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v10 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
| - name: Cache sbt | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: | | ||
| ~/.sbt | ||
| ~/.ivy2/cache | ||
| ~/.coursier/cache/v1 | ||
| ~/.cache/coursier/v1 | ||
| ~/AppData/Local/Coursier/Cache/v1 | ||
| ~/Library/Caches/Coursier/v1 | ||
| key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} | ||
|
|
||
| - name: Runs it node tests | ||
| run: | | ||
| cd it | ||
| mkdir tmp | ||
| TMPDIR=$(pwd)/tmp sbt -Denv=test clean ++${{ matrix.scala }} it:test | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
48 changes: 48 additions & 0 deletions
48
ergo-core/src/main/scala/org/ergoplatform/network/message/MessageBase.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.ergoplatform.network.message | ||
|
|
||
| import org.ergoplatform.network.message.MessageConstants._ | ||
|
|
||
| import scala.util.{Success, Try} | ||
|
|
||
| /** | ||
| * Trait for a ergo network message | ||
| * | ||
| * @param spec - message specification | ||
| * @param input - message being wrapped, whether in byte-array form (if from outside), | ||
| * or structured data (if formed locally) | ||
| * @tparam Content - message data type | ||
| */ | ||
| trait MessageBase[Content] { | ||
| val spec: MessageSpec[Content] | ||
| val input: Either[Array[Byte], Content] | ||
|
|
||
| /** | ||
| * Message data bytes | ||
| */ | ||
| lazy val dataBytes: Array[Byte] = input match { | ||
| case Left(db) => db | ||
| case Right(d) => spec.toBytes(d) | ||
| } | ||
|
|
||
| /** | ||
| * Structured message content | ||
| */ | ||
| lazy val data: Try[Content] = input match { | ||
| case Left(db) => spec.parseBytesTry(db) | ||
| case Right(d) => Success(d) | ||
| } | ||
|
|
||
| lazy val dataLength: Int = dataBytes.length | ||
|
|
||
| /** | ||
| * @return serialized message length in bytes | ||
| */ | ||
| def messageLength: Int = { | ||
| if (dataLength > 0) { | ||
| HeaderLength + ChecksumLength + dataLength | ||
| } else { | ||
| HeaderLength | ||
| } | ||
| } | ||
|
|
||
| } |
26 changes: 26 additions & 0 deletions
26
ergo-core/src/main/scala/org/ergoplatform/settings/ChainSettingsReader.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package org.ergoplatform.settings | ||
|
|
||
| import com.typesafe.config.ConfigFactory | ||
| import net.ceedubs.ficus.Ficus._ | ||
| import net.ceedubs.ficus.readers.ArbitraryTypeReader._ | ||
| import java.io.File | ||
|
|
||
| object ChainSettingsReader extends PowSchemeReaders with ModifierIdReader with SettingsReaders{ | ||
| def read(path: String): Option[ChainSettings] = { | ||
| val file = new File(path) | ||
| if (file.exists) { | ||
| val cfg = ConfigFactory.parseFile(file) | ||
| val fallback = ConfigFactory.parseFile(new File("src/main/resources/application.conf")) | ||
| val network = ConfigFactory.parseFile(new File("src/main/resources/testnet.conf")) | ||
| val fullConfig = ConfigFactory | ||
| .defaultOverrides() | ||
| .withFallback(cfg) //order | ||
| .withFallback(network) //matters | ||
| .withFallback(fallback) //here | ||
| .resolve() | ||
|
|
||
| val chainSettings = fullConfig.as[ChainSettings]("ergo.chain") | ||
| Some(chainSettings) | ||
| } else None | ||
| } | ||
| } |
File renamed without changes.
15 changes: 15 additions & 0 deletions
15
ergo-core/src/main/scala/org/ergoplatform/settings/ModifierIdReader.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package org.ergoplatform.settings | ||
|
|
||
| import com.typesafe.config.Config | ||
| import net.ceedubs.ficus.readers.ValueReader | ||
| import scorex.util.ModifierId | ||
|
|
||
| trait ModifierIdReader { | ||
|
|
||
| implicit val modifierIdReader: ValueReader[ModifierId] = new ValueReader[ModifierId] { | ||
| override def read(cfg: Config, path: String): ModifierId = { | ||
| ModifierId @@ cfg.getString(path) | ||
| } | ||
| } | ||
|
|
||
| } |
26 changes: 26 additions & 0 deletions
26
ergo-core/src/main/scala/org/ergoplatform/settings/PowSchemeReaders.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package org.ergoplatform.settings | ||
|
|
||
| import com.typesafe.config.{Config, ConfigException} | ||
| import net.ceedubs.ficus.Ficus._ | ||
| import net.ceedubs.ficus.readers.ValueReader | ||
| import org.ergoplatform.mining._ | ||
|
|
||
| trait PowSchemeReaders { | ||
|
|
||
| implicit val powSchemeReader: ValueReader[AutolykosPowScheme] = new ValueReader[AutolykosPowScheme] { | ||
| override def read(cfg: Config, path: String): AutolykosPowScheme = { | ||
| val schemeNameKey = s"$path.powType" | ||
| val schemeName = cfg.getString(schemeNameKey) | ||
| val n = cfg.as[Int](s"$path.n") | ||
| val k = cfg.as[Int](s"$path.k") | ||
| if (schemeName == "autolykos") { | ||
| new AutolykosPowScheme(k, n) | ||
| } else if (schemeName == "fake") { | ||
| new DefaultFakePowScheme(k, n) | ||
| } else { | ||
| throw new ConfigException.BadValue(schemeNameKey, schemeName) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.