Skip to content

Commit f56eb8b

Browse files
committed
Remove RYW (Read-Your-Writes) support
https://jira.hyperledger.org/browse/FAB-1187 Change-Id: I880fb399e4577135c50fba4c781b28902da33e84 Signed-off-by: manish <[email protected]>
1 parent 75a4c82 commit f56eb8b

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

core/ledger/kvledger/txmgmt/txmgr/commontests/txmgr_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ func testTxSimulatorWithNoExistingData(t *testing.T, env testEnv) {
4848
s.SetState("ns2", "key3", []byte("value3"))
4949
s.SetState("ns2", "key4", []byte("value4"))
5050

51-
value, _ = s.GetState("ns2", "key3")
52-
testutil.AssertEquals(t, value, []byte("value3"))
53-
54-
s.DeleteState("ns2", "key3")
5551
value, _ = s.GetState("ns2", "key3")
5652
testutil.AssertNil(t, value)
5753
}
@@ -86,7 +82,7 @@ func testTxSimulatorWithExistingData(t *testing.T, env testEnv) {
8682
s2.SetState("ns1", "key1", []byte("value1_1"))
8783
s2.DeleteState("ns2", "key3")
8884
value, _ = s2.GetState("ns1", "key1")
89-
testutil.AssertEquals(t, value, []byte("value1_1"))
85+
testutil.AssertEquals(t, value, []byte("value1"))
9086
s2.Done()
9187
// validate and commit RWset for tx2
9288
txRWSet2, _ := s2.GetTxSimulationResults()

core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/lockbased_tx_simulator.go

-6
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ func newLockBasedTxSimulator(txmgr *LockBasedTxMgr) *lockBasedTxSimulator {
3939

4040
// GetState implements method in interface `ledger.TxSimulator`
4141
func (s *lockBasedTxSimulator) GetState(ns string, key string) ([]byte, error) {
42-
// Remove RYWs when table APIs are removed
43-
logger.Debugf("s.rwset=%s", s.rwset)
44-
value, ok := s.rwset.GetFromWriteSet(ns, key)
45-
if ok {
46-
return value, nil
47-
}
4842
return s.helper.getState(ns, key)
4943
}
5044

0 commit comments

Comments
 (0)