Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ If your contribution is adding a new dependency, please detail:
Contributions that add new dependencies may take longer to approve because a detailed audit of the
dependency may be required.

### Testing

Your code should be tested. We use ScalaTest as a testing framework.

ScalaTest's approach is to parallelize on test suites rather than individual tests, therefore it is
recommended to keep the execution time of each test suite under one minute and split tests across
multiple smaller suites if needed.

### IntelliJ Tips

If you're using [IntelliJ](https://www.jetbrains.com/idea/), here are some useful commands:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import akka.actor.typed.scaladsl.adapter.actorRefAdapter
import akka.actor.{ActorContext, ActorRef}
import akka.testkit.{TestFSMRef, TestKitBase, TestProbe}
import com.softwaremill.quicklens.ModifyPimp
import fr.acinq.bitcoin.ScriptFlags
import fr.acinq.bitcoin.scalacompat.Crypto.PublicKey
import fr.acinq.bitcoin.scalacompat.{ByteVector32, Crypto, SatoshiLong, Transaction}
import fr.acinq.bitcoin.ScriptFlags
import fr.acinq.eclair.TestConstants.{Alice, Bob}
import fr.acinq.eclair._
import fr.acinq.eclair.blockchain.bitcoind.ZmqWatcher._
Expand All @@ -39,15 +39,15 @@ import fr.acinq.eclair.router.Router.ChannelHop
import fr.acinq.eclair.transactions.Transactions
import fr.acinq.eclair.transactions.Transactions._
import fr.acinq.eclair.wire.protocol._
import org.scalatest.{FixtureTestSuite, ParallelTestExecution}
import org.scalatest.FixtureTestSuite

import java.util.UUID
import scala.concurrent.duration._

/**
* Created by PM on 23/08/2016.
*/
trait ChannelStateTestsBase extends ChannelStateTestsHelperMethods with FixtureTestSuite with ParallelTestExecution {
trait ChannelStateTestsBase extends ChannelStateTestsHelperMethods with FixtureTestSuite {
Comment thread
pm47 marked this conversation as resolved.

implicit class ChannelWithTestFeeConf(a: TestFSMRef[ChannelState, ChannelData, Channel]) {
// @formatter:off
Expand Down