Skip to content
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6659564
ECR-3050 Add TestKit P2 functionality
MakarovS Apr 9, 2019
476ccd0
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 11, 2019
47a386d
ECR-3050 Minor change in Javadocs
MakarovS Apr 11, 2019
44e0c29
ECR-3050 Minor documentation fix
MakarovS Apr 11, 2019
346e352
ECR-3050 Review and test fixes
MakarovS Apr 11, 2019
ce3ba85
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 11, 2019
aa097de
ECR-3050 Make native create TestKit method static and fix tests
MakarovS Apr 11, 2019
13e796e
ECR-3050 Fix TestKit tests
MakarovS Apr 15, 2019
9324650
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 15, 2019
f92ffe0
ECR-3050 Minor fix
MakarovS Apr 15, 2019
0c3aff5
ECR-3050 Remove Guava Streams usage
MakarovS Apr 16, 2019
0e7060b
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 16, 2019
0fcd636
ECR-3050 Review fixes and minor native fix
MakarovS Apr 22, 2019
56db99e
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 22, 2019
20b8085
ECR-3050 Remove Predicate#not
MakarovS Apr 22, 2019
cf325b1
ECR-3050 Review fixes
MakarovS Apr 23, 2019
bd97500
ECR-3050 Minor Javadoc fix
MakarovS Apr 23, 2019
0d83e00
ECR-3050 Minor Javadoc fix
MakarovS Apr 23, 2019
9d22e30
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 23, 2019
e8ce82f
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 24, 2019
0483d0e
ECR-3050 Use Blockchain#getTransactionPool and check transactions bef…
MakarovS Apr 24, 2019
9b5e050
ECR-3050 Check in-pool transactions as well
MakarovS Apr 24, 2019
f093261
ECR-3050 Imports reorder
MakarovS Apr 24, 2019
07440ec
ECR-3050 Review fixes
MakarovS Apr 24, 2019
db1e297
ECR-3050 Checkstyle fix
MakarovS Apr 24, 2019
053dd00
ECR-3050 Minor fix
MakarovS Apr 24, 2019
f0f95de
Merge remote-tracking branch 'remotes/origin/master' into ECR-3050
MakarovS Apr 24, 2019
e8a74e1
Stream Hashes from KeySet directly
dmitry-timofeev Apr 25, 2019
41a2d38
Use assertThat instead of assertTrue
dmitry-timofeev Apr 25, 2019
ef2a71b
Merge branch 'master' into ECR-3050
dmitry-timofeev Apr 25, 2019
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
2 changes: 1 addition & 1 deletion exonum-java-binding/core/rust/src/testkit/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,6 @@ fn create_java_keypair<'a>(
KEYPAIR_CLASS,
"createKeyPair",
KEYPAIR_CTOR_SIGNATURE,
&[public_key_byte_array.into(), secret_key_byte_array.into()],
&[secret_key_byte_array.into(), public_key_byte_array.into()],
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ protected AbstractCloseableNativeProxy(long nativeHandle, boolean dispose) {
this(nativeHandle, dispose, Collections.emptySet());
}


/**
* Creates a native proxy.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.OptionalInt;

/**
* Context of the TestKit emulated node.
* Context of the TestKit emulated node, i.e., on which it instantiates and executes services.
*/
public class EmulatedNode {

Expand All @@ -32,8 +32,8 @@ public class EmulatedNode {
/**
* Creates a context of an emulated node.
*
* @param validatorId validator id of the validator node, less or equal to 0 in case of an
* auditor node
* @param validatorId identifier of the validator node; or any negative value if the node is an
* auditor
* @param serviceKeyPair service key pair of the node
*/
public EmulatedNode(int validatorId, KeyPair serviceKeyPair) {
Expand Down

Large diffs are not rendered by default.

Loading