@@ -37,39 +37,49 @@ private TransactionResult createTransactionResult() {
37
37
}
38
38
39
39
private TransferList createTransferList () {
40
+ long shardNum = generateRandomValue (1 , 100 );
41
+ long realmNum = generateRandomValue (1 , 100 );
40
42
long creditAccount = generateRandomValue (1 , 100 );
41
43
long debitAccount = generateRandomValue (1 , 100 );
42
44
long amount = generateRandomValue (100 , 200 );
43
45
44
46
return TransferList .newBuilder ()
45
- .addAccountAmounts (createAccountAmount (creditAccount , -amount ))
46
- .addAccountAmounts (createAccountAmount (debitAccount , amount ))
47
- .build ();
48
- }
49
-
50
- private AccountAmount createAccountAmount (long accountNum , long accountAmount ) {
51
- Preconditions .requirePositive (accountNum );
52
- // todo(700) Add support for non-zero shard/realm entity
53
- return AccountAmount .newBuilder ()
54
- .setAccountID (AccountID .newBuilder ()
55
- .setRealmNum (0 )
56
- .setShardNum (0 )
57
- .setAccountNum (accountNum )
58
- .build ())
59
- .setAmount (accountAmount )
47
+ .addAccountAmounts (createAccountAmount (shardNum , realmNum , creditAccount , -amount ))
48
+ .addAccountAmounts (createAccountAmount (shardNum , realmNum , debitAccount , amount ))
60
49
.build ();
61
50
}
62
51
63
52
private TokenTransferList createTokenTransferList () {
64
53
long tokenId = generateRandomValue (1 , 100 );
54
+ long shardNum = generateRandomValue (1 , 100 );
55
+ long realmNum = generateRandomValue (1 , 100 );
65
56
long creditAccount = generateRandomValue (1 , 100 );
66
57
long debitAccount = generateRandomValue (1 , 100 );
67
58
long amount = generateRandomValue (100 , 200 );
68
59
69
60
return TokenTransferList .newBuilder ()
70
- .setToken (TokenID .newBuilder ().setRealmNum (0 ).setShardNum (0 ).setTokenNum (tokenId ))
71
- .addTransfers (createAccountAmount (creditAccount , -amount ))
72
- .addTransfers (createAccountAmount (debitAccount , amount ))
61
+ .setToken (TokenID .newBuilder ()
62
+ .setShardNum (shardNum )
63
+ .setRealmNum (realmNum )
64
+ .setTokenNum (tokenId ))
65
+ .addTransfers (createAccountAmount (shardNum , realmNum , creditAccount , -amount ))
66
+ .addTransfers (createAccountAmount (shardNum , realmNum , debitAccount , amount ))
67
+ .build ();
68
+ }
69
+
70
+ private AccountAmount createAccountAmount (
71
+ final long shardNum , final long realmNum , final long accountNum , final long accountAmount ) {
72
+ Preconditions .requirePositive (shardNum );
73
+ Preconditions .requirePositive (realmNum );
74
+ Preconditions .requirePositive (accountNum );
75
+
76
+ return AccountAmount .newBuilder ()
77
+ .setAccountID (AccountID .newBuilder ()
78
+ .setShardNum (shardNum )
79
+ .setRealmNum (realmNum )
80
+ .setAccountNum (accountNum )
81
+ .build ())
82
+ .setAmount (accountAmount )
73
83
.build ();
74
84
}
75
85
}
0 commit comments